1 files changed, 15 insertions, 27 deletions

diff --git a/src/components/header.rs b/src/components/header.rs
index f41d6a1..8e20850 100644
--- a/src/components/header.rs
+++ b/src/components/header.rs
@@ -54,8 +54,8 @@ impl SimpleComponent for Header {
         adw::HeaderBar {
             pack_start = &adw::ToolbarView {
                 gtk::Button::with_label(&match model.orientation {
-                    gtk::Orientation::Horizontal => tr!("command.view.use_vertical_layout"),
-                    _ => tr!("command.view.use_horizontal_layout")
+                    gtk::Orientation::Horizontal => tr!("Use Vertical Layout"),
+                    _ => tr!("Use Horizontal Layout")
                 }) {
                     #[watch]
                     set_icon_name: match model.orientation {
@@ -69,7 +69,7 @@ impl SimpleComponent for Header {
             },
             pack_end = &gtk::Box {
 
-                gtk::Button::with_label(&tr!("command.file.export")) {
+                gtk::Button::with_label(&tr!("Export as Image")) {
                     set_icon_name: IMAGE_REGULAR,
                     ActionablePlus::set_stateless_action::<ExportImageAction>: &(),
                 },
@@ -160,44 +160,32 @@ impl Header {
         }
 
         let main_menu = gio::Menu::new();
-        main_menu.append(Some(&tr!("command.file.new")), Some("window.new"));
-        main_menu.append_submenu(
-            Some(&tr!("command.file.new_from_template")),
-            &templates_menu,
-        );
-        main_menu.append(Some(&tr!("command.file.open")), Some("window.open"));
-        main_menu.append(Some(&tr!("command.file.save")), Some("window.save"));
-        main_menu.append(Some(&tr!("command.file.save_as")), Some("window.save-as"));
-        main_menu.append(Some(&tr!("command.file.close")), Some("window.close"));
-        main_menu.append(
-            Some(&tr!("command.file.export")),
-            Some("window.export-image"),
-        );
+        main_menu.append(Some(&tr!("New Map")), Some("window.new"));
+        main_menu.append_submenu(Some(&tr!("New from Template")), &templates_menu);
+        main_menu.append(Some(&tr!("Open…")), Some("window.open"));
+        main_menu.append(Some(&tr!("Save")), Some("window.save"));
+        main_menu.append(Some(&tr!("Save As…")), Some("window.save-as"));
+        main_menu.append(Some(&tr!("Close")), Some("window.close"));
+        main_menu.append(Some(&tr!("Export as Image")), Some("window.export-image"));
 
         let layout_section = gio::Menu::new();
         layout_section.append(
-            Some(&tr!("command.view.use_vertical_layout")),
+            Some(&tr!("Use Vertical Layout")),
             Some("window.change-orientation"),
         );
         main_menu.append_section(None, &layout_section);
 
         let zoom_section = gio::Menu::new();
-        zoom_section.append(Some(&tr!("command.view.zoom_in")), Some("window.zoom-in"));
-        zoom_section.append(Some(&tr!("command.view.zoom_out")), Some("window.zoom-out"));
+        zoom_section.append(Some(&tr!("Zoom In")), Some("window.zoom-in"));
+        zoom_section.append(Some(&tr!("Zoom Out")), Some("window.zoom-out"));
         main_menu.append_section(None, &zoom_section);
 
         let help_section = gio::Menu::new();
-        help_section.append(
-            Some(&tr!("command.application.about")),
-            Some("window.about"),
-        );
+        help_section.append(Some(&tr!("About")), Some("window.about"));
         main_menu.append_section(None, &help_section);
 
         let prefs_section = gio::Menu::new();
-        prefs_section.append(
-            Some(&tr!("command.application.preferences")),
-            Some("window.preferences"),
-        );
+        prefs_section.append(Some(&tr!("Preferences…")), Some("window.preferences"));
         main_menu.append_section(None, &prefs_section);
 
         (templates_menu, main_menu)