diff --git a/resources/localization/PrusaSlicer.pot b/resources/localization/PrusaSlicer.pot index 0b9ebff88..059c211de 100644 --- a/resources/localization/PrusaSlicer.pot +++ b/resources/localization/PrusaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-05 22:12+0100\n" +"POT-Creation-Date: 2020-11-06 11:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1521,8 +1521,7 @@ msgstr "" #: src/slic3r/GUI/GCodeViewer.cpp:2317 src/slic3r/GUI/GCodeViewer.cpp:2353 #: src/slic3r/GUI/GCodeViewer.cpp:2358 src/slic3r/GUI/GUI_ObjectList.cpp:296 -#: src/slic3r/GUI/Tab.cpp:1790 src/slic3r/GUI/wxExtensions.cpp:515 -#: src/libslic3r/PrintConfig.cpp:530 +#: src/slic3r/GUI/wxExtensions.cpp:515 src/libslic3r/PrintConfig.cpp:530 msgid "Extruder" msgstr "" @@ -2384,19 +2383,19 @@ msgid "Gizmo-Place on Face" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:39 -msgid "Supports gizmo turned on" +msgid "Entering Paint-on supports" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:40 -msgid "Paint-on seams on" +msgid "Entering Seam painting" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:47 -msgid "Paint-on seams off" +msgid "Leaving Seam painting" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:48 -msgid "Supports gizmo turned off" +msgid "Leaving Paint-on supports" msgstr "" #: src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp:371 @@ -3935,9 +3934,7 @@ msgid "Plater" msgstr "" #: src/slic3r/GUI/KBShortcutsDialog.cpp:197 -msgid "" -"All gizmos: Press to rotate view with mouse left or to pan view with mouse " -"right" +msgid "All gizmos: Rotate - left mouse button; Pan - right mouse button" msgstr "" #: src/slic3r/GUI/KBShortcutsDialog.cpp:198 @@ -4922,7 +4919,7 @@ msgid "Print Host upload" msgstr "" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:260 -msgid "Querying printers connected to a print host failed." +msgid "Connection to printers connected via the print host failed." msgstr "" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:300 @@ -4991,8 +4988,8 @@ msgstr "" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:555 msgid "" -"Next printer preset(s) is(are) duplicated:%1%Should I add it(they) just once " -"for the printer \"%2%\" and close the Editing Dialog?" +"Following printer preset(s) is duplicated:%1%The above preset for printer " +"\"%2%\" will be used just once." msgstr "" #: src/slic3r/GUI/PhysicalPrinterDialog.cpp:601 @@ -5692,8 +5689,9 @@ msgstr "" #: src/slic3r/GUI/Preferences.cpp:125 msgid "" -"If this is enabled, when starting PrusaSlicer and another instance of same " -"PrusaSlicer is running, that instance will be reactivated instead." +"If this is enabled, when starting PrusaSlicer and another instance of the " +"same PrusaSlicer is already running, that instance will be reactivated " +"instead." msgstr "" #: src/slic3r/GUI/Preferences.cpp:135 @@ -6532,6 +6530,10 @@ msgstr "" msgid "Temperature" msgstr "" +#: src/slic3r/GUI/Tab.cpp:1790 +msgid "Nozzle" +msgstr "" + #: src/slic3r/GUI/Tab.cpp:1795 msgid "Bed" msgstr "" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp index c3a04f293..819d014e8 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp @@ -36,16 +36,16 @@ void GLGizmoPainterBase::activate_internal_undo_redo_stack(bool activate) { if (activate && ! m_internal_stack_active) { wxString str = get_painter_type() == PainterGizmoType::FDM_SUPPORTS - ? _L("Supports gizmo turned on") - : _L("Paint-on seams on"); + ? _L("Entering Paint-on supports") + : _L("Entering Seam painting"); Plater::TakeSnapshot(wxGetApp().plater(), str); wxGetApp().plater()->enter_gizmos_stack(); m_internal_stack_active = true; } if (! activate && m_internal_stack_active) { wxString str = get_painter_type() == PainterGizmoType::SEAM - ? _L("Paint-on seams off") - : _L("Supports gizmo turned off"); + ? _L("Leaving Seam painting") + : _L("Leaving Paint-on supports"); wxGetApp().plater()->leave_gizmos_stack(); Plater::TakeSnapshot(wxGetApp().plater(), str); m_internal_stack_active = false; diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index dde873293..7146ea077 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -194,7 +194,7 @@ void KBShortcutsDialog::fill_shortcuts() m_full_shortcuts.push_back(std::make_pair(_L("Plater"), plater_shortcuts)); Shortcuts gizmos_shortcuts = { - { ctrl, L("All gizmos: Press to rotate view with mouse left or to pan view with mouse right") }, + { ctrl, L("All gizmos: Rotate - left mouse button; Pan - right mouse button") }, { "Shift+", L("Gizmo move: Press to snap by 1mm") }, { "Shift+", L("Gizmo scale: Press to snap by 5%") }, { "F", L("Gizmo scale: Scale selection to fit print volume") }, diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index 6aae93f89..04c6d4d80 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -257,7 +257,7 @@ void PhysicalPrinterDialog::update_printers() printers.clear(); } catch (const HostNetworkError &err) { printers.clear(); - show_error(this, _L("Querying printers connected to a print host failed.") + "\n\n" + from_u8(err.what())); + show_error(this, _L("Connection to printers connected via the print host failed.") + "\n\n" + from_u8(err.what())); } Choice *choice = dynamic_cast(rs); choice->set_values(printers); @@ -552,10 +552,10 @@ void PhysicalPrinterDialog::OnOK(wxEvent& event) repeatable_presets += " " + from_u8(preset_name) + "\n"; repeatable_presets += "\n"; - wxString msg_text = from_u8((boost::format(_u8L("Next printer preset(s) is(are) duplicated:%1%" - "Should I add it(they) just once for the printer \"%2%\" and close the Editing Dialog?")) % repeatable_presets % printer_name).str()); - wxMessageDialog dialog(nullptr, msg_text, _L("Warning"), wxICON_WARNING | wxYES | wxNO); - if (dialog.ShowModal() == wxID_NO) + wxString msg_text = from_u8((boost::format(_u8L("Following printer preset(s) is duplicated:%1%" + "The above preset for printer \"%2%\" will be used just once.")) % repeatable_presets % printer_name).str()); + wxMessageDialog dialog(nullptr, msg_text, _L("Warning"), wxICON_WARNING | wxOK | wxCANCEL); + if (dialog.ShowModal() == wxID_CANCEL) return; } diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 22ad2be7e..9cc5d7878 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -122,7 +122,7 @@ void PreferencesDialog::build() #if __APPLE__ def.tooltip = L("On OSX there is always only one instance of app running by default. However it is allowed to run multiple instances of same app from the command line. In such case this settings will allow only one instance."); #else - def.tooltip = L("If this is enabled, when starting PrusaSlicer and another instance of same PrusaSlicer is running, that instance will be reactivated instead."); + def.tooltip = L("If this is enabled, when starting PrusaSlicer and another instance of the same PrusaSlicer is already running, that instance will be reactivated instead."); #endif def.set_default_value(new ConfigOptionBool{ app_config->has("single_instance") ? app_config->get("single_instance") == "1" : false }); option = Option(def, "single_instance"); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 12963804a..45ee92c74 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1787,7 +1787,7 @@ void TabFilament::build() // optgroup = page->new_optgroup(_(L("Temperature")) + wxString(" °C", wxConvUTF8)); optgroup = page->new_optgroup(L("Temperature")); - Line line = { L("Extruder"), "" }; + Line line = { L("Nozzle"), "" }; line.append_option(optgroup->get_option("first_layer_temperature")); line.append_option(optgroup->get_option("temperature")); optgroup->append_line(line);