From 34d9fbdc357fb3a4ea5ddbcf0c209e2be31214c6 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 21 Dec 2021 13:27:31 +0100 Subject: Fixes for localization of the PrusaSlicer - 2.4.0 * Added some missed phrases. * Added some missed files to the list.txt * Fix for https://github.com/prusa3d/PrusaSlicer/issues/7114 - Reword of the "Ask for unsaved changes..." * Fix for https://github.com/prusa3d/PrusaSlicer/issues/7542 - Added localization for default buttons Yes/No Note: For some default buttons/labels/dialogs/... is used localization in wxWidgets. But dictionaries have to contain this strings, otherwise texts wouldn't be localized. "wxWidgets/local" contains dictionaries for all this default phrases. So, a copy of this field is added as a "wx_local" field to the "resources/localization" field. And a "gettext_concat_wx_po_with_po" script is written to concatenate strings from wx_local/lang_code.po to resources/localization/lang_code/PrusaSlicer_lang_code.po. So, to create a MO file from updated PO we have to execute "gettext_concat_wx_po_with_po" and only then execute a "gettext_po_to_mo" script. --- src/slic3r/GUI/BackgroundSlicingProcess.cpp | 2 +- src/slic3r/GUI/FirmwareDialog.cpp | 2 +- src/slic3r/GUI/Preferences.cpp | 12 ++++++------ src/slic3r/GUI/UnsavedChangesDialog.cpp | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/slic3r/GUI') diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp index e93f32b03..5f7b4e8d3 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp @@ -81,7 +81,7 @@ std::pair SlicingProcessCompletedEvent::format_error_message( "be glad if you reported it."))) % SLIC3R_APP_NAME).str()); error = std::string(errmsg.ToUTF8()) + "\n\n" + std::string(ex.what()); } catch (const HardCrash &ex) { - error = GUI::format("PrusaSlicer has encountered a fatal error: \"%1%\"", ex.what()) + "\n\n" + + error = GUI::format(_L("PrusaSlicer has encountered a fatal error: \"%1%\""), ex.what()) + "\n\n" + _u8L("Please save your project and restart PrusaSlicer. " "We would be glad if you reported the issue."); } catch (PlaceholderParserError &ex) { diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp index 4966726ae..3d35f0380 100644 --- a/src/slic3r/GUI/FirmwareDialog.cpp +++ b/src/slic3r/GUI/FirmwareDialog.cpp @@ -811,7 +811,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) : panel->SetSizer(vsizer); auto *label_hex_picker = new wxStaticText(panel, wxID_ANY, _(L("Firmware image:"))); - p->hex_picker = new wxFilePickerCtrl(panel, wxID_ANY, wxEmptyString, wxFileSelectorPromptStr, + p->hex_picker = new wxFilePickerCtrl(panel, wxID_ANY, wxEmptyString, /*wxFileSelectorPromptStr*/_L("Select a file"), "Hex files (*.hex)|*.hex|All files|*.*"); p->hex_picker->GetPickerCtrl()->SetLabelText(_(L("Browse"))); diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index ff89d90ad..7ef62b84c 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -217,25 +217,25 @@ void PreferencesDialog::build(size_t selected_tab) m_optgroup_general->append_separator(); - def.label = L("Ask to save unsaved changes when closing the application or when loading a new project"); + def.label = L("Ask to save unsaved changes in presets when closing the application or when loading a new project"); def.type = coBool; - def.tooltip = L("Always ask for unsaved changes, when: \n" + def.tooltip = L("Always ask for unsaved changes in presets, when: \n" "- Closing PrusaSlicer while some presets are modified,\n" "- Loading a new project while some presets are modified"); def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_close_application") == "none" }); option = Option(def, "default_action_on_close_application"); m_optgroup_general->append_single_option_line(option); - def.label = L("Ask for unsaved changes when selecting new preset"); + def.label = L("Ask for unsaved changes in presets when selecting new preset"); def.type = coBool; - def.tooltip = L("Always ask for unsaved changes when selecting new preset or resetting a preset"); + def.tooltip = L("Always ask for unsaved changes in presets when selecting new preset or resetting a preset"); def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_select_preset") == "none" }); option = Option(def, "default_action_on_select_preset"); m_optgroup_general->append_single_option_line(option); - def.label = L("Ask for unsaved changes when creating new project"); + def.label = L("Ask for unsaved changes in presets when creating new project"); def.type = coBool; - def.tooltip = L("Always ask for unsaved changes when creating new project"); + def.tooltip = L("Always ask for unsaved changes in presets when creating new project"); def.set_default_value(new ConfigOptionBool{ app_config->get("default_action_on_new_project") == "none" }); option = Option(def, "default_action_on_new_project"); m_optgroup_general->append_single_option_line(option); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 38440b16a..6dc194759 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -891,12 +891,12 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection* dependent_ { if (!evt.IsChecked()) return; - wxString preferences_item = m_app_config_key == "default_action_on_new_project" ? _L("Ask for unsaved changes when creating new project") : - m_app_config_key == "default_action_on_select_preset" ? _L("Ask for unsaved changes when selecting new preset") : - _L("Ask to save unsaved changes when closing the application or when loading a new project") ; - wxString action = m_app_config_key == "default_action_on_new_project" ? _L("You will not be asked about the unsaved changes the next time you create new project") : - m_app_config_key == "default_action_on_select_preset" ? _L("You will not be asked about the unsaved changes the next time you switch a preset") : - _L("You will not be asked about the unsaved changes the next time you: \n" + wxString preferences_item = m_app_config_key == "default_action_on_new_project" ? _L("Ask for unsaved changes in presets when creating new project") : + m_app_config_key == "default_action_on_select_preset" ? _L("Ask for unsaved changes in presets when selecting new preset") : + _L("Ask to save unsaved changes in presets when closing the application or when loading a new project") ; + wxString action = m_app_config_key == "default_action_on_new_project" ? _L("You will not be asked about the unsaved changes in presets the next time you create new project") : + m_app_config_key == "default_action_on_select_preset" ? _L("You will not be asked about the unsaved changes in presets the next time you switch a preset") : + _L("You will not be asked about the unsaved changes in presets the next time you: \n" "- Closing PrusaSlicer while some presets are modified,\n" "- Loading a new project while some presets are modified") ; wxString msg = _L("PrusaSlicer will remember your action.") + "\n\n" + action + "\n\n" + @@ -1441,7 +1441,7 @@ DiffPresetDialog::DiffPresetDialog(MainFrame* mainframe) m_preset_bundle_left = std::make_unique(*wxGetApp().preset_bundle); m_preset_bundle_right = std::make_unique(*wxGetApp().preset_bundle); - m_top_info_line = new wxStaticText(this, wxID_ANY, "Select presets to compare"); + m_top_info_line = new wxStaticText(this, wxID_ANY, _L("Select presets to compare")); m_top_info_line->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold()); m_bottom_info_line = new wxStaticText(this, wxID_ANY, ""); -- cgit v1.2.3