From fd0d716f53d51b94b4025eae00633066788a9b36 Mon Sep 17 00:00:00 2001 From: Alexandre Folle de Menezes Date: Wed, 16 Jul 2025 22:48:29 -0300 Subject: [PATCH] Standard units don't need translation, part 2 (#9974) * Revert unit change made by mistake, and fix some unit translations * Fix the declaration of untranslated Unicode strings --- localization/i18n/OrcaSlicer.pot | 2 +- localization/i18n/ca/OrcaSlicer_ca.po | 4 +- localization/i18n/cs/OrcaSlicer_cs.po | 4 +- localization/i18n/de/OrcaSlicer_de.po | 4 +- localization/i18n/en/OrcaSlicer_en.po | 2 +- localization/i18n/es/OrcaSlicer_es.po | 4 +- localization/i18n/fr/OrcaSlicer_fr.po | 4 +- localization/i18n/hu/OrcaSlicer_hu.po | 2 +- localization/i18n/it/OrcaSlicer_it.po | 4 +- localization/i18n/ja/OrcaSlicer_ja.po | 2 +- localization/i18n/ko/OrcaSlicer_ko.po | 5 +- localization/i18n/lt/OrcaSlicer_lt.po | 5 +- localization/i18n/nl/OrcaSlicer_nl.po | 2 +- localization/i18n/pl/OrcaSlicer_pl.po | 4 +- localization/i18n/pt_BR/OrcaSlicer_pt_BR.po | 6 +- localization/i18n/ru/OrcaSlicer_ru.po | 3 +- localization/i18n/sv/OrcaSlicer_sv.po | 6 +- localization/i18n/tr/OrcaSlicer_tr.po | 4 +- localization/i18n/uk/OrcaSlicer_uk.po | 3 +- localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 6 +- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 2 +- src/libslic3r/PrintConfig.cpp | 78 +++++++++---------- .../GUI/CalibrationWizardPresetPage.cpp | 2 +- src/slic3r/GUI/ConfigWizard.cpp | 4 +- src/slic3r/GUI/ExtrusionCalibration.cpp | 6 +- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/RammingChart.cpp | 4 +- src/slic3r/GUI/WipeTowerDialog.cpp | 2 +- src/slic3r/GUI/calib_dlg.cpp | 16 ++-- 29 files changed, 100 insertions(+), 92 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 44def97442..cb5c116d47 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -11527,7 +11527,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index a26787651d..60a9c070dd 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -13274,7 +13274,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13301,7 +13301,7 @@ msgstr "" "( alta velocitat/amplada més gran ) a una extrusió de menor flux ( menor " "velocitat/amplada més petita ) i viceversa.\n" "\n" -"Defineix la velocitat màxima a la qual el flux volumètric extruït en mm3/seg " +"Defineix la velocitat màxima a la qual el flux volumètric extruït en mm³/s " "pot canviar amb el temps. Els valors més alts signifiquen que es permeten " "canvis de velocitat d'extrusió més alts, cosa que resulta en transicions de " "velocitat més ràpides.\n" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index e2d4ebb816..43af6bc1a7 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -12385,7 +12385,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -12412,7 +12412,7 @@ msgstr "" "na extruzi s nižším průtokem (nižší rychlost/menší šířka) a naopak.\n" "\n" "Definuje maximální rychlost, kterou může objemový průtok extrudovaného " -"materiálu v mm3/s měnit v čase. Vyšší hodnoty znamenají, že jsou povoleny " +"materiálu v mm³/s měnit v čase. Vyšší hodnoty znamenají, že jsou povoleny " "větší změny extruzní rychlosti, což vede k rychlejším přechodům rychlosti.\n" "\n" "Hodnota 0 funkci zakáže.\n" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 123232d948..a9e9055989 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -13382,7 +13382,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13410,7 +13410,7 @@ msgstr "" "kleinere Breite) und umgekehrt wechselt.\n" "\n" "Es definiert die maximale Rate, mit der sich der extrudierte Volumenstrom in " -"mm3/s über die Zeit ändern kann. Höhere Werte bedeuten, dass höhere " +"mm³/s über die Zeit ändern kann. Höhere Werte bedeuten, dass höhere " "Extrusionsratenänderungen zulässig sind, was zu schnelleren " "Geschwindigkeitsübergängen führt.\n" "\n" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 7dc3822f51..cb18130458 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -11861,7 +11861,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index cc9cd101db..5e55b2dd42 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -13151,7 +13151,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13178,7 +13178,7 @@ msgstr "" "(alta velocidad/ancho mayor) a una extrusión de menor flujo (menor velocidad/" "ancho menor) y viceversa.\n" "\n" -"Define la velocidad máxima a la que el flujo volumétrico extruido en mm³/s² " +"Define la velocidad máxima a la que el flujo volumétrico extruido en mm³/s " "puede cambiar con el tiempo. Valores más altos significan que se permiten " "cambios de velocidad de extrusión más altos, lo que resulta en transiciones " "de velocidad más rápidas.\n" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index a98c7c4d9d..25426c4d69 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -13451,7 +13451,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13478,7 +13478,7 @@ msgstr "" "élevée / largeur de ligne plus grande) à une extrusion à débit plus faible " "(vitesse plus faible / largeur de ligne plus petite) et vice versa.\n" "\n" -"Il définit le taux maximum auquel le débit volumétrique extrudé en mm³/s² " +"Il définit le taux maximum auquel le débit volumétrique extrudé en mm³/s " "peut varier dans le temps. Des valeurs plus élevées signifient que des " "changements du taux d’extrusion plus élevés sont autorisés, ce qui entraîne " "des transitions de vitesse plus rapides.\n" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index 502ab5cad9..773584736b 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -12180,7 +12180,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 18379c4f2e..56ccdfbfe1 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -13364,7 +13364,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13393,7 +13393,7 @@ msgstr "" "viceversa.\n" "\n" "Definisce la velocità massima con cui la portata volumetrica estrusa in mm³/" -"s² può variare nel tempo. Valori più alti significano che sono consentite " +"s può variare nel tempo. Valori più alti significano che sono consentite " "variazioni più elevate della velocità di estrusione, con conseguenti " "transizioni di velocità più rapide.\n" "\n" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 7f3a4e0d29..35bdfaaf52 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -11905,7 +11905,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index fe1a35ba8a..3be8fd7263 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -12690,13 +12690,14 @@ msgstr "" msgid "Extrusion rate smoothing" msgstr "유연한 압출량" +#, fuzzy msgid "" "This parameter smooths out sudden extrusion rate changes that happen when the " "printer transitions from printing a high flow (high speed/larger width) " "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -12721,7 +12722,7 @@ msgstr "" "속도/더 작은 너비) 압출로 또는 그 반대로 출력할 때 발생하는 급격한 압출 속도 " "변화를 완화합니다.\n" "\n" -"이는 압출된 압출 압출량(mm3/초)이 시간에 따라 변할 수 있는 최대 속도를 정의합" +"이는 압출된 압출 압출량(mm³/초)이 시간에 따라 변할 수 있는 최대 속도를 정의합" "니다. 값이 높을수록 더 높은 압출 속도 변경이 허용되어 속도 전환이 더 빨라진다" "는 의미입니다.\n" "\n" diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index 18ff455288..ec2167c01c 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -13164,13 +13164,14 @@ msgstr "" msgid "Extrusion rate smoothing" msgstr "Ekstruzijos greičio išlyginimas" +#, fuzzy msgid "" "This parameter smooths out sudden extrusion rate changes that happen when " "the printer transitions from printing a high flow (high speed/larger width) " "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13198,7 +13199,7 @@ msgstr "" "išspaudimo ir atvirkščiai.\n" "\n" "Jis apibrėžia didžiausią greitį, kuriuo gali kisti išspaustas tūrinis " -"srautas mm3/sek. Didesnės vertės reiškia, kad leidžiami didesni ekstruzijos " +"srautas mm³/s. Didesnės vertės reiškia, kad leidžiami didesni ekstruzijos " "greičio pokyčiai, todėl greitis pereina greičiau.\n" "\n" "Reikšmė 0 išjungia šią funkciją.\n" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index aaf63e6f1a..5acdc45595 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -12372,7 +12372,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index f10512a9e8..524edc9108 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -13203,7 +13203,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13230,7 +13230,7 @@ msgstr "" "prędkość/większa szerokość) do wytłaczania o niższym przepływie (mniejsza " "prędkość/mniejsza szerokość) i odwrotnie.\n" "\n" -"Określa maksymalną szybkość, o jaką natężenie przepływu wytłaczania w mm3/s " +"Określa maksymalną szybkość, o jaką natężenie przepływu wytłaczania w mm³/s " "może zmieniać się w czasie. Wyższe wartości oznaczają, że dozwolone są " "większe zmiany szybkości wytłaczania, co skutkuje szybszymi przejściami " "prędkości.\n" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 0ed90b624f..cf1527d712 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -6673,7 +6673,7 @@ msgstr "Volume: %1% pol³\n" #, boost-format msgid "Volume: %1% mm³\n" -msgstr "Volume: %1% mm3\n" +msgstr "Volume: %1% mm³\n" #, boost-format msgid "Triangles: %1%\n" @@ -13236,7 +13236,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13263,7 +13263,7 @@ msgstr "" "velocidade/maior largura) para uma extrusão de baixo fluxo (baixa velocidade/" "menor largura) e vice-versa.\n" "\n" -"Define a taxa máxima pela qual o fluxo volumétrico extrudado em mm³/s² pode " +"Define a taxa máxima pela qual o fluxo volumétrico extrudado em mm³/s pode " "mudar ao longo do tempo. Valores mais altos significam que mudanças de taxa " "de extrusão mais altas são permitidas, resultando em transições de " "velocidade mais rápidas.\n" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 571284bb06..3ec1c050bf 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -13412,13 +13412,14 @@ msgstr "" msgid "Extrusion rate smoothing" msgstr "Сглаживание скорости экструзии" +#, fuzzy msgid "" "This parameter smooths out sudden extrusion rate changes that happen when " "the printer transitions from printing a high flow (high speed/larger width) " "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index d1e5918ed2..ef750d35d1 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -12121,7 +12121,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13982,11 +13982,13 @@ msgstr "för stor linjebredd " msgid " not in range " msgstr " inte inom intervallet " +#, fuzzy msgid "Export 3MF" msgstr "Exportera 3mf" +#, fuzzy msgid "Export project as 3MF." -msgstr "Exportera projekt som3mf." +msgstr "Exportera projekt som 3mf." msgid "Export slicing data" msgstr "Exportera beredningsdata" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 355ff3abca..d5a17f525d 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -13070,7 +13070,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -13097,7 +13097,7 @@ msgstr "" "ekstrüzyona geçtiğinde veya tam tersi olduğunda meydana gelen ani ekstrüzyon " "hızı değişikliklerini düzeltir.\n" "\n" -"Ekstrude edilen hacimsel akışın mm3/sn cinsinden zaman içinde değişebileceği " +"Ekstrude edilen hacimsel akışın mm³/s cinsinden zaman içinde değişebileceği " "maksimum oranı tanımlar. Daha yüksek değerler, daha yüksek ekstrüzyon hızı " "değişikliklerine izin verildiği anlamına gelir ve daha hızlı hız geçişlerine " "neden olur.\n" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 6eda9c55a9..44ef895cd9 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -13196,13 +13196,14 @@ msgstr "" msgid "Extrusion rate smoothing" msgstr "Вирівнювання швидкості екструзії" +#, fuzzy msgid "" "This parameter smooths out sudden extrusion rate changes that happen when " "the printer transitions from printing a high flow (high speed/larger width) " "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 603ad0194f..f96e5f7c27 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -12050,7 +12050,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" @@ -12074,14 +12074,14 @@ msgid "" msgstr "" "此参数是打印机从打印高流量挤出（高速/较大宽度）向低流量挤出（低速/较小宽度）" "时用于突然变化挤出速率的平滑，反之亦然。\n" -"它定义了挤出体积流量（mm3/s）随时间变化的最大速率。更高的值意味着允许更高的挤" +"它定义了挤出体积流量（mm³/s）随时间变化的最大速率。更高的值意味着允许更高的挤" "出速率变化，从而产生更快速的过渡。\n" "\n" "值为0将禁用该功能。\n" "\n" "对于高速、高流量的近程挤出机（如Bambu或Voron）通常不需要该值。但是，在特征速" "度变化很大的某些情况下，它可以提供一些边际收益。例如，当由于悬垂而出现严重的" -"减速时。在这些情况下，建议使用一个大的值大约300-350 m3/s2的，因为这刚好允许足" +"减速时。在这些情况下，建议使用一个大的值大约300-350 mm³/s²的，因为这刚好允许足" "够的平滑，以帮助压力提前实现更平滑的流量过渡。\n" "\n" "对于没有压力提前的较慢打印机，该值应该设置得非常低。对于近程挤出机来说10-15 " diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index 38e66bde96..9009b3bd5a 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -12289,7 +12289,7 @@ msgid "" "extrusion to a lower flow (lower speed/smaller width) extrusion and vice " "versa.\n" "\n" -"It defines the maximum rate by which the extruded volumetric flow in mm³/s² " +"It defines the maximum rate by which the extruded volumetric flow in mm³/s " "can change over time. Higher values mean higher extrusion rate changes are " "allowed, resulting in faster speed transitions.\n" "\n" diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 723c1eb3ef..721475fa92 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -697,7 +697,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Other layers"); def->tooltip = L("Bed temperature for layers except the initial one. " "A value of 0 means the filament does not support printing on the Cool Plate SuperTack."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 120; @@ -707,7 +707,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Other layers"); def->tooltip = L("Bed temperature for layers except the initial one. " "A value of 0 means the filament does not support printing on the Cool Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -717,7 +717,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Other layers"); def->tooltip = L("Bed temperature for layers except the initial one. " "A value of 0 means the filament does not support printing on the Textured Cool Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -727,7 +727,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Other layers"); def->tooltip = L("Bed temperature for layers except the initial one. " "A value of 0 means the filament does not support printing on the Engineering Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -737,7 +737,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Other layers"); def->tooltip = L("Bed temperature for layers except the initial one. " "A value of 0 means the filament does not support printing on the High Temp Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -747,7 +747,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Other layers"); def->tooltip = L("Bed temperature for layers except the initial one. " "A value of 0 means the filament does not support printing on the Textured PEI Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Bed temperature"); def->min = 0; def->max = 300; @@ -758,7 +758,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Initial layer bed temperature"); def->tooltip = L("Bed temperature of the initial layer. " "A value of 0 means the filament does not support printing on the Cool Plate SuperTack."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = 120; def->set_default_value(new ConfigOptionInts{ 35 }); @@ -768,7 +768,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Initial layer bed temperature"); def->tooltip = L("Bed temperature of the initial layer. " "A value of 0 means the filament does not support printing on the Cool Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = 120; def->set_default_value(new ConfigOptionInts{ 35 }); @@ -778,7 +778,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Initial layer bed temperature"); def->tooltip = L("Bed temperature of the initial layer. " "A value of 0 means the filament does not support printing on the Textured Cool Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = 120; def->set_default_value(new ConfigOptionInts{ 40 }); @@ -788,7 +788,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Initial layer bed temperature"); def->tooltip = L("Bed temperature of the initial layer. " "A value of 0 means the filament does not support printing on the Engineering Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = 300; def->set_default_value(new ConfigOptionInts{ 45 }); @@ -798,7 +798,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Initial layer bed temperature"); def->tooltip = L("Bed temperature of the initial layer. " "A value of 0 means the filament does not support printing on the High Temp Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->max = 300; def->set_default_value(new ConfigOptionInts{ 45 }); @@ -807,7 +807,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Initial layer bed temperature"); def->tooltip = L("Bed temperature of the initial layer. " "A value of 0 means the filament does not support printing on the Textured PEI Plate."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = 300; def->set_default_value(new ConfigOptionInts{45}); @@ -1415,7 +1415,7 @@ void PrintConfigDef::init_fff_params() def = this->add("default_acceleration", coFloat); def->label = L("Normal printing"); def->tooltip = L("The default acceleration of both normal printing and travel except initial layer."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(500.0)); @@ -2009,7 +2009,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("This setting stands for how much volume of filament can be melted and extruded per second. " "Printing speed is limited by max volumetric speed, in case of too high and unreasonable speed setting. " "Can't be zero."); - def->sidetext = "mm³/s"; // cubic milimeters per second, don't need translation + def->sidetext = u8"mm³/s"; // cubic milimeters per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 2. }); @@ -2186,7 +2186,7 @@ void PrintConfigDef::init_fff_params() "the nozzle may not be known, and the filament pressure is likely not yet stable. " "Before purging the print head into an infill or a sacrificial object, Orca Slicer will always prime " "this amount of material into the wipe tower to produce successive infill or sacrificial object extrusions reliably."); - def->sidetext = "mm³"; // cubic milimeters, don't need translation + def->sidetext = u8"mm³"; // cubic milimeters, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 15. }); @@ -2217,7 +2217,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_multitool_ramming_volume", coFloats); def->label = L("Multi-tool ramming volume"); def->tooltip = L("The volume to be rammed before the tool change."); - def->sidetext = "mm³"; // cubic milimeters, don't need translation + def->sidetext = u8"mm³"; // cubic milimeters, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 10. }); @@ -2225,7 +2225,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_multitool_ramming_flow", coFloats); def->label = L("Multi-tool ramming flow"); def->tooltip = L("Flow used for ramming the filament before the tool change."); - def->sidetext = "mm³/s"; // cubic milimeters per second, don't need translation + def->sidetext = u8"mm³/s"; // cubic milimeters per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 10. }); @@ -2233,7 +2233,7 @@ void PrintConfigDef::init_fff_params() def = this->add("filament_density", coFloats); def->label = L("Density"); def->tooltip = L("Filament density. For statistics only."); - def->sidetext = "g/cm³"; // grams per cubic milimeter, don't need translation + def->sidetext = u8"g/cm³"; // grams per cubic milimeter, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloats { 0. }); @@ -2303,7 +2303,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Softening temperature"); def->tooltip = L("The material softens at this temperature, so when the bed temperature is equal to or greater than this, " "it's highly recommended to open the front door and/or remove the upper glass to avoid clogging."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->mode = comSimple; def->set_default_value(new ConfigOptionInts{ 100 }); @@ -2510,7 +2510,7 @@ void PrintConfigDef::init_fff_params() def = this->add("outer_wall_acceleration", coFloat); def->label = L("Outer wall"); def->tooltip = L("Acceleration of outer walls."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10000)); @@ -2518,7 +2518,7 @@ void PrintConfigDef::init_fff_params() def = this->add("inner_wall_acceleration", coFloat); def->label = L("Inner wall"); def->tooltip = L("Acceleration of inner walls."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10000)); @@ -2526,7 +2526,7 @@ void PrintConfigDef::init_fff_params() def = this->add("travel_acceleration", coFloat); def->label = L("Travel"); def->tooltip = L("Acceleration of travel moves."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(10000)); @@ -2534,7 +2534,7 @@ void PrintConfigDef::init_fff_params() def = this->add("top_surface_acceleration", coFloat); def->label = L("Top surface"); def->tooltip = L("Acceleration of top surface infill. Using a lower value may improve top surface quality."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(500)); @@ -2542,7 +2542,7 @@ void PrintConfigDef::init_fff_params() def = this->add("outer_wall_acceleration", coFloat); def->label = L("Outer wall"); def->tooltip = L("Acceleration of outer wall. Using a lower value can improve quality."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(500)); @@ -2577,7 +2577,7 @@ void PrintConfigDef::init_fff_params() def = this->add("initial_layer_acceleration", coFloat); def->label = L("Initial layer"); def->tooltip = L("Acceleration of initial layer. Using a lower value can improve build plate adhesion."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(300)); @@ -2730,7 +2730,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Initial layer"); def->full_label = L("Initial layer nozzle temperature"); def->tooltip = L("Nozzle temperature for printing initial layer when using this filament."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts { 200 }); @@ -3586,7 +3586,7 @@ void PrintConfigDef::init_fff_params() (void)L("Maximum acceleration of the Y axis"); (void)L("Maximum acceleration of the Z axis"); (void)L("Maximum acceleration of the E axis"); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->mode = comSimple; def->set_default_value(new ConfigOptionFloats(axis.max_acceleration)); @@ -3647,7 +3647,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Maximum acceleration for extruding (M204 P)"); // "Marlin (legacy) firmware flavor will use this also " // "as travel acceleration (M204 T)."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->readonly = false; def->mode = comSimple; @@ -3659,7 +3659,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Maximum acceleration for retracting"); def->category = L("Machine limits"); def->tooltip = L("Maximum acceleration for retracting (M204 R)"); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->readonly = false; def->mode = comSimple; @@ -3670,7 +3670,7 @@ void PrintConfigDef::init_fff_params() def->full_label = L("Maximum acceleration for travel"); def->category = L("Machine limits"); def->tooltip = L("Maximum acceleration for travel (M204 T), it only applies to Marlin 2."); - def->sidetext = "mm/s²"; // milimeters per second per second, don't need translation + def->sidetext = u8"mm/s²"; // milimeters per second per second, don't need translation def->min = 0; def->readonly = false; def->mode = comAdvanced; @@ -3725,7 +3725,7 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("This parameter smooths out sudden extrusion rate changes that happen when " "the printer transitions from printing a high flow (high speed/larger width) " "extrusion to a lower flow (lower speed/smaller width) extrusion and vice versa.\n\n" - "It defines the maximum rate by which the extruded volumetric flow in mm³/s² can change over time. " + "It defines the maximum rate by which the extruded volumetric flow in mm³/s can change over time. " "Higher values mean higher extrusion rate changes are allowed, resulting in faster speed transitions.\n\n" "A value of 0 disables the feature.\n\n" "For a high speed, high flow direct drive printer (like the Bambu lab or Voron) this value is usually not needed. " @@ -3736,7 +3736,7 @@ void PrintConfigDef::init_fff_params() "A value of 10-15 mm³/s² is a good starting point for direct drive extruders and 5-10 mm³/s² for Bowden style.\n\n" "This feature is known as Pressure Equalizer in Prusa slicer.\n\n" "Note: this parameter disables arc fitting."); - def->sidetext = "mm³/s²"; // cubic milimeters per second per second, don't need translation + def->sidetext = u8"mm³/s²"; // cubic milimeters per second per second, don't need translation def->min = 0; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(0)); @@ -3857,7 +3857,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_volume", coFloat); def->label = L("Nozzle volume"); def->tooltip = L("Volume of nozzle between the cutter and the end of nozzle."); - def->sidetext = "mm³"; // cubic milimeters, don't need translation + def->sidetext = u8"mm³"; // cubic milimeters, don't need translation def->mode = comAdvanced; def->readonly = false; def->set_default_value(new ConfigOptionFloat { 0.0 }); @@ -5369,7 +5369,7 @@ void PrintConfigDef::init_fff_params() "This may be useful if your printer does not support M141/M191 commands, or if you desire " "to handle heat soaking in the print start macro if no active chamber heater is installed." ); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Chamber temperature"); def->min = 0; def->max = max_temp; @@ -5378,7 +5378,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_temperature", coInts); def->label = L("Other layers"); def->tooltip = L("Nozzle temperature for layers after the initial one."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->full_label = L("Nozzle temperature"); def->min = 0; def->max = max_temp; @@ -5387,7 +5387,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_temperature_range_low", coInts); def->label = L("Min"); //def->tooltip = L(""); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts { 190 }); @@ -5395,7 +5395,7 @@ void PrintConfigDef::init_fff_params() def = this->add("nozzle_temperature_range_high", coInts); def->label = L("Max"); //def->tooltip = L(""); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts { 240 }); @@ -5571,7 +5571,7 @@ void PrintConfigDef::init_fff_params() def = this->add("prime_volume", coFloat); def->label = L("Prime volume"); def->tooltip = L("The volume of material to prime extruder on tower."); - def->sidetext = "mm³"; // cubic milimeters, don't need translation + def->sidetext = u8"mm³"; // cubic milimeters, don't need translation def->min = 1.0; def->mode = comSimple; def->set_default_value(new ConfigOptionFloat(45.)); @@ -5750,7 +5750,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Idle temperature"); def->tooltip = L("Nozzle temperature when the tool is currently not used in multi-tool setups. " "This is only used when 'Ooze prevention' is active in Print Settings. Set to 0 to disable."); - def->sidetext = "\u2103" /* °C */; // degrees Celsius, don't need translation + def->sidetext = u8"\u2103" /* °C */; // degrees Celsius, don't need translation def->min = 0; def->max = max_temp; def->set_default_value(new ConfigOptionInts{0}); diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 0d99565759..581b9153bb 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -1918,7 +1918,7 @@ MaxVolumetricSpeedPresetPage::MaxVolumetricSpeedPresetPage( titles.push_back(_L("Step")); m_custom_range_panel->set_titles(titles); - m_custom_range_panel->set_unit("mm³/s"); + m_custom_range_panel->set_unit(wxString::FromUTF8("mm³/s")); } } }} diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index a58186a3f9..aeed5e47eb 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -1448,7 +1448,7 @@ PageTemperatures::PageTemperatures(ConfigWizard *parent) auto *sizer_extr = new wxFlexGridSizer(3, 5, 5); auto *text_extr = new wxStaticText(this, wxID_ANY, _L("Extrusion Temperature:")); - auto *unit_extr = new wxStaticText(this, wxID_ANY, "\u2103" /* °C */); + auto *unit_extr = new wxStaticText(this, wxID_ANY, wxString::FromUTF8("\u2103") /* °C */); sizer_extr->AddGrowableCol(0, 1); sizer_extr->Add(text_extr, 0, wxALIGN_CENTRE_VERTICAL); sizer_extr->Add(spin_extr); @@ -1462,7 +1462,7 @@ PageTemperatures::PageTemperatures(ConfigWizard *parent) auto *sizer_bed = new wxFlexGridSizer(3, 5, 5); auto *text_bed = new wxStaticText(this, wxID_ANY, _L("Bed Temperature:")); - auto *unit_bed = new wxStaticText(this, wxID_ANY, "\u2103" /* °C */); + auto *unit_bed = new wxStaticText(this, wxID_ANY, wxString::FromUTF8("\u2103") /* °C */); sizer_bed->AddGrowableCol(0, 1); sizer_bed->Add(text_bed, 0, wxALIGN_CENTRE_VERTICAL); sizer_bed->Add(spin_bed); diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index 677fff64fe..5eac9d20dc 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -127,21 +127,21 @@ void ExtrusionCalibration::create() wxWindow::GetTextExtent(_L("Bed Temperature")).x), wxWindow::GetTextExtent(_L("Max volumetric speed")).x), EXTRUSION_CALIBRATION_INPUT_SIZE.x); - m_nozzle_temp = new TextInput(m_step_1_panel, wxEmptyString, "\u2103" /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); + m_nozzle_temp = new TextInput(m_step_1_panel, wxEmptyString, wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); nozzle_temp_sizer->Add(nozzle_temp_text, 0, wxALIGN_LEFT); nozzle_temp_sizer->AddSpacer(FromDIP(4)); nozzle_temp_sizer->Add(m_nozzle_temp, 0, wxEXPAND); auto bed_temp_sizer = new wxBoxSizer(wxVERTICAL); auto bed_temp_text = new wxStaticText(m_step_1_panel, wxID_ANY, _L("Bed temperature")); - m_bed_temp = new TextInput(m_step_1_panel, wxEmptyString, "\u2103" /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); + m_bed_temp = new TextInput(m_step_1_panel, wxEmptyString, wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); bed_temp_sizer->Add(bed_temp_text, 0, wxALIGN_LEFT); bed_temp_sizer->AddSpacer(FromDIP(4)); bed_temp_sizer->Add(m_bed_temp, 0, wxEXPAND); auto max_flow_sizer = new wxBoxSizer(wxVERTICAL); auto max_flow_text = new wxStaticText(m_step_1_panel, wxID_ANY, _L("Max volumetric speed")); - m_max_flow_ratio = new TextInput(m_step_1_panel, wxEmptyString, "mm³", "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); + m_max_flow_ratio = new TextInput(m_step_1_panel, wxEmptyString, wxString::FromUTF8("mm³"), "", wxDefaultPosition, { max_input_width, EXTRUSION_CALIBRATION_INPUT_SIZE.y }, wxTE_READONLY); max_flow_sizer->Add(max_flow_text, 0, wxALIGN_LEFT); max_flow_sizer->AddSpacer(FromDIP(4)); max_flow_sizer->Add(m_max_flow_ratio, 0, wxEXPAND); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 4e0906ab8d..49d50e97ee 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -9555,7 +9555,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params) if (accels.empty()) { accels.assign({accel}); const auto msg{_L("INFO:") + "\n" + - _L("No accelerations provided for calibration. Use default acceleration value ") + std::to_string(long(accel)) + _L("mm/s²")}; + _L("No accelerations provided for calibration. Use default acceleration value ") + std::to_string(long(accel)) + wxString::FromUTF8("mm/s²")}; get_notification_manager()->push_notification(msg.ToStdString()); } else { // set max acceleration in case of batch mode to get correct test pattern size diff --git a/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp index 2b6b73155c..9dd1c85965 100644 --- a/src/slic3r/GUI/RammingChart.cpp +++ b/src/slic3r/GUI/RammingChart.cpp @@ -89,10 +89,10 @@ void Chart::draw() { } // axis labels: - wxString label = _(L("Time")) + " ("+_("s")+")"; + wxString label = _(L("Time")) + " (" + _("s") + ")"; dc.GetTextExtent(label,&text_width,&text_height); dc.DrawText(label,wxPoint(0.5*(m_rect.GetRight()+m_rect.GetLeft())-text_width/2.f, m_rect.GetBottom()+0.6*legend_side)); - label = _(L("Volumetric speed")) + " (" + _("mm³/s") + ")"; + label = _(L("Volumetric speed")) + " (" + wxString::FromUTF8("mm³/s") + ")"; dc.GetTextExtent(label,&text_width,&text_height); dc.DrawRotatedText(label,wxPoint(0,0.5*(m_rect.GetBottom()+m_rect.GetTop())+text_width/2.f),90); diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 53b8e9e3b5..3194909ae5 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -132,7 +132,7 @@ RammingPanel::RammingPanel(wxWindow* parent, const std::string& parameters) sizer_chart->Add(label, 0, wxEXPAND | wxALL, 5); m_widget_time = new SpinInput(this, wxEmptyString, "ms" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 5000 , 3000, 250); - m_widget_volume = new SpinInput(this, wxEmptyString, "mm³", wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 10000, 0 ); + m_widget_volume = new SpinInput(this, wxEmptyString, wxString::FromUTF8("mm³"), wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 0 , 10000, 0 ); m_widget_ramming_line_width_multiplicator = new SpinInput(this, wxEmptyString, "%" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 10, 300 , 100 ); m_widget_ramming_step_multiplicator = new SpinInput(this, wxEmptyString, "%" , wxDefaultPosition, wxSize(scale(120), -1), wxSP_ARROW_KEYS, 10, 300 , 100 ); diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index cfe8035844..b902939573 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -306,7 +306,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat // start temp auto start_temp_sizer = new wxBoxSizer(wxHORIZONTAL); auto start_temp_text = new wxStaticText(this, wxID_ANY, start_temp_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStart = new TextInput(this, std::to_string(230), "\u2103" /* °C */, "", wxDefaultPosition, ti_size); + m_tiStart = new TextInput(this, std::to_string(230), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); start_temp_sizer->Add(start_temp_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); start_temp_sizer->Add(m_tiStart , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -315,7 +315,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat // end temp auto end_temp_sizer = new wxBoxSizer(wxHORIZONTAL); auto end_temp_text = new wxStaticText(this, wxID_ANY, end_temp_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiEnd = new TextInput(this, std::to_string(190), "\u2103" /* °C */, "", wxDefaultPosition, ti_size); + m_tiEnd = new TextInput(this, std::to_string(190), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); end_temp_sizer->Add(end_temp_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); end_temp_sizer->Add(m_tiEnd , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -324,7 +324,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat // temp step auto temp_step_sizer = new wxBoxSizer(wxHORIZONTAL); auto temp_step_text = new wxStaticText(this, wxID_ANY, temp_step_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStep = new TextInput(this, wxString::FromDouble(5),"\u2103" /* °C */, "", wxDefaultPosition, ti_size); + m_tiStep = new TextInput(this, wxString::FromDouble(5), wxString::FromUTF8("\u2103") /* °C */, "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); m_tiStep->Enable(false); temp_step_sizer->Add(temp_step_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -353,7 +353,9 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat if(!ti->GetTextCtrl()->GetValue().ToULong(&t)) return; if(t> 350 || t < 170){ - MessageDialog msg_dlg(nullptr, wxString::Format(L"Supported range: 170%s - 350%s","\u2103" /* °C */,"\u2103" /* °C */), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, wxString::Format(L"Supported range: 170%s - 350%s", + wxString::FromUTF8("\u2103") /* °C */, wxString::FromUTF8("\u2103") /* °C */), + wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); if(t > 350) t = 350; @@ -479,7 +481,7 @@ MaxVolumetricSpeed_Test_Dlg::MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWin // start vol auto start_vol_sizer = new wxBoxSizer(wxHORIZONTAL); auto start_vol_text = new wxStaticText(this, wxID_ANY, start_vol_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStart = new TextInput(this, std::to_string(5), "mm³/s", "", wxDefaultPosition, ti_size); + m_tiStart = new TextInput(this, std::to_string(5), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); start_vol_sizer->Add(start_vol_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -489,7 +491,7 @@ MaxVolumetricSpeed_Test_Dlg::MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWin // end vol auto end_vol_sizer = new wxBoxSizer(wxHORIZONTAL); auto end_vol_text = new wxStaticText(this, wxID_ANY, end_vol_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiEnd = new TextInput(this, std::to_string(20), "mm³/s", "", wxDefaultPosition, ti_size); + m_tiEnd = new TextInput(this, std::to_string(20), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); end_vol_sizer->Add(end_vol_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); end_vol_sizer->Add(m_tiEnd , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); @@ -498,7 +500,7 @@ MaxVolumetricSpeed_Test_Dlg::MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWin // vol step auto vol_step_sizer = new wxBoxSizer(wxHORIZONTAL); auto vol_step_text = new wxStaticText(this, wxID_ANY, vol_step_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStep = new TextInput(this, wxString::FromDouble(0.5), "mm³/s", "", wxDefaultPosition, ti_size); + m_tiStep = new TextInput(this, wxString::FromDouble(0.5), wxString::FromUTF8("mm³/s"), "", wxDefaultPosition, ti_size); m_tiStart->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); vol_step_sizer->Add(vol_step_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2)); vol_step_sizer->Add(m_tiStep , 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(2));