diff --git a/ks_includes/locales/KlipperScreen.pot b/ks_includes/locales/KlipperScreen.pot index fed65a4a..db85d0e4 100644 --- a/ks_includes/locales/KlipperScreen.pot +++ b/ks_includes/locales/KlipperScreen.pot @@ -745,5 +745,5 @@ msgstr "" msgid "mm/s" msgstr "" -msgid "mm/s^2" +msgid "mm/s²" msgstr "" diff --git a/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.mo index 9a62f1f7..f64e1342 100644 Binary files a/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.po index ada4e1b3..cd99dfb1 100644 --- a/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/da/LC_MESSAGES/KlipperScreen.po @@ -752,8 +752,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Viste makroer" diff --git a/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.mo index 82924390..15f91fc3 100644 Binary files a/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.po index 45b3b93e..548b7079 100644 --- a/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/de_DE/LC_MESSAGES/KlipperScreen.po @@ -769,8 +769,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Aktive Macros" diff --git a/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.mo index 60d80103..7a07621a 100644 Binary files a/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.po index 02aa4cef..7e143ac5 100644 --- a/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/en/LC_MESSAGES/KlipperScreen.po @@ -740,5 +740,5 @@ msgstr "" msgid "mm/s" msgstr "" -msgid "mm/s^2" +msgid "mm/s²" msgstr "" diff --git a/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.mo index 5d1f25cf..2e6c9b52 100644 Binary files a/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po index e28c339e..0d209eec 100644 --- a/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po @@ -757,8 +757,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Macros mostrados" diff --git a/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.mo index 3d7ecc47..5394c3a3 100644 Binary files a/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.po index 527e9187..1173dfff 100644 --- a/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/fr_FR/LC_MESSAGES/KlipperScreen.po @@ -755,8 +755,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Macros affichées" diff --git a/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.mo index c6212950..ae0c54c9 100644 Binary files a/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.po index be0cf4b0..0b16ef01 100644 --- a/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/he_IL/LC_MESSAGES/KlipperScreen.po @@ -766,8 +766,8 @@ msgstr "מ''מ" msgid "mm/s" msgstr "מ\"מ/ש" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "מוצגים מאקרו" diff --git a/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.mo index 6e6fd84d..52f1f43d 100644 Binary files a/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.po index 8e65349d..3bc81b32 100644 --- a/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/hu_HU/LC_MESSAGES/KlipperScreen.po @@ -752,8 +752,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Megjelenített makrók" diff --git a/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.mo index 0233d4a1..3214af27 100644 Binary files a/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po index 4d9ee4bf..bb31f21d 100644 --- a/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po @@ -752,8 +752,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Mostra/Nascondi Macros" diff --git a/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.mo index abb19019..7e8e436f 100644 Binary files a/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.po index 5224df10..339b25a1 100644 --- a/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/ko_KR/LC_MESSAGES/KlipperScreen.po @@ -749,8 +749,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "표시할 매크로" diff --git a/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.mo index 72a8cc5f..abcd27eb 100644 Binary files a/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.po index e06540d7..2b602770 100644 --- a/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/pl_PL/LC_MESSAGES/KlipperScreen.po @@ -755,10 +755,10 @@ msgid "mm" msgstr "mm" msgid "mm/s" -msgstr "mm/s^2" +msgstr "mm/s²" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Wyświetlone Makra" diff --git a/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.mo index 55931e8e..793d1829 100644 Binary files a/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.po index 1ff79fea..d49f9621 100644 --- a/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/ru_RU/LC_MESSAGES/KlipperScreen.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: KlipperScreen\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-02 14:53-0300\n" -"PO-Revision-Date: 2022-03-31 11:10-0300\n" +"PO-Revision-Date: 2022-06-03 20:25-0500\n" "Last-Translator: Jakob Kais \n" "Language-Team: \n" "Language: ru_RU\n" @@ -759,8 +759,8 @@ msgstr "мм" msgid "mm/s" msgstr "мм/с" -msgid "mm/s^2" -msgstr "мм/с^2" +msgid "mm/s²" +msgstr "мм/с²" #~ msgid "Displayed Macros" #~ msgstr "Показать макросы" diff --git a/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.mo index e703d86c..dffc195e 100644 Binary files a/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.po index 5f02ad7a..df2ae09d 100644 --- a/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/sv_SE/LC_MESSAGES/KlipperScreen.po @@ -757,8 +757,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Makron visas" diff --git a/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.mo index b64d8078..6e00343a 100644 Binary files a/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.po index 23f7fa95..4a628608 100644 --- a/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/tr_TR/LC_MESSAGES/KlipperScreen.po @@ -757,8 +757,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "Görüntülenen Makrolar" diff --git a/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.mo index 73412d48..a2d66f2c 100644 Binary files a/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.po index 9b0f017a..5ce6cdff 100644 --- a/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/uk_UA/LC_MESSAGES/KlipperScreen.po @@ -761,5 +761,5 @@ msgstr "мм" msgid "mm/s" msgstr "мм/с" -msgid "mm/s^2" +msgid "mm/s²" msgstr "мм/с²" diff --git a/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo index 483135d6..e5c1da9e 100644 Binary files a/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po index 1e34ff64..747f4c9e 100644 --- a/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/zh_CN/LC_MESSAGES/KlipperScreen.po @@ -750,8 +750,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "宏命令显示开关" diff --git a/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo b/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo index 91593a40..8d2646dd 100644 Binary files a/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo and b/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.mo differ diff --git a/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po index 73f3aeed..0eeda0e6 100644 --- a/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po +++ b/ks_includes/locales/zh_TW/LC_MESSAGES/KlipperScreen.po @@ -750,8 +750,8 @@ msgstr "mm" msgid "mm/s" msgstr "mm/s" -msgid "mm/s^2" -msgstr "mm/s^2" +msgid "mm/s²" +msgstr "mm/s²" #~ msgid "Displayed Macros" #~ msgstr "顯示巨集" diff --git a/panels/job_status.py b/panels/job_status.py index b1ea732f..174e6168 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -554,7 +554,7 @@ class JobStatusPanel(ScreenPanel): self.labels['temp_grid'].attach(self.extruder_button[self.current_extruder], 0, 0, 1, 1) self._screen.show_all() if "max_accel" in data["toolhead"]: - self.labels['max_accel'].set_text("%d mm/s2" % (data["toolhead"]["max_accel"])) + self.labels['max_accel'].set_text("%d mm/s²" % (data["toolhead"]["max_accel"])) if "extruder" in data and "pressure_advance" in data['extruder']: self.labels['advance'].set_text("%.2f" % data['extruder']['pressure_advance']) @@ -665,11 +665,11 @@ class JobStatusPanel(ScreenPanel): self.flowrate = (self.flowrate + median(array(self.flowstore))) / 2 self.flowstore = [] - self.labels['flowrate'].set_label("%.1f mm3/s" % self.flowrate) + self.labels['flowrate'].set_label("%.1f mm³/s" % self.flowrate) self.labels['req_speed'].set_text("%d/%d mm/s" % (self.vel, self.req_speed)) if self.main_status_displayed: self.speed_button.set_label("%3d%% %5d mm/s" % (self.speed, self.vel)) - self.extrusion_button.set_label("%3d%% %5.1f mm3/s" % (self.extrusion, self.flowrate)) + self.extrusion_button.set_label("%3d%% %5.1f mm³/s" % (self.extrusion, self.flowrate)) return True def calculate_time_left(self, duration=0, filament_used=0): diff --git a/panels/limits.py b/panels/limits.py index d6da78d9..f6a7e20a 100644 --- a/panels/limits.py +++ b/panels/limits.py @@ -26,9 +26,9 @@ class LimitsPanel(ScreenPanel): conf = self._printer.get_config_section("printer") self.options = [ - {"name": _("Max Acceleration"), "units": _("mm/s^2"), "option": "max_accel", + {"name": _("Max Acceleration"), "units": _("mm/s²"), "option": "max_accel", "max": self.stn(conf['max_accel'])}, - {"name": _("Max Acceleration to Deceleration"), "units": _("mm/s^2"), "option": "max_accel_to_decel", + {"name": _("Max Acceleration to Deceleration"), "units": _("mm/s²"), "option": "max_accel_to_decel", "max": self.stn(conf['max_accel_to_decel']) if "max_accel_to_decel" in conf else round(self.stn(conf['max_accel']) / 2)}, {"name": _("Max Velocity"), "units": _("mm/s"), "option": "max_velocity",