From 15ea6f5609f82eb2889280cdcd6aa1dbd364ae09 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Mon, 24 Feb 2020 10:54:50 +0100 Subject: [PATCH] Several translation-related fixes ConfigWizard name was missing translation macro in several places Few typos corrected Some string conversions fixed Two strings were not marked for translation --- src/slic3r/GUI/ConfigWizard.cpp | 4 ++-- src/slic3r/GUI/GUI_App.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 4 ++-- src/slic3r/GUI/UpdateDialogs.cpp | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index cc16bf1cee..69f11c9cfc 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -432,7 +432,7 @@ PageWelcome::PageWelcome(ConfigWizard *parent) , welcome_text(append_text(wxString::Format( _(L("Hello, welcome to %s! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")), SLIC3R_APP_NAME, - ConfigWizard::name()) + _(ConfigWizard::name())) )) , cbox_reset(append( new wxCheckBox(this, wxID_ANY, _(L("Remove user profiles - install from scratch (a snapshot will be taken beforehand)"))) @@ -1946,7 +1946,7 @@ bool ConfigWizard::priv::check_sla_selected() // Public ConfigWizard::ConfigWizard(wxWindow *parent) - : DPIDialog(parent, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _(name().ToStdString()), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) + : DPIDialog(parent, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _(name()), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) , p(new priv(this)) { this->SetFont(wxGetApp().normal_font()); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index cf9ab6e4d9..e1973049f3 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -793,7 +793,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu) auto local_menu = new wxMenu(); wxWindowID config_id_base = wxWindow::NewControlId(int(ConfigMenuCnt)); - const auto config_wizard_name = _(ConfigWizard::name(true).wx_str()); + const auto config_wizard_name = _(ConfigWizard::name(true)); const auto config_wizard_tooltip = wxString::Format(_(L("Run %s")), config_wizard_name); // Cmd+, is standard on OS X - what about other operating systems? local_menu->Append(config_id_base + ConfigMenuWizard, config_wizard_name + dots, config_wizard_tooltip); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 14f24a9993..f5fc9ee790 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -4743,8 +4743,8 @@ void Plater::set_number_of_copies(/*size_t num*/) ModelObject* model_object = p->model.objects[obj_idx]; - const int num = wxGetNumberFromUser( " ", _("Enter the number of copies:"), - _("Copies of the selected object"), model_object->instances.size(), 0, 1000, this ); + const int num = wxGetNumberFromUser( " ", _(L("Enter the number of copies:")), + _(L("Copies of the selected object")), model_object->instances.size(), 0, 1000, this ); if (num < 0) return; diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index 5e4712ac60..389189d88f 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -277,7 +277,7 @@ MsgDataLegacy::MsgDataLegacy() : "Please proceed with the %s that follows to set up the new presets " "and to choose whether to enable automatic preset updates." )), - SLIC3R_APP_NAME, ConfigWizard::name() + SLIC3R_APP_NAME, _(ConfigWizard::name()) )); text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit()); content_sizer->Add(text); @@ -300,14 +300,14 @@ MsgDataLegacy::~MsgDataLegacy() {} // MsgNoUpdate MsgNoUpdates::MsgNoUpdates() : - MsgDialog(nullptr, _(L("Configuration updates")), _(L("No updates aviable"))) + MsgDialog(nullptr, _(L("Configuration updates")), _(L("No updates available"))) { auto* text = new wxStaticText(this, wxID_ANY, wxString::Format( _(L( - "%s has no configuration updates aviable." + "%s has no configuration updates available." )), - SLIC3R_APP_NAME, ConfigWizard::name() + SLIC3R_APP_NAME )); text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit()); content_sizer->Add(text);