From 368c465a8ced8e7a2e5d5a22186099faf5a20d36 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 15 Apr 2024 23:02:21 +0800 Subject: [PATCH] fixed an issue that translate object was not wrong (#5005) * fixed an issue that translate object was not wrong * Display correct coordinate system name * Update locale --- localization/i18n/OrcaSlicer.pot | 5 ++- localization/i18n/ca/OrcaSlicer_ca.po | 5 ++- localization/i18n/cs/OrcaSlicer_cs.po | 5 ++- localization/i18n/de/OrcaSlicer_de.po | 39 ++++++++++--------- localization/i18n/en/OrcaSlicer_en.po | 5 ++- localization/i18n/es/OrcaSlicer_es.po | 5 ++- localization/i18n/fr/OrcaSlicer_fr.po | 37 ++++++++++-------- localization/i18n/hu/OrcaSlicer_hu.po | 5 ++- localization/i18n/it/OrcaSlicer_it.po | 5 ++- localization/i18n/ja/OrcaSlicer_ja.po | 5 ++- localization/i18n/ko/OrcaSlicer_ko.po | 5 ++- localization/i18n/nl/OrcaSlicer_nl.po | 5 ++- localization/i18n/pl/OrcaSlicer_pl.po | 5 ++- localization/i18n/ru/OrcaSlicer_ru.po | 5 ++- localization/i18n/sv/OrcaSlicer_sv.po | 5 ++- localization/i18n/tr/OrcaSlicer_tr.po | 5 ++- localization/i18n/uk/OrcaSlicer_uk.po | 5 ++- localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 5 ++- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 5 ++- .../GUI/Gizmos/GizmoObjectManipulation.cpp | 11 ++++-- 20 files changed, 117 insertions(+), 55 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index b4eb39c9bb..ce3c9bac57 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -257,6 +257,9 @@ msgstr "" msgid "World coordinates" msgstr "" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index 11c6c85e78..2f50e5ebd1 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2024-03-17 22:08+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -260,6 +260,9 @@ msgstr "Reinicialitza la Rotació" msgid "World coordinates" msgstr "Coordenades cartesianes" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index 25781a4817..0daeba119f 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2023-09-30 15:15+0200\n" "Last-Translator: René Mošner \n" "Language-Team: \n" @@ -260,6 +260,9 @@ msgstr "Výchozí Natočení" msgid "World coordinates" msgstr "Světové souřadnice" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 7ee304a010..b70800308a 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 15:17+0200\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: \n" "Last-Translator: Heiko Liebscher \n" "Language-Team: \n" @@ -256,6 +256,9 @@ msgstr "Rotation zurücksetzen" msgid "World coordinates" msgstr "Weltkoordinaten" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" @@ -4179,7 +4182,7 @@ msgstr "Volumen:" msgid "Size:" msgstr "Größe:" -#, boost-format +#, c-format, boost-format msgid "" "Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please " "separate the conflicted objects farther (%s <-> %s)." @@ -7052,8 +7055,8 @@ msgstr "" msgid "" "Timelapse is not supported because Print sequence is set to \"By object\"." msgstr "" -"Zeitraffer wird nicht unterstützt, da die Druckreihenfolge auf \"Nach " -"Objekt\" eingestellt ist." +"Zeitraffer wird nicht unterstützt, da die Druckreihenfolge auf \"Nach Objekt" +"\" eingestellt ist." msgid "Errors" msgstr "Fehler" @@ -7428,13 +7431,13 @@ msgstr "" msgid "" "When recording timelapse without toolhead, it is recommended to add a " "\"Timelapse Wipe Tower\" \n" -"by right-click the empty position of build plate and choose \"Add " -"Primitive\"->\"Timelapse Wipe Tower\"." +"by right-click the empty position of build plate and choose \"Add Primitive" +"\"->\"Timelapse Wipe Tower\"." msgstr "" "Wenn Sie einen Zeitraffer ohne Werkzeugkopf aufnehmen, wird empfohlen, einen " "\"Timelapse Wischturm\" hinzuzufügen, indem Sie mit der rechten Maustaste " -"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"-" -">\"Timelapse Wischturm\" wählen." +"auf die leere Position der Bauplatte klicken und \"Primitiv hinzufügen\"->" +"\"Timelapse Wischturm\" wählen." msgid "Line width" msgstr "Breite der Linie" @@ -11031,13 +11034,13 @@ msgstr "Volle Lüfterdrehzahl ab Schicht" msgid "" "Fan speed will be ramped up linearly from zero at layer " -"\"close_fan_the_first_x_layers\" to maximum at layer " -"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower " -"than \"close_fan_the_first_x_layers\", in which case the fan will be running " -"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer" +"\". \"full_fan_speed_layer\" will be ignored if lower than " +"\"close_fan_the_first_x_layers\", in which case the fan will be running at " +"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." msgstr "" -"Die Lüftergeschwindigkeit wird linear von Null bei der " -"Schicht\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht " +"Die Lüftergeschwindigkeit wird linear von Null bei der Schicht" +"\"close_fan_the_first_x_layers\" auf das Maximum bei der Schicht " "\"full_fan_speed_layer\" erhöht. \"full_fan_speed_layer\" wird ignoriert, " "wenn es niedriger ist als \"close_fan_the_first_x_layers\",in diesem Fall " "läuft der Lüfter bei Schicht \"close_fan_the_first_x_layers\"+ 1 mit maximal " @@ -15013,8 +15016,8 @@ msgstr "" "Möchten Sie es überschreiben?" msgid "" -"We would rename the presets as \"Vendor Type Serial @printer you " -"selected\". \n" +"We would rename the presets as \"Vendor Type Serial @printer you selected" +"\". \n" "To add preset for more printers, Please go to printer selection" msgstr "" "Wir würden die Voreinstellungen als \"Hersteller Typ Seriennummer @Drucker, " @@ -16396,8 +16399,8 @@ msgstr "" #~ msgstr "Keine dünnen Schichten (EXPERIMENTELL)" #~ msgid "" -#~ "We would rename the presets as \"Vendor Type Serial @printer you " -#~ "selected\". \n" +#~ "We would rename the presets as \"Vendor Type Serial @printer you selected" +#~ "\". \n" #~ "To add preset for more prinetrs, Please go to printer selection" #~ msgstr "" #~ "Wir würden die Voreinstellungen als \"Hersteller Typ Seriennummer " diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 1605118253..35bd8676b0 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -254,6 +254,9 @@ msgstr "Reset rotation" msgid "World coordinates" msgstr "World coordinates" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 0d3c47a1b7..dfc7bc23e6 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: \n" "Last-Translator: Carlos Fco. Caruncho Serrano \n" "Language-Team: \n" @@ -257,6 +257,9 @@ msgstr "Reiniciar rotación" msgid "World coordinates" msgstr "Coordenadas cartesianas" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index c1fc90cb0d..c56afa6fa8 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Guislain Cyril, Thomas Lété\n" @@ -260,6 +260,9 @@ msgstr "Réinitialiser la Rotation" msgid "World coordinates" msgstr "Coordonnées" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" @@ -7450,8 +7453,8 @@ msgstr "" msgid "" "When recording timelapse without toolhead, it is recommended to add a " "\"Timelapse Wipe Tower\" \n" -"by right-click the empty position of build plate and choose \"Add " -"Primitive\"->\"Timelapse Wipe Tower\"." +"by right-click the empty position of build plate and choose \"Add Primitive" +"\"->\"Timelapse Wipe Tower\"." msgstr "" "Lorsque vous enregistrez un timelapse sans tête d’outil, il est recommandé " "d’ajouter une \"Tour d’essuyage timelapse\".\n" @@ -7603,9 +7606,9 @@ msgid "" "Bed temperature when cool plate is installed. Value 0 means the filament " "does not support to print on the Cool Plate" msgstr "" -"Il s'agit de la température du plateau lorsque le plateau froid (\"Cool " -"plate\") est installé. Une valeur à 0 signifie que ce filament ne peut pas " -"être imprimé sur le plateau froid." +"Il s'agit de la température du plateau lorsque le plateau froid (\"Cool plate" +"\") est installé. Une valeur à 0 signifie que ce filament ne peut pas être " +"imprimé sur le plateau froid." msgid "Engineering plate" msgstr "Plaque Engineering" @@ -11100,10 +11103,10 @@ msgstr "Ventilateur à pleine vitesse à la couche" msgid "" "Fan speed will be ramped up linearly from zero at layer " -"\"close_fan_the_first_x_layers\" to maximum at layer " -"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower " -"than \"close_fan_the_first_x_layers\", in which case the fan will be running " -"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer" +"\". \"full_fan_speed_layer\" will be ignored if lower than " +"\"close_fan_the_first_x_layers\", in which case the fan will be running at " +"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." msgstr "" "La vitesse du ventilateur augmentera de manière linéaire à partir de zéro à " "la couche \"close_fan_the_first_x_layers\" jusqu’au maximum à la couche " @@ -14341,9 +14344,9 @@ msgstr "" "Wiki.\n" "\n" "Habituellement, la calibration est inutile. Lorsque vous démarrez une " -"impression d'une seule couleur/matériau, avec l'option \"Calibration du " -"débit\" cochée dans le menu de démarrage de l'impression, l'imprimante " -"suivra l'ancienne méthode de calibration du filament avant l'impression.\n" +"impression d'une seule couleur/matériau, avec l'option \"Calibration du débit" +"\" cochée dans le menu de démarrage de l'impression, l'imprimante suivra " +"l'ancienne méthode de calibration du filament avant l'impression.\n" "Lorsque vous démarrez une impression multi-couleurs/matériaux, l'imprimante " "utilise le paramètre de compensation par défaut pour le filament lors de " "chaque changement de filament, ce qui donne un bon résultat dans la plupart " @@ -15136,8 +15139,8 @@ msgstr "" "Voulez-vous le réécrire ?" msgid "" -"We would rename the presets as \"Vendor Type Serial @printer you " -"selected\". \n" +"We would rename the presets as \"Vendor Type Serial @printer you selected" +"\". \n" "To add preset for more printers, Please go to printer selection" msgstr "" "Nous renommerions les préréglages en « Vendor Type Serial @printer you " @@ -16464,8 +16467,8 @@ msgstr "" #~ "thickness (top+bottom solid layers)" #~ msgstr "" #~ "Ajoutez du remplissage solide à proximité des surfaces inclinées pour " -#~ "garantir l'épaisseur verticale de la coque (couches solides " -#~ "supérieure+inférieure)." +#~ "garantir l'épaisseur verticale de la coque (couches solides supérieure" +#~ "+inférieure)." #~ msgid "Further reduce solid infill on walls (beta)" #~ msgstr "Réduire davantage le remplissage solide des parois (expérimental)" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index a7a3bd5e7e..306e3c4781 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -251,6 +251,9 @@ msgstr "Forgatás visszaállítása" msgid "World coordinates" msgstr "Világkoordináták" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index c1c5e6a694..b1b9bb2a0a 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -255,6 +255,9 @@ msgstr "Reimposta rotazione" msgid "World coordinates" msgstr "Coordinate reali" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 752c22c6b6..9ec26dbb6e 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -253,6 +253,9 @@ msgstr "回転をリセット" msgid "World coordinates" msgstr "空間座標" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index e8ecc6de41..7877334d1a 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2024-04-11 18:46+0900\n" "Last-Translator: Hotsolidinfill <138652683+Hotsolidinfill@users.noreply." "github.com>, crwusiz \n" @@ -260,6 +260,9 @@ msgstr "회전 초기화" msgid "World coordinates" msgstr "영역 좌표" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index d8aef7813b..87545b8d18 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -252,6 +252,9 @@ msgstr "Rotatie herstellen" msgid "World coordinates" msgstr "Wereldcoördinaten" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index a484c3a3e4..5000a88e9d 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: \n" "Last-Translator: Krzysztof Morga \n" "Language-Team: \n" @@ -256,6 +256,9 @@ msgstr "Zresetuj obrót" msgid "World coordinates" msgstr "Współrzędne" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index f9a2184964..5bb79e8565 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer V2.0.0 Official Release\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2024-04-12 13:49+0700\n" "Last-Translator: \n" "Language-Team: andylg@yandex.ru\n" @@ -263,6 +263,9 @@ msgstr "Сброс вращения" msgid "World coordinates" msgstr "Мировая СК" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 271d981b16..ebeedc1973 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -252,6 +252,9 @@ msgstr "Återställ Rotation" msgid "World coordinates" msgstr "Världskoordinater" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 59a4ab5929..9ee5eb0218 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2024-04-14 16:06+0300\n" "Last-Translator: Olcay ÖREN\n" "Language-Team: \n" @@ -255,6 +255,9 @@ msgstr "Döndürmeyi Sıfırla" msgid "World coordinates" msgstr "Dünya koordinatları" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 351f531f84..465f94e665 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2023-08-10 20:25-0400\n" "Last-Translator: \n" "Language-Team: \n" @@ -261,6 +261,9 @@ msgstr "Скинути орієнтацію" msgid "World coordinates" msgstr "Світові координати" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "°" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 2d6b907541..31813ffaab 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2023-04-01 13:21+0800\n" "Last-Translator: SoftFever \n" "Language-Team: \n" @@ -257,6 +257,9 @@ msgstr "重置旋转" msgid "World coordinates" msgstr "世界坐标" +msgid "Object coordinates" +msgstr "物体坐标" + msgid "°" msgstr "°" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index aa9d391db5..761bd39e74 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 00:10+0800\n" +"POT-Creation-Date: 2024-04-15 22:59+0800\n" "PO-Revision-Date: 2023-11-06 14:37+0800\n" "Last-Translator: ablegods \n" "Language-Team: \n" @@ -275,6 +275,9 @@ msgstr "重設旋轉" msgid "World coordinates" msgstr "世界坐標" +msgid "Object coordinates" +msgstr "" + msgid "°" msgstr "" diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp index 3584edbea7..1aab82865c 100644 --- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp +++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp @@ -267,7 +267,7 @@ void GizmoObjectManipulation::change_position_value(int axis, double value) TransformationType trafo_type; trafo_type.set_relative(); if (selection.requires_local_axes()) { - trafo_type.set_local(); + trafo_type.set_instance(); } selection.translate(position - m_cache.position, trafo_type); m_glcanvas.do_move(L("Set Position")); @@ -588,7 +588,12 @@ void GizmoObjectManipulation::do_render_move_window(ImGuiWrapper *imgui_wrapper, float space_size = imgui_wrapper->get_style_scaling() * 8; float position_size = imgui_wrapper->calc_text_size(_L("Position")).x + space_size; - float World_size = imgui_wrapper->calc_text_size(_L("World coordinates")).x + space_size; + auto position_title = _L("World coordinates"); + Selection& selection = m_glcanvas.get_selection(); + if(selection.is_single_modifier() || selection.is_single_volume()) + position_title = _L("Object coordinates"); + + float World_size = imgui_wrapper->calc_text_size(position_title).x + space_size; float caption_max = std::max(position_size, World_size) + 2 * space_size; float end_text_size = imgui_wrapper->calc_text_size(this->m_new_unit_string).x; @@ -609,7 +614,7 @@ void GizmoObjectManipulation::do_render_move_window(ImGuiWrapper *imgui_wrapper, ImGui::AlignTextToFramePadding(); unsigned int current_active_id = ImGui::GetActiveID(); ImGui::PushItemWidth(caption_max); - imgui_wrapper->text(_L("World coordinates")); + imgui_wrapper->text(position_title); ImGui::SameLine(caption_max + index * space_size); ImGui::PushItemWidth(unit_size); ImGui::TextAlignCenter("X");