i18n: internationalize 37 hardcoded UI strings, fix 3 ZacharyZcR compatibility issues

ErshovDmitry · ErshovDmitry · commit a892ed1a5adb · 2026-05-21T14:40:33.000+07:00
- Added menu_label() calls for 37 hardcoded English strings across 18 files
  (zero_state blocks, conversation list, usage stats, notifications,
   resource center, MCP servers list, teams page, skills, SSH uploads, search)
- Added 37 new keys to en.yml and ru.yml with Russian translations
- Fixed 3 en.yml values to match ZacharyZcR/i18n-zh-cn canonical English
- Updated corresponding hardcoded fallbacks in Rust code
- Updated AGENTS.md with ZacharyZcR compatibility rules

cargo check -p warp: 0 warnings. cargo test -p i18n: 9/9 pass.
diff --git a/app/src/ai/agent_management/notifications/toast_stack.rs b/app/src/ai/agent_management/notifications/toast_stack.rs
@@ -459,7 +459,7 @@ fn render_keybinding_hint(keystroke: Keystroke, appearance: &Appearance) -> Box<
 
     let hint_text = appearance
         .ui_builder()
-        .wrappable_text("Open conversation".to_string(), false)
+        .wrappable_text(crate::menu_label("agent.notifications.open_conversation", "Open conversation").to_string(), false)
         .with_style(UiComponentStyles {
             font_size: Some(12.),
             font_color: Some(theme.disabled_text_color(theme.surface_2()).into()),
diff --git a/app/src/ai/agent_management/notifications/view.rs b/app/src/ai/agent_management/notifications/view.rs
@@ -128,11 +128,14 @@ impl NotificationMailboxView {
         });
 
         let mark_all_read_button = ctx.add_typed_action_view(|_| {
-            ActionButton::new(crate::menu_label("agent.notifications.mark_all_read", "Mark all as read"), NakedTheme)
-                .with_size(ButtonSize::Small)
-                .on_click(|ctx| {
-                    ctx.dispatch_typed_action(NotificationMailboxViewAction::MarkAllRead);
-                })
+            ActionButton::new(
+                crate::menu_label("agent.notifications.mark_all_read", "Mark all as read"),
+                NakedTheme,
+            )
+            .with_size(ButtonSize::Small)
+            .on_click(|ctx| {
+                ctx.dispatch_typed_action(NotificationMailboxViewAction::MarkAllRead);
+            })
         });
 
         Self {
@@ -546,7 +549,11 @@ impl NotificationMailboxView {
         Container::new(
             appearance
                 .ui_builder()
-                .wrappable_text("No notifications".to_string(), false)
+                .wrappable_text(
+                    crate::menu_label("agent.notifications.no_notifications", "No notifications")
+                        .to_string(),
+                    false,
+                )
                 .with_style(UiComponentStyles {
                     font_size: Some(14.),
                     font_color: Some(theme.sub_text_color(theme.surface_2()).into()),
diff --git a/app/src/ai/blocklist/agent_view/agent_message_bar.rs b/app/src/ai/blocklist/agent_view/agent_message_bar.rs
@@ -462,7 +462,7 @@ impl MessageProvider<AgentMessageArgs<'_>> for BootstrappingMessageProducer {
         {
             None
         } else {
-            Some(Message::from_text("Starting shell..."))
+            Some(Message::from_text(crate::menu_label("agent.message_bar.starting_shell", "Starting shell...")))
         }
     }
 }
diff --git a/app/src/ai/blocklist/agent_view/zero_state_block.rs b/app/src/ai/blocklist/agent_view/zero_state_block.rs
@@ -411,8 +411,11 @@ impl View for AgentViewZeroStateBlock {
                 icon: Icon::OzCloud,
             }
         } else {
-            let mut local_description =
-                "Send a prompt below to start a new conversation".to_owned();
+            let mut local_description = crate::menu_label(
+                "agent.zero_state.send_prompt",
+                "Send a prompt below to start a new conversation",
+            )
+            .to_owned();
             let active_session = self.active_session(app);
             let location_label = active_session.as_deref().and_then(|session| {
                 format_session_location(session, self.current_working_directory.as_deref())
@@ -422,7 +425,11 @@ impl View for AgentViewZeroStateBlock {
             }
 
             HeaderProps {
-                title: "New Oz agent conversation".into(),
+                title: crate::menu_label(
+                    "agent.zero_state.new_conversation",
+                    "New Oz agent conversation",
+                )
+                .into(),
                 description: AgentViewDescription::PlainText(vec![local_description.into()]),
                 icon: Icon::Oz,
             }
diff --git a/app/src/ai/blocklist/block/view_impl/output.rs b/app/src/ai/blocklist/block/view_impl/output.rs
@@ -1339,7 +1339,7 @@ fn render_search_codebase(
                                     RadioButtonItem::text(
                                         "Always allow file access for coding tasks",
                                     ),
-                                    RadioButtonItem::text("Always allow file access for this repo"),
+                                    RadioButtonItem::text(crate::menu_label("agent.output.always_allow_file_access", "Always allow file access for this repo")),
                                 ],
                                 props
                                     .state_handles
@@ -2372,7 +2372,7 @@ fn create_formatted_text_for_grep(
             .expect("Queries slice should have an element");
         let mut fragments = if is_cancelled || is_queued {
             vec![
-                FormattedTextFragment::plain_text("Grep for "),
+                FormattedTextFragment::plain_text(crate::menu_label("agent.output.grep_for", "Grep for ")),
                 FormattedTextFragment::inline_code(query),
             ]
         } else {
@@ -2469,7 +2469,7 @@ fn create_formatted_text_for_file_glob(
 
         let mut fragments = if is_cancelled || is_queued {
             vec![
-                FormattedTextFragment::plain_text("Search for files that match "),
+                FormattedTextFragment::plain_text(crate::menu_label("agent.output.search_files", "Search for files that match ")),
                 FormattedTextFragment::inline_code(pattern),
             ]
         } else {
diff --git a/app/src/ai/blocklist/inline_action/search_codebase.rs b/app/src/ai/blocklist/inline_action/search_codebase.rs
@@ -241,7 +241,12 @@ impl SearchCodebaseView {
                 font_size: Some(appearance.monospace_font_size()),
                 ..Default::default()
             };
-            self.render_formatted_text("No results found".to_string(), no_results_style, appearance)
+            self.render_formatted_text(
+                crate::menu_label("agent.search_codebase.no_results", "No results found")
+                    .to_string(),
+                no_results_style,
+                appearance,
+            )
         } else {
             render_read_files_text(
                 render_read_file_args,
diff --git a/app/src/ai/blocklist/usage/conversation_usage_view.rs b/app/src/ai/blocklist/usage/conversation_usage_view.rs
@@ -301,14 +301,20 @@ impl ConversationUsageView {
                 appearance,
             ));
 
-            labels.push(render_label_text("Credits spent (total)", appearance));
+            labels.push(render_label_text(
+                &crate::menu_label("agent.usage.credits_total", "Credits spent (total)"),
+                appearance,
+            ));
             values.push(self.render_total_credits_value_row(
                 total_credits_value,
                 rollup.as_ref(),
                 appearance,
             ));
         } else {
-            labels.push(render_label_text("Credits spent", appearance));
+            labels.push(render_label_text(
+                &crate::menu_label("agent.usage.credits_spent", "Credits spent"),
+                appearance,
+            ));
             values.push(self.render_total_credits_value_row(
                 total_credits_value,
                 rollup.as_ref(),
@@ -324,7 +330,10 @@ impl ConversationUsageView {
         // existing flex spacing handles indentation.
         self.append_per_agent_rows(&mut labels, &mut values, rollup.as_ref(), appearance);
 
-        labels.push(render_label_text("Tool calls", appearance));
+        labels.push(render_label_text(
+            &crate::menu_label("agent.usage.tool_calls", "Tool calls"),
+            appearance,
+        ));
         values.push(render_value_text(
             format_value_text(self.usage_info.tool_calls, "call"),
             appearance,
@@ -422,7 +431,10 @@ impl ConversationUsageView {
             );
         }
 
-        labels.push(render_label_text("Context window used", appearance));
+        labels.push(render_label_text(
+            &crate::menu_label("agent.usage.context_window", "Context window used"),
+            appearance,
+        ));
         let context_usage_str =
             format!("{}%", (self.usage_info.context_window_usage * 100.).round());
         let context_window_element = Flex::row()
@@ -465,13 +477,19 @@ impl ConversationUsageView {
         ));
         values.push(render_section_header("".to_string(), appearance));
 
-        labels.push(render_label_text("Files changed", appearance));
+        labels.push(render_label_text(
+            &crate::menu_label("agent.usage.files_changed", "Files changed"),
+            appearance,
+        ));
         values.push(render_value_text(
             format_value_text(self.usage_info.files_changed, "file"),
             appearance,
         ));
 
-        labels.push(render_label_text("Diffs applied", appearance));
+        labels.push(render_label_text(
+            &crate::menu_label("agent.usage.diffs_applied", "Diffs applied"),
+            appearance,
+        ));
         let diffs_element = Flex::row()
             .with_cross_axis_alignment(CrossAxisAlignment::Center)
             .with_child(
@@ -508,7 +526,10 @@ impl ConversationUsageView {
             .finish();
         values.push(diffs_element);
 
-        labels.push(render_label_text("Commands executed", appearance));
+        labels.push(render_label_text(
+            &crate::menu_label("agent.usage.commands_executed", "Commands executed"),
+            appearance,
+        ));
         values.push(render_value_text(
             format_value_text(self.usage_info.commands_executed, "command"),
             appearance,
@@ -540,7 +561,13 @@ impl ConversationUsageView {
                     ));
                     values.push(render_section_header("".to_string(), appearance));
 
-                    labels.push(render_label_text("Time to first token", appearance));
+                    labels.push(render_label_text(
+                        &crate::menu_label(
+                            "agent.usage.time_to_first_token",
+                            "Time to first token",
+                        ),
+                        appearance,
+                    ));
                     values.push(render_value_text(
                         format!(
                             "{:.1} seconds",
@@ -549,7 +576,13 @@ impl ConversationUsageView {
                         appearance,
                     ));
 
-                    labels.push(render_label_text("Total agent response time", appearance));
+                    labels.push(render_label_text(
+                        &crate::menu_label(
+                            "agent.usage.total_response_time",
+                            "Total agent response time",
+                        ),
+                        appearance,
+                    ));
                     values.push(render_value_text(
                         format!(
                             "{:.1} seconds",
diff --git a/app/src/app_menus.rs b/app/src/app_menus.rs
@@ -843,7 +843,7 @@ fn debug_menu_items() -> Vec<MenuItem> {
                 }) {
                     crate::menu_label(
                         "menu.disable_in_band_generators",
-                        "Disable In-band Generators for New Sessions",
+                        "Disable in-band generators for new sessions",
                     )
                 } else {
                     crate::menu_label(
diff --git a/app/src/auth/mod.rs b/app/src/auth/mod.rs
@@ -97,7 +97,7 @@ pub fn maybe_log_out(app: &mut AppContext) {
     {
         send_telemetry_sync_from_app_ctx!(TelemetryEvent::LogOutModalShown, app);
         let mut button_data = vec![ModalButton::for_app(
-            crate::menu_label("auth.log_out_confirm", "Yes, log out"),
+            crate::menu_label("auth.log_out_confirm", "Log out?"),
             |ctx| {
                 log_out(ctx);
             },
diff --git a/app/src/notebooks/editor/view.rs b/app/src/notebooks/editor/view.rs
@@ -2838,7 +2838,7 @@ impl TypedActionView for RichTextEditorView {
                 crate::workspace::ToastStack::handle(ctx).update(ctx, |toast_stack, ctx| {
                     let toast = DismissibleToast::default(crate::menu_label(
                         "notebook.link_copied",
-                        "Link copied",
+                        "Link copied to clipboard",
                     ));
                     toast_stack.add_ephemeral_toast(toast, window_id, ctx);
                 });
diff --git a/app/src/resource_center/keybindings_page.rs b/app/src/resource_center/keybindings_page.rs
@@ -356,7 +356,14 @@ impl KeybindingsView {
                         .build()
                         .finish(),
                 )
-                .with_child(self.render_text("To toggle this panel".into(), None, appearance))
+                .with_child(
+                    self.render_text(
+                        crate::menu_label("resource_center.toggle_panel", "To toggle this panel")
+                            .into(),
+                        None,
+                        appearance,
+                    ),
+                )
                 .with_cross_axis_alignment(CrossAxisAlignment::Center)
                 .finish();
 
diff --git a/app/src/resource_center/main_page.rs b/app/src/resource_center/main_page.rs
@@ -433,7 +433,7 @@ impl ResourceCenterMainView {
 
                     appearance
                         .ui_builder()
-                        .wrappable_text("Mark all as read", false)
+                        .wrappable_text(crate::menu_label("resource_center.mark_all_read", "Mark all as read"), false)
                         .with_style(style)
                         .build()
                         .finish()
diff --git a/app/src/settings_view/mcp_servers/list_page.rs b/app/src/settings_view/mcp_servers/list_page.rs
@@ -227,7 +227,10 @@ impl MCPServersListPageView {
 
         search_editor.update(ctx, |editor, ctx| {
             editor.clear_buffer_and_reset_undo_stack(ctx);
-            editor.set_placeholder_text("Search MCP Servers", ctx);
+            editor.set_placeholder_text(
+                crate::menu_label("settings.mcp_servers_page.search", "Search MCP Servers"),
+                ctx,
+            );
         });
         let search_bar = ctx.add_typed_action_view(|_| SearchBar::new(search_editor.clone()));
 
@@ -1773,10 +1776,16 @@ impl MCPServersListPageView {
                 if is_shared {
                     match creator {
                         Some(creator) => Some(TitleChip::text(format!("Shared by: {creator}"))),
-                        None => Some(TitleChip::text("Shared by a team member")),
+                        None => Some(TitleChip::text(crate::menu_label(
+                            "settings.mcp_servers_page.shared_by_team",
+                            "Shared by a team member",
+                        ))),
                     }
                 } else if matches!(item_id, ServerCardItemId::TemplatableMCP(_)) {
-                    Some(TitleChip::text("From another device"))
+                    Some(TitleChip::text(crate::menu_label(
+                        "settings.mcp_servers_page.from_another_device",
+                        "From another device",
+                    )))
                 } else {
                     None
                 }
diff --git a/app/src/settings_view/teams_page.rs b/app/src/settings_view/teams_page.rs
@@ -816,7 +816,10 @@ impl TeamsPageView {
             .to_string();
         let rename_team_editor = ctx.add_typed_action_view(|ctx| {
             let mut input = ClickableTextInput::new(team_name, ctx);
-            input.set_placeholder_text("Your new team name", ctx);
+            input.set_placeholder_text(
+                crate::menu_label("settings.teams.new_team_name", "Your new team name"),
+                ctx,
+            );
             input
         });
         ctx.subscribe_to_view(&rename_team_editor, |me, _, event, ctx| {
@@ -3077,7 +3080,11 @@ impl TeamsWidget {
 
         let team_uid = team.uid;
         let (link_text, suffix) = Self::outgrow_upgrade_line_copy(&team.billing_metadata);
-        let prefix = self.render_sub_text("Need more seats? ".to_string(), appearance, None);
+        let prefix = self.render_sub_text(
+            crate::menu_label("settings.teams.grow_team", "Need more seats? ").to_string(),
+            appearance,
+            None,
+        );
         let link = appearance
             .ui_builder()
             .link(
diff --git a/app/src/terminal/input/skills/data_source.rs b/app/src/terminal/input/skills/data_source.rs
@@ -43,7 +43,10 @@ impl InlineMenuAction for AcceptSkill {
         // If no item is selected, show "No skills found" message with escape hint
         if args.inline_menu_model.selected_item().is_none() {
             return Some(Message::new(vec![
-                MessageItem::text("No skills found"),
+                MessageItem::text(crate::menu_label(
+                    "terminal.skills.no_skills",
+                    "No skills found",
+                )),
                 MessageItem::keystroke(Keystroke {
                     key: "escape".to_owned(),
                     ..Default::default()
diff --git a/app/src/terminal/view/shared_session/adapter.rs b/app/src/terminal/view/shared_session/adapter.rs
@@ -109,7 +109,7 @@ impl Adapter {
     ) -> Self {
         let reconnecting_banner = ctx.add_typed_action_view(|_| {
             Banner::new_without_close(BannerTextContent::formatted_text(vec![
-                FormattedTextFragment::plain_text("Offline, trying to reconnect..."),
+                FormattedTextFragment::plain_text(crate::menu_label("terminal.shared_session.reconnecting", "Offline, trying to reconnect...")),
             ]))
             .with_icon(Icon::CloudOffline)
         });
diff --git a/app/src/terminal/view/ssh_file_upload.rs b/app/src/terminal/view/ssh_file_upload.rs
@@ -460,7 +460,10 @@ impl FileUpload {
             FormattedTextElement::new(
                 FormattedText::new(vec![FormattedTextLine::Heading(FormattedTextHeader {
                     heading_size: 3,
-                    text: vec![FormattedTextFragment::plain_text("File Uploads")],
+                    text: vec![FormattedTextFragment::plain_text(crate::menu_label(
+                        "terminal.ssh.file_uploads",
+                        "File Uploads",
+                    ))],
                 })]),
                 appearance.ui_font_size(),
                 appearance.ui_font_family(),
diff --git a/app/src/terminal/view/zero_state_block.rs b/app/src/terminal/view/zero_state_block.rs
diff --git a/app/src/workspace/view.rs b/app/src/workspace/view.rs
diff --git a/app/src/workspace/view/conversation_list/view.rs b/app/src/workspace/view/conversation_list/view.rs
diff --git a/app/src/workspace/view/global_search/view.rs b/app/src/workspace/view/global_search/view.rs
diff --git a/resources/bundled/locales/en.yml b/resources/bundled/locales/en.yml
diff --git a/resources/bundled/locales/ru.yml b/resources/bundled/locales/ru.yml

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ impl MessageProvider<AgentMessageArgs<'_>> for BootstrappingMessageProducer {`
`462`	`462`	`{`
`463`	`463`	`None`
`464`	`464`	`} else {`
`465`		`- Some(Message::from_text("Starting shell..."))`
	`465`	`+ Some(Message::from_text(crate::menu_label("agent.message_bar.starting_shell", "Starting shell...")))`
`466`	`466`	`}`
`467`	`467`	`}`
`468`	`468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ fn debug_menu_items() -> Vec<MenuItem> {`
`843`	`843`	`}) {`
`844`	`844`	`crate::menu_label(`
`845`	`845`	`"menu.disable_in_band_generators",`
`846`		`- "Disable In-band Generators for New Sessions",`
	`846`	`+ "Disable in-band generators for new sessions",`
`847`	`847`	`)`
`848`	`848`	`} else {`
`849`	`849`	`crate::menu_label(`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ pub fn maybe_log_out(app: &mut AppContext) {`
`97`	`97`	`{`
`98`	`98`	`send_telemetry_sync_from_app_ctx!(TelemetryEvent::LogOutModalShown, app);`
`99`	`99`	`let mut button_data = vec![ModalButton::for_app(`
`100`		`- crate::menu_label("auth.log_out_confirm", "Yes, log out"),`
	`100`	`+ crate::menu_label("auth.log_out_confirm", "Log out?"),`
`101`	`101`	`\|ctx\| {`
`102`	`102`	`log_out(ctx);`
`103`	`103`	`},`