Use english as the base language

10 files changed, 65 insertions, 76 deletions

diff --git a/src/components/footer.rs b/src/components/footer.rs
index a7999be..27c666c 100644
--- a/src/components/footer.rs
+++ b/src/components/footer.rs
@@ -56,7 +56,7 @@ impl SimpleComponent for Footer {
                     set_margin_end: 5
                 },
 
-                gtk::Button::with_label(&tr!("command.view.zoom_out")) {
+                gtk::Button::with_label(&tr!("Zoom Out")) {
                     set_icon_name: ZOOM_OUT_REGULAR,
                     set_margin_end: 5,
                     add_css_class: "flat",
@@ -79,7 +79,7 @@ impl SimpleComponent for Footer {
                     }
                 },
 
-                gtk::Button::with_label(&tr!("command.view.zoom_in")) {
+                gtk::Button::with_label(&tr!("Zoom In")) {
                     set_icon_name: ZOOM_IN_REGULAR,
                     add_css_class: "flat",
                     add_css_class: "zoom",
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)
diff --git a/src/components/preference_pages/editor.rs b/src/components/preference_pages/editor.rs
index 0c6bda6..b064077 100644
--- a/src/components/preference_pages/editor.rs
+++ b/src/components/preference_pages/editor.rs
@@ -70,7 +70,7 @@ impl SimpleComponent for Editor {
                 set_spacing: 10,
 
                 gtk::Label {
-                    set_label: &tr!("preferences.editor.font_size.title"),
+                    set_label: &tr!("Font Size"),
                     add_css_class: "heading",
                     set_halign: gtk::Align::Start,
                 },
@@ -90,7 +90,7 @@ impl SimpleComponent for Editor {
                             format!(
                                 "{} ({})",
                                 value as i32,
-                                tr!("preferences.editor.default_font_size")
+                                tr!("Default")
                             )
                         } else {
                             format!("{}", value as i32)
@@ -104,7 +104,7 @@ impl SimpleComponent for Editor {
             },
 
             gtk::Label {
-                set_label: &tr!("preferences.editor.editor_style.title"),
+                set_label: &tr!("Editor Style"),
                 add_css_class: "heading",
                 set_halign: gtk::Align::Start,
                 set_margin_top: 10,
@@ -118,7 +118,7 @@ impl SimpleComponent for Editor {
                 set_spacing: 10,
 
                 gtk::Label {
-                    set_label: &tr!("preferences.editor.font"),
+                    set_label: &tr!("Font"),
                 },
 
                 gtk::FontDialogButton::new(Some(gtk::FontDialog::new())) {
@@ -149,7 +149,7 @@ impl SimpleComponent for Editor {
     ) -> ComponentParts<Self> {
         let soft_wrap_switch = switch::Switch::builder()
             .launch(switch::SwitchInit {
-                label: tr!("preferences.editor.editor_style.soft_wrap_lines"),
+                label: tr!("Soft wrap lines"),
                 state: init.soft_wrap,
             })
             .forward(sender.input_sender(), move |output| match output {
@@ -158,7 +158,7 @@ impl SimpleComponent for Editor {
 
         let custom_font_switch = switch::Switch::builder()
             .launch(switch::SwitchInit {
-                label: tr!("preferences.editor.editor_style.use_custom_font"),
+                label: tr!("Use custom font"),
                 state: init.use_custom_font,
             })
             .forward(sender.input_sender(), move |output| match output {
diff --git a/src/components/preference_pages/general.rs b/src/components/preference_pages/general.rs
index 351c4a5..532e654 100644
--- a/src/components/preference_pages/general.rs
+++ b/src/components/preference_pages/general.rs
@@ -37,7 +37,7 @@ impl SimpleComponent for General {
             set_valign: gtk::Align::Start,
 
             gtk::Label {
-                set_label: &tr!("preferences.general.preferences.title"),
+                set_label: &tr!("Preferences"),
                 add_css_class: "heading",
                 set_halign: gtk::Align::Start,
             },
@@ -45,17 +45,17 @@ impl SimpleComponent for General {
                 set_orientation: gtk::Orientation::Horizontal,
                 set_spacing: 10,
 
-                gtk::Button::with_label(&tr!("preferences.general.preferences.export")) {
+                gtk::Button::with_label(&tr!("Export")) {
                     connect_clicked => {
                         sender.output(PreferencesAction::Export).ok();
                     }
                 },
-                gtk::Button::with_label(&tr!("preferences.general.preferences.import")) {
+                gtk::Button::with_label(&tr!("Import")) {
                     connect_clicked => {
                         sender.output(PreferencesAction::Import).ok();
                     }
                 },
-                gtk::Button::with_label(&tr!("preferences.general.preferences.reset")) {
+                gtk::Button::with_label(&tr!("Reset to defaults")) {
                     add_css_class: "destructive-action",
                     connect_clicked => {
                         sender.output(PreferencesAction::ResetToDefaults).ok();
@@ -64,7 +64,8 @@ impl SimpleComponent for General {
             },
 
             gtk::Label {
-                set_label: &tr!("preferences.general.explanation"),
+                set_label: &tr!(r"Export your preferences to share with others or back up your settings.
+    Import preferences from a file to restore settings."),
                 add_css_class: "dim-label",
                 set_halign: gtk::Align::Start,
                 set_wrap: true
diff --git a/src/components/preference_pages/map.rs b/src/components/preference_pages/map.rs
index 5ec59e1..fb5178c 100644
--- a/src/components/preference_pages/map.rs
+++ b/src/components/preference_pages/map.rs
@@ -68,7 +68,7 @@ impl SimpleComponent for Map {
             set_valign: gtk::Align::Start,
 
             gtk::Label {
-                set_label: &tr!("preferences.map.map_style.title"),
+                set_label: &tr!("Map Style"),
                 add_css_class: "heading",
                 set_halign: gtk::Align::Start,
             },
@@ -81,7 +81,7 @@ impl SimpleComponent for Map {
                 set_spacing: 10,
 
                 gtk::Label {
-                    set_label: &tr!("preferences.map.font"),
+                    set_label: &tr!("Font"),
                 },
 
                 gtk::FontDialogButton::new(Some(gtk::FontDialog::new())) {
@@ -101,7 +101,7 @@ impl SimpleComponent for Map {
             },
 
             gtk::Label {
-                set_label: &tr!("preferences.map.export.title"),
+                set_label: &tr!("Export"),
                 add_css_class: "heading",
                 set_halign: gtk::Align::Start,
                 set_margin_top: 10,
@@ -112,11 +112,11 @@ impl SimpleComponent for Map {
                 set_spacing: 10,
 
                 gtk::Label {
-                    set_label: &tr!("preferences.map.export.default_format"),
+                    set_label: &tr!("Default export format"),
                 },
                 gtk::DropDown::new(Some(gtk::StringList::new(&[
-                            &tr!("export_formats.png"),
-                            &tr!("export_formats.svg"),
+                            &tr!("PNG (Raster)"),
+                            &tr!("SVG (Vector)"),
                 ])), None::<gtk::Expression>) {
                     #[watch]
                     #[block_signal(export_handler)]
@@ -143,7 +143,7 @@ impl SimpleComponent for Map {
     ) -> ComponentParts<Self> {
         let show_background_switch = switch::Switch::builder()
             .launch(switch::SwitchInit {
-                label: tr!("preferences.map.map_style.show_background"),
+                label: tr!("Show map background"),
                 state: init.show_background,
             })
             .forward(sender.input_sender(), move |output| match output {
@@ -152,7 +152,7 @@ impl SimpleComponent for Map {
 
         let custom_font_switch = switch::Switch::builder()
             .launch(switch::SwitchInit {
-                label: tr!("preferences.map.map_style.use_custom_font"),
+                label: tr!("Use custom font"),
                 state: init.use_custom_font,
             })
             .forward(sender.input_sender(), move |output| match output {
@@ -161,7 +161,7 @@ impl SimpleComponent for Map {
 
         let smart_label_positioning_switch = switch::Switch::builder()
             .launch(switch::SwitchInit {
-                label: tr!("preferences.map.map_style.use_smart_label_positioning"),
+                label: tr!("Use smart label positioning"),
                 state: init.use_smart_label_positioning,
             })
             .forward(sender.input_sender(), move |output| match output {
diff --git a/src/components/preference_pages/stages.rs b/src/components/preference_pages/stages.rs
index 12ee0e6..0534f37 100644
--- a/src/components/preference_pages/stages.rs
+++ b/src/components/preference_pages/stages.rs
@@ -53,12 +53,12 @@ impl SimpleComponent for Stages {
             set_valign: gtk::Align::Start,
 
             gtk::Label {
-                set_label: &tr!("preferences.stages.title"),
+                set_label: &tr!("Custom Stages"),
                 add_css_class: "heading",
                 set_halign: gtk::Align::Start,
             },
             gtk::Label {
-                set_label: &tr!("preferences.stages.explanation"),
+                set_label: &tr!("Custom stages allow you to define your own evolution axis label."),
                 add_css_class: "dim-label",
                 set_halign: gtk::Align::Start,
                 set_wrap: true,
@@ -82,31 +82,31 @@ impl SimpleComponent for Stages {
                         add_css_class: "dim-label",
 
                         gtk::Label {
-                            set_label: &tr!("preferences.stages.column.name"),
+                            set_label: &tr!("Name"),
                             set_xalign: 0.0,
                             set_hexpand: true,
                             set_width_chars: 15,
                         },
                         gtk::Label {
-                            set_label: &tr!("preferences.stages.column.stage_i"),
+                            set_label: &tr!("Stage I"),
                             set_xalign: 0.0,
                             set_hexpand: true,
                             set_width_chars: 12,
                         },
                         gtk::Label {
-                            set_label: &tr!("preferences.stages.column.stage_ii"),
+                            set_label: &tr!("Stage II"),
                             set_xalign: 0.0,
                             set_hexpand: true,
                             set_width_chars: 12,
                         },
                         gtk::Label {
-                            set_label: &tr!("preferences.stages.column.stage_iii"),
+                            set_label: &tr!("Stage III"),
                             set_xalign: 0.0,
                             set_hexpand: true,
                             set_width_chars: 12,
                         },
                         gtk::Label {
-                            set_label: &tr!("preferences.stages.column.stage_iv"),
+                            set_label: &tr!("Stage IV"),
                             set_xalign: 0.0,
                             set_hexpand: true,
                             set_width_chars: 12,
@@ -129,7 +129,7 @@ impl SimpleComponent for Stages {
                 set_spacing: 10,
                 set_halign: gtk::Align::End,
                 gtk::Button::from_icon_name("list-add-symbolic") {
-                    set_tooltip_text: Some(&tr!("preferences.stages.help.add")),
+                    set_tooltip_text: Some(&tr!("Add custom stage")),
                     connect_clicked => StagesAction::AddCustomStage,
                 }
             },
diff --git a/src/components/preference_pages/templates.rs b/src/components/preference_pages/templates.rs
index 4682ab9..4e95dab 100644
--- a/src/components/preference_pages/templates.rs
+++ b/src/components/preference_pages/templates.rs
@@ -83,14 +83,14 @@ impl SimpleComponent for Templates {
 
             #[wrap(Some)]
             set_sidebar = &adw::NavigationPage {
-                set_title: &tr!("preferences.templates.title"),
+                set_title: &tr!("Templates"),
                 gtk::Box {
                     set_orientation: gtk::Orientation::Vertical,
                     set_margin_all: 20,
                     set_spacing: 10,
 
                     gtk::Label {
-                        set_label: &tr!("preferences.templates.title"),
+                        set_label: &tr!("Templates"),
                         add_css_class: "heading",
                         set_halign: gtk::Align::Start,
                         set_margin_start: 5,
@@ -113,7 +113,7 @@ impl SimpleComponent for Templates {
                         set_halign: gtk::Align::End,
 
                         gtk::Button::from_icon_name("list-remove-symbolic") {
-                            set_tooltip_text: Some(&tr!("preferences.templates.help.remove")),
+                            set_tooltip_text: Some(&tr!("Remove template")),
 
                             connect_clicked[sender] => move |_| {
                                 sender.input(TemplatesAction::RemoveTemplate);
@@ -121,11 +121,11 @@ impl SimpleComponent for Templates {
                         },
 
                         gtk::Button::from_icon_name("list-add-symbolic") {
-                            set_tooltip_text: Some(&tr!("preferences.templates.help.add")),
+                            set_tooltip_text: Some(&tr!("Add template")),
 
                             connect_clicked[sender] => move |_| {
                                 sender.output(PreferencesAction::AddTemplate(tr!(
-                                            "dialog.template.default_label"
+                                            "My Template"
                                 ))).ok();
                             },
                         },
@@ -184,7 +184,7 @@ impl SimpleComponent for Templates {
                             }
                         } else {
                             gtk::Label {
-                                set_label: &tr!("preferences.templates.empty"),
+                                set_label: &tr!("There are no templates. Click on the + button to create one."),
                                 add_css_class: "dim-label",
                                 set_hexpand: true,
                                 set_vexpand: true,
diff --git a/src/components/preferences_window.rs b/src/components/preferences_window.rs
index 29e42fe..0df49e9 100644
--- a/src/components/preferences_window.rs
+++ b/src/components/preferences_window.rs
@@ -46,7 +46,7 @@ impl SimpleComponent for PreferencesWindow {
 
     view! {
         adw::Window {
-            set_title: Some(&tr!("preferences.title")),
+            set_title: Some(&tr!("Preferences")),
             set_default_width: 700,
             set_default_height: 500,
             set_modal: true,
@@ -70,11 +70,11 @@ impl SimpleComponent for PreferencesWindow {
                 adw::ViewStack {
                     set_vexpand: true,
 
-                    add_titled_with_icon[Some("general"), &tr!("preferences.menu.general"), SETTINGS] = model.general_page.widget(),
-                    add_titled_with_icon[Some("editor"), &tr!("preferences.menu.editor"), BUILD] = model.editor_page.widget(),
-                    add_titled_with_icon[Some("map"), &tr!("preferences.menu.map"), MAP] = model.map_page.widget(),
-                    add_titled_with_icon[Some("stages"), &tr!("preferences.menu.stages"), AGENDA] = model.stages_page.widget(),
-                    add_titled_with_icon[Some("templates"), &tr!("preferences.menu.templates"), PAPYRUS] = model.templates_page.widget(),
+                    add_titled_with_icon[Some("general"), &tr!("General"), SETTINGS] = model.general_page.widget(),
+                    add_titled_with_icon[Some("editor"), &tr!("Editor"), BUILD] = model.editor_page.widget(),
+                    add_titled_with_icon[Some("map"), &tr!("Map"), MAP] = model.map_page.widget(),
+                    add_titled_with_icon[Some("stages"), &tr!("Stages"), AGENDA] = model.stages_page.widget(),
+                    add_titled_with_icon[Some("templates"), &tr!("Templates"), PAPYRUS] = model.templates_page.widget(),
                 },
 
                 #[name = "switcher_bar"]
@@ -433,13 +433,13 @@ impl PreferencesWindow {
     fn show_export_dialog(sender: &ComponentSender<Self>, window: &adw::Window) {
         let filter = FileFilter::new();
         filter.add_pattern("*.json");
-        filter.set_name(Some(&tr!("dialog.file_type.json")));
+        filter.set_name(Some(&tr!("JSON File")));
 
         let filters = gtk::gio::ListStore::new::<gtk::FileFilter>();
         filters.append(&filter);
 
         let dialog = gtk::FileDialog::builder()
-            .title(tr!("dialog.export_preferences.title"))
+            .title(tr!("Export Preferences"))
             .modal(true)
             .filters(&filters)
             .initial_name("preferences.json")
@@ -459,13 +459,13 @@ impl PreferencesWindow {
     fn show_import_dialog(sender: &ComponentSender<Self>, window: &adw::Window) {
         let filter = FileFilter::new();
         filter.add_pattern("*.json");
-        filter.set_name(Some(&tr!("dialog.file_type.json")));
+        filter.set_name(Some(&tr!("JSON File")));
 
         let filters = gtk::gio::ListStore::new::<gtk::FileFilter>();
         filters.append(&filter);
 
         let dialog = gtk::FileDialog::builder()
-            .title(tr!("dialog.import_preferences.title"))
+            .title(tr!("Import Preferences"))
             .modal(true)
             .filters(&filters)
             .build();
diff --git a/src/components/stage_form.rs b/src/components/stage_form.rs
index cb4c40f..44e3c88 100644
--- a/src/components/stage_form.rs
+++ b/src/components/stage_form.rs
@@ -108,7 +108,7 @@ impl FactoryComponent for StageForm {
 
                 gtk::Button::from_icon_name("list-remove-symbolic") {
                     add_css_class: "flat",
-                    set_tooltip_text: Some(&tr!("preferences.stages.help.remove")),
+                    set_tooltip_text: Some(&tr!("Remove stage")),
                     connect_clicked[sender] => move |_| {
                         sender.input(StageFormAction::Remove);
                     }
diff --git a/src/components/template_row.rs b/src/components/template_row.rs
index 959c392..68696f6 100644
--- a/src/components/template_row.rs
+++ b/src/components/template_row.rs
@@ -64,7 +64,7 @@ impl FactoryComponent for TemplateRow {
                     #[watch]
                     set_icon_name: if self.template.is_default { "radio-checked-symbolic" } else { "radio-symbolic" },
                     #[watch]
-                    set_tooltip_text: Some(&if self.template.is_default { tr!("preferences.templates.help.default") } else { tr!("preferences.templates.help.set_as_default") }),
+                    set_tooltip_text: Some(&if self.template.is_default { tr!("This is the default template.") } else { tr!("Set as default template.") }),
                     connect_clicked[sender, index] => move |_| {
                         sender.output(TemplateRowOutput::SetDefault(index.clone())).ok();
                     }
@@ -84,7 +84,7 @@ impl FactoryComponent for TemplateRow {
                 },
 
                 gtk::Button::from_icon_name(RIGHT) {
-                    set_tooltip_text: Some(&tr!("preferences.templates.help.activate")),
+                    set_tooltip_text: Some(&tr!("Edit Template")),
                     #[watch]
                     set_visible: self.is_arrow_shown,