diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot index 00c82f5be..38a3bfa51 100644 --- a/bbl/i18n/BambuStudio.pot +++ b/bbl/i18n/BambuStudio.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1789,9 +1789,6 @@ msgstr "" msgid "Display" msgstr "" -msgid "Line type" -msgstr "" - msgid "Layer Height (mm)" msgstr "" @@ -2378,7 +2375,7 @@ msgstr "" msgid "Resume" msgstr "" -msgid "Abort" +msgid "Stop" msgstr "" msgid "0" @@ -3748,6 +3745,15 @@ msgstr "" msgid "Capabilities" msgstr "" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "" @@ -3773,7 +3779,7 @@ msgstr "" msgid "Choose files" msgstr "" -msgid "Designer" +msgid "Author" msgstr "" msgid "Model Name" diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po index c706fb0f6..a383eceaa 100644 --- a/bbl/i18n/de/BambuStudio_de.po +++ b/bbl/i18n/de/BambuStudio_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1947,9 +1947,6 @@ msgstr "Zeit" msgid "Display" msgstr "Anzeigen" -msgid "Line type" -msgstr "Linientyp" - msgid "Layer Height (mm)" msgstr "Schichthöhe (mm)" @@ -2541,8 +2538,8 @@ msgstr "Druckprozess" msgid "Resume" msgstr "Fortsetzen" -msgid "Abort" -msgstr "" +msgid "Stop" +msgstr "Stop" msgid "0" msgstr "" @@ -4013,6 +4010,15 @@ msgstr "Allgemein" msgid "Capabilities" msgstr "Fähigkeiten" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "Als Abdeckung einstellen" @@ -4038,8 +4044,8 @@ msgstr "Montageanleitung" msgid "Choose files" msgstr "Dateien auswählen" -msgid "Designer" -msgstr "Designer" +msgid "Author" +msgstr "" msgid "Model Name" msgstr "Modellname" @@ -6655,12 +6661,15 @@ msgstr "Support: Löcher in Schicht %d repairieren" msgid "Support: propagate branches at layer %d" msgstr "Support: Verbreiten von Zweigen auf Ebene %d" +#~ msgid "Line type" +#~ msgstr "Linientyp" + +#~ msgid "Designer" +#~ msgstr "Designer" + #~ msgid "Report" #~ msgstr "Bericht" -#~ msgid "Stop" -#~ msgstr "Stop" - #~ msgid "0%" #~ msgstr "0%" diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po index 2a3990c01..8e779334b 100644 --- a/bbl/i18n/en/BambuStudio_en.po +++ b/bbl/i18n/en/BambuStudio_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -1046,7 +1046,7 @@ msgid "Multicolor Print" msgstr "Multicolor Print" msgid "Line Type" -msgstr "Line type" +msgstr "Line Type" msgid "No printer" msgstr "No printer" @@ -1908,9 +1908,6 @@ msgstr "Time" msgid "Display" msgstr "Display" -msgid "Line type" -msgstr "Line type" - msgid "Layer Height (mm)" msgstr "Layer height (mm)" @@ -2502,8 +2499,8 @@ msgstr "Printing progress" msgid "Resume" msgstr "Resume" -msgid "Abort" -msgstr "" +msgid "Stop" +msgstr "Stop" msgid "0" msgstr "" @@ -3930,6 +3927,15 @@ msgstr "General" msgid "Capabilities" msgstr "Capabilities" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "Set as cover" @@ -3955,8 +3961,8 @@ msgstr "Assembly Guide" msgid "Choose files" msgstr "Choose files" -msgid "Designer" -msgstr "Designer" +msgid "Author" +msgstr "" msgid "Model Name" msgstr "Model Name" @@ -6504,12 +6510,15 @@ msgstr "Support: fix holes at layer %d" msgid "Support: propagate branches at layer %d" msgstr "Support: propagate branches at layer %d" +#~ msgid "Line type" +#~ msgstr "Line type" + +#~ msgid "Designer" +#~ msgstr "Designer" + #~ msgid "Report" #~ msgstr "Report" -#~ msgid "Stop" -#~ msgstr "Stop" - #~ msgid "0%" #~ msgstr "0%" diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po index b0e1d8c2f..465f60c14 100644 --- a/bbl/i18n/es/BambuStudio_es.po +++ b/bbl/i18n/es/BambuStudio_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1945,9 +1945,6 @@ msgstr "Tiempo" msgid "Display" msgstr "Pantalla" -msgid "Line type" -msgstr "Tipo de línea" - msgid "Layer Height (mm)" msgstr "Altura de la capa (mm)" @@ -2539,8 +2536,8 @@ msgstr "Progreso de impresión" msgid "Resume" msgstr "Reanudar" -msgid "Abort" -msgstr "" +msgid "Stop" +msgstr "Detener" msgid "0" msgstr "" @@ -4004,6 +4001,15 @@ msgstr "General" msgid "Capabilities" msgstr "Capacidades" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "Ajustar como cubierta" @@ -4029,8 +4035,8 @@ msgstr "Guía de montaje" msgid "Choose files" msgstr "Elija los archivos" -msgid "Designer" -msgstr "Diseñador" +msgid "Author" +msgstr "" msgid "Model Name" msgstr "Nombre del modelo" @@ -6639,12 +6645,15 @@ msgstr "Soporte: arreglar huecos en la capa %d" msgid "Support: propagate branches at layer %d" msgstr "Soporte: propagar ramas en la capa %d" +#~ msgid "Line type" +#~ msgstr "Tipo de línea" + +#~ msgid "Designer" +#~ msgstr "Diseñador" + #~ msgid "Report" #~ msgstr "Informe" -#~ msgid "Stop" -#~ msgstr "Detener" - #~ msgid "0%" #~ msgstr "0%" diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po index eda3a705e..9ae9e70d7 100644 --- a/bbl/i18n/fr/BambuStudio_fr.po +++ b/bbl/i18n/fr/BambuStudio_fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1913,9 +1913,6 @@ msgstr "Durée" msgid "Display" msgstr "Afficher" -msgid "Line type" -msgstr "Type de ligne" - msgid "Layer Height (mm)" msgstr "Hauteur de couche (mm)" @@ -2508,8 +2505,8 @@ msgstr "Progression de l'impression" msgid "Resume" msgstr "Résumer" -msgid "Abort" -msgstr "" +msgid "Stop" +msgstr "Arrêt" msgid "0" msgstr "" @@ -3960,6 +3957,15 @@ msgstr "Général" msgid "Capabilities" msgstr "Fonctionnalités" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "Définir comme couverture" @@ -3985,8 +3991,8 @@ msgstr "Guide d'assemblage" msgid "Choose files" msgstr "Choisir des fichiers" -msgid "Designer" -msgstr "Designer" +msgid "Author" +msgstr "" msgid "Model Name" msgstr "Nom du modèle" @@ -6608,12 +6614,15 @@ msgstr "Support: fix holes at layer %d" msgid "Support: propagate branches at layer %d" msgstr "Support: propagate branches at layer %d" +#~ msgid "Line type" +#~ msgstr "Type de ligne" + +#~ msgid "Designer" +#~ msgstr "Designer" + #~ msgid "Report" #~ msgstr "Signaler" -#~ msgid "Stop" -#~ msgstr "Arrêt" - #~ msgid "0%" #~ msgstr "0%" diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po index 7958f9088..15bb112e2 100644 --- a/bbl/i18n/hu/BambuStudio_hu.po +++ b/bbl/i18n/hu/BambuStudio_hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1936,9 +1936,6 @@ msgstr "Idő" msgid "Display" msgstr "Megjelenítés" -msgid "Line type" -msgstr "Vonal típusa" - msgid "Layer Height (mm)" msgstr "Rétegmagasság (mm)" @@ -2539,8 +2536,8 @@ msgstr "Nyomtatás folyamata" msgid "Resume" msgstr "Folytatás" -msgid "Abort" -msgstr "" +msgid "Stop" +msgstr "Állj" msgid "0" msgstr "" @@ -3980,6 +3977,15 @@ msgstr "Általános" msgid "Capabilities" msgstr "Képességek" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "Beállítás borítóként" @@ -4005,8 +4011,8 @@ msgstr "Összeszerelési útmutató" msgid "Choose files" msgstr "Fájlok kiválasztása" -msgid "Designer" -msgstr "Tervező" +msgid "Author" +msgstr "" msgid "Model Name" msgstr "Model Name" @@ -6599,12 +6605,15 @@ msgstr "Support: fix holes at layer %d" msgid "Support: propagate branches at layer %d" msgstr "Support: propagate branches at layer %d" +#~ msgid "Line type" +#~ msgstr "Vonal típusa" + +#~ msgid "Designer" +#~ msgstr "Tervező" + #~ msgid "Report" #~ msgstr "Report" -#~ msgid "Stop" -#~ msgstr "Állj" - #~ msgid "0%" #~ msgstr "0%" diff --git a/bbl/i18n/nl/BambuStudio_nl.po b/bbl/i18n/nl/BambuStudio_nl.po index bf3db009b..c6c46fb8d 100644 --- a/bbl/i18n/nl/BambuStudio_nl.po +++ b/bbl/i18n/nl/BambuStudio_nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1937,9 +1937,6 @@ msgstr "Tijd" msgid "Display" msgstr "Tonen" -msgid "Line type" -msgstr "Lijn-type" - msgid "Layer Height (mm)" msgstr "Laaghoogte (mm)" @@ -2531,8 +2528,8 @@ msgstr "Print voortgang" msgid "Resume" msgstr "Hervatten" -msgid "Abort" -msgstr "" +msgid "Stop" +msgstr "Stop" msgid "0" msgstr "" @@ -4006,6 +4003,15 @@ msgstr "Algemeen" msgid "Capabilities" msgstr "Mogelijkheden" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "Instellen als dekking" @@ -4031,8 +4037,8 @@ msgstr "Montagehandleiding" msgid "Choose files" msgstr "Kies bestanden" -msgid "Designer" -msgstr "Ontwerper" +msgid "Author" +msgstr "" msgid "Model Name" msgstr "Model naam" @@ -6657,12 +6663,15 @@ msgstr "Support: fix holes at layer %d" msgid "Support: propagate branches at layer %d" msgstr "Support: propagate branches at layer %d" +#~ msgid "Line type" +#~ msgstr "Lijn-type" + +#~ msgid "Designer" +#~ msgstr "Ontwerper" + #~ msgid "Report" #~ msgstr "Rapport" -#~ msgid "Stop" -#~ msgstr "Stop" - #~ msgid "0%" #~ msgstr "0%" diff --git a/bbl/i18n/sv/BambuStudio_sv.po b/bbl/i18n/sv/BambuStudio_sv.po index ae0662f61..789316fad 100644 --- a/bbl/i18n/sv/BambuStudio_sv.po +++ b/bbl/i18n/sv/BambuStudio_sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Bambu Studio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1911,9 +1911,6 @@ msgstr "Tid" msgid "Display" msgstr "Visa" -msgid "Line type" -msgstr "Linje typ" - msgid "Layer Height (mm)" msgstr "Lagerhöjd (mm)" @@ -2505,8 +2502,8 @@ msgstr "Utskriftsförlopp" msgid "Resume" msgstr "Återuppta" -msgid "Abort" -msgstr "" +msgid "Stop" +msgstr "Stopp" msgid "0" msgstr "" @@ -3941,6 +3938,15 @@ msgstr "Allmän" msgid "Capabilities" msgstr "Förmågor" +msgid "Show all presets (including incompatible)" +msgstr "" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "Ställ in som skydd" @@ -3966,8 +3972,8 @@ msgstr "Monterings Guide" msgid "Choose files" msgstr "Välj filer" -msgid "Designer" -msgstr "Designer" +msgid "Author" +msgstr "" msgid "Model Name" msgstr "Modell Namn" @@ -6507,12 +6513,15 @@ msgstr "Support: åtgärda hål vid lager %d" msgid "Support: propagate branches at layer %d" msgstr "Support: föröka grenar vid lager %d" +#~ msgid "Line type" +#~ msgstr "Linje typ" + +#~ msgid "Designer" +#~ msgstr "Designer" + #~ msgid "Report" #~ msgstr "Rapportera" -#~ msgid "Stop" -#~ msgstr "Stopp" - #~ msgid "0%" #~ msgstr "0%" diff --git a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po index cdab56fa2..e428a3bda 100644 --- a/bbl/i18n/zh_cn/BambuStudio_zh_CN.po +++ b/bbl/i18n/zh_cn/BambuStudio_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-25 15:20+0800\n" +"POT-Creation-Date: 2022-08-26 14:09+0800\n" "PO-Revision-Date: 2022-08-07 21:57+0800\n" "Last-Translator: Jiang Yue \n" "Language-Team: \n" @@ -1855,9 +1855,6 @@ msgstr "时间" msgid "Display" msgstr "显示" -msgid "Line type" -msgstr "走线类型" - msgid "Layer Height (mm)" msgstr "层高(mm)" @@ -2456,8 +2453,8 @@ msgstr "打印进度" msgid "Resume" msgstr "继续" -msgid "Abort" -msgstr "终止" +msgid "Stop" +msgstr "停止" msgid "0" msgstr "" @@ -3847,6 +3844,15 @@ msgstr "常规" msgid "Capabilities" msgstr "能力" +msgid "Show all presets (including incompatible)" +msgstr "显示所有预设(包括不兼容的)" + +msgid "Compare Presets" +msgstr "" + +msgid "Add File" +msgstr "" + msgid "Set as cover" msgstr "设置为封面" @@ -3872,8 +3878,8 @@ msgstr "组装指南" msgid "Choose files" msgstr "选择文件" -msgid "Designer" -msgstr "设计师" +msgid "Author" +msgstr "作者" msgid "Model Name" msgstr "模型名字" @@ -6245,12 +6251,18 @@ msgstr "支撑:正在修补层%d的空洞" msgid "Support: propagate branches at layer %d" msgstr "支撑:正在生长层%d的树枝" +#~ msgid "Line type" +#~ msgstr "走线类型" + +#~ msgid "Abort" +#~ msgstr "终止" + +#~ msgid "Designer" +#~ msgstr "设计师" + #~ msgid "Report" #~ msgstr "报告" -#~ msgid "Stop" -#~ msgstr "停止" - #~ msgid "0%" #~ msgstr "0%" diff --git a/resources/i18n/de/BambuStudio.mo b/resources/i18n/de/BambuStudio.mo index b602b08a0..b2335228b 100644 Binary files a/resources/i18n/de/BambuStudio.mo and b/resources/i18n/de/BambuStudio.mo differ diff --git a/resources/i18n/en/BambuStudio.mo b/resources/i18n/en/BambuStudio.mo index 04d7b1f0f..ce4c9a1fe 100644 Binary files a/resources/i18n/en/BambuStudio.mo and b/resources/i18n/en/BambuStudio.mo differ diff --git a/resources/i18n/es/BambuStudio.mo b/resources/i18n/es/BambuStudio.mo index 98687b277..576e7295d 100644 Binary files a/resources/i18n/es/BambuStudio.mo and b/resources/i18n/es/BambuStudio.mo differ diff --git a/resources/i18n/fr/BambuStudio.mo b/resources/i18n/fr/BambuStudio.mo index 46e477830..11a40603b 100644 Binary files a/resources/i18n/fr/BambuStudio.mo and b/resources/i18n/fr/BambuStudio.mo differ diff --git a/resources/i18n/hu/BambuStudio.mo b/resources/i18n/hu/BambuStudio.mo index 68c9270f6..a47922377 100644 Binary files a/resources/i18n/hu/BambuStudio.mo and b/resources/i18n/hu/BambuStudio.mo differ diff --git a/resources/i18n/nl/BambuStudio.mo b/resources/i18n/nl/BambuStudio.mo index 7c9657731..26e8a7659 100644 Binary files a/resources/i18n/nl/BambuStudio.mo and b/resources/i18n/nl/BambuStudio.mo differ diff --git a/resources/i18n/sv/BambuStudio.mo b/resources/i18n/sv/BambuStudio.mo index 6f0fe0d87..c4f8c84ff 100644 Binary files a/resources/i18n/sv/BambuStudio.mo and b/resources/i18n/sv/BambuStudio.mo differ diff --git a/resources/i18n/zh_cn/BambuStudio.mo b/resources/i18n/zh_cn/BambuStudio.mo index 79bb0cd54..0dabcf315 100644 Binary files a/resources/i18n/zh_cn/BambuStudio.mo and b/resources/i18n/zh_cn/BambuStudio.mo differ diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 800fc32b1..7c49f18ef 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -4385,7 +4385,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv { case EViewType::FeatureType: { - append_headers({_u8L("Line type"), _u8L("Time"), _u8L("Percent"), "", _u8L("Display")}, offsets); + append_headers({_u8L("Line Type"), _u8L("Time"), _u8L("Percent"), "", _u8L("Display")}, offsets); break; } case EViewType::Height: { imgui.title(_u8L("Layer Height (mm)")); break; } diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp index 580e06d2a..594b1c169 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.cpp +++ b/src/slic3r/GUI/GUI_ObjectTable.cpp @@ -2762,24 +2762,24 @@ void ObjectTablePanel::load_data() #if HAS_COL_HEADER m_object_grid->SetColLabelAlignment(wxALIGN_LEFT, wxALIGN_CENTER); - m_object_grid->SetColLabelValue(ObjectGridTable::col_printable, L("Printable")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_printable, _L("Printable")); m_object_grid->SetColLabelValue(ObjectGridTable::col_printable_reset, ""); - m_object_grid->SetColLabelValue(ObjectGridTable::col_plate_index, L("Plate")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_plate_index, _L("Plate")); /*m_object_grid->SetColLabelValue(ObjectGridTable::col_assemble_name, L("Module"));*/ - m_object_grid->SetColLabelValue(ObjectGridTable::col_name, L("Name")); - m_object_grid->SetColLabelValue(ObjectGridTable::col_filaments, L("Filament")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_name, _L("Name")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_filaments, _L("Filament")); m_object_grid->SetColLabelValue(ObjectGridTable::col_filaments_reset, ""); - m_object_grid->SetColLabelValue(ObjectGridTable::col_layer_height, L("Layer height")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_layer_height, _L("Layer height")); m_object_grid->SetColLabelValue(ObjectGridTable::col_layer_height_reset, ""); - m_object_grid->SetColLabelValue(ObjectGridTable::col_wall_loops, L("Wall loops")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_wall_loops, _L("Wall loops")); m_object_grid->SetColLabelValue(ObjectGridTable::col_wall_loops_reset, ""); - m_object_grid->SetColLabelValue(ObjectGridTable::col_fill_density, L("Infill density(%)")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_fill_density, _L("Infill density(%)")); m_object_grid->SetColLabelValue(ObjectGridTable::col_fill_density_reset, ""); - m_object_grid->SetColLabelValue(ObjectGridTable::col_enable_support, L("Support")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_enable_support, _L("Support")); m_object_grid->SetColLabelValue(ObjectGridTable::col_enable_support_reset, ""); - m_object_grid->SetColLabelValue(ObjectGridTable::col_brim_type, L("Brim")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_brim_type, _L("Brim")); m_object_grid->SetColLabelValue(ObjectGridTable::col_brim_type_reset, ""); - m_object_grid->SetColLabelValue(ObjectGridTable::col_speed_perimeter, L("Inner wall speed")); + m_object_grid->SetColLabelValue(ObjectGridTable::col_speed_perimeter, _L("Inner wall speed")); m_object_grid->SetColLabelValue(ObjectGridTable::col_speed_perimeter_reset, ""); m_object_grid->SetLabelFont(Label::Head_13); m_object_grid->SetLabelTextColour(wxColour(0x30,0x3a,0x3c)); diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp index 71d594a25..ae71b707a 100644 --- a/src/slic3r/GUI/SavePresetDialog.cpp +++ b/src/slic3r/GUI/SavePresetDialog.cpp @@ -114,7 +114,7 @@ SavePresetDialog::Item::Item(Preset::Type type, const std::string &suffix, wxBox m_sizer_left->Add(0, 0, 0, wxLEFT, 10); - auto m_left_text = new wxStaticText(parent, wxID_ANY, L("User Preset"), wxDefaultPosition, wxDefaultSize, 0); + auto m_left_text = new wxStaticText(parent, wxID_ANY, _L("User Preset"), wxDefaultPosition, wxDefaultSize, 0); m_left_text->Wrap(-1); m_left_text->SetFont(::Label::Body_13); m_left_text->SetForegroundColour(wxColour(107,107,107)); @@ -133,7 +133,7 @@ SavePresetDialog::Item::Item(Preset::Type type, const std::string &suffix, wxBox m_sizer_right->Add(0, 0, 0, wxLEFT, 10); - auto m_right_text = new wxStaticText(parent, wxID_ANY, L("Project Inside Preset"), wxDefaultPosition, wxDefaultSize, 0); + auto m_right_text = new wxStaticText(parent, wxID_ANY, _L("Project Inside Preset"), wxDefaultPosition, wxDefaultSize, 0); m_right_text->SetForegroundColour(wxColour(107,107,107)); m_right_text->SetFont(::Label::Body_13); m_right_text->Wrap(-1); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index a68229c11..2c27a68ca 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -411,7 +411,7 @@ wxBoxSizer *StatusBasePanel::create_project_task_page(wxWindow *parent) }); m_button_abort = new ScalableButton(m_panel_progress, wxID_ANY, "print_control_stop", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true); - m_button_abort->SetToolTip(_L("Abort")); + m_button_abort->SetToolTip(_L("Stop")); m_button_abort->Bind(wxEVT_ENTER_WINDOW, [this](auto &e) { m_button_abort->SetBitmap_("print_control_stop_hover"); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 04382ec14..9afc212a4 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -1822,7 +1822,7 @@ DiffPresetDialog::DiffPresetDialog(MainFrame* mainframe) }); } - m_show_all_presets = new wxCheckBox(this, wxID_ANY, "Show all presets (including incompatible)"); + m_show_all_presets = new wxCheckBox(this, wxID_ANY, _L("Show all presets (including incompatible)")); m_show_all_presets->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent&) { bool show_all = m_show_all_presets->GetValue(); for (auto preset_combos : m_preset_combos) { @@ -1883,7 +1883,7 @@ void DiffPresetDialog::update_bundles_from_app() void DiffPresetDialog::show(Preset::Type type /* = Preset::TYPE_INVALID*/) { - this->SetTitle("Compare Presets"); + this->SetTitle(_L("Compare presets")); m_view_type = type; update_bundles_from_app();