From 3011807ac9db955441ddb8293928266e39b01abc Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Tue, 25 Oct 2022 00:23:24 +0200 Subject: [PATCH 01/16] Update translation_IT.json --- Translations/translation_IT.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index 0e63f30c..2e7c9d82 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -7,7 +7,7 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "SettingsCalibrationWarning": "Assicurarsi che la punta e il manico si trovino a temperatura ambiente prima di continuare!", "SettingsResetWarning": "Ripristinare le impostazioni iniziali?", "UVLOWarningString": "DC BASSA", "UndervoltageString": "DC INSUFFICIENTE", @@ -289,10 +289,10 @@ }, "CalibrateCJC": { "text2": [ - "Calibrate CJC", - "at next boot" + "Calibra T", + "all'avvio" ], - "desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)" + "desc": "Compensa l'errore delle rilevazioni della termocoppia al prossimo avvio (non necessario se l'errore su T è <5 °C)" }, "VoltageCalibration": { "text2": [ From 76df15a80c54e3bd8fcac663f03fa7b579e25067 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Tue, 25 Oct 2022 00:31:56 +0200 Subject: [PATCH 02/16] Update translation_RO.json --- Translations/translation_RO.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index 4ca993a0..2ac5ab0f 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -7,7 +7,7 @@ ], "tempUnitFahrenheit": true, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "SettingsCalibrationWarning": "Vă rugăm să vă asigurați că vârful și mânerul sunt la temperatura camerei la următoarea pornire!", "SettingsResetWarning": "Sigur doriti să restaurati la setările implicite?", "UVLOWarningString": "DC LOW", "UndervoltageString": "Sub tensiune", @@ -166,7 +166,7 @@ "Sensibilitate", "la mişcare" ], - "desc": "0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil" + "desc": "Sensibilitate senzor mișcare (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)" }, "SleepTemperature": { "text2": [ @@ -261,10 +261,10 @@ }, "LOGOTime": { "text2": [ - "Boot logo", - "duration" + "Durată", + "logo încărcare" ], - "desc": "Set boot logo duration (s=seconds)" + "desc": "Setați durata logo de pornire (s=secunde)" }, "AdvancedIdle": { "text2": [ @@ -289,10 +289,10 @@ }, "CalibrateCJC": { "text2": [ - "Calibrate CJC", - "at next boot" + "Calibrare CJC", + "la următoarea pornire" ], - "desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)" + "desc": "Calibrați vârful Cold Jonction Compensation la următoarea pornire (nu este necesar dacă Delta T este < 5°C)" }, "VoltageCalibration": { "text2": [ From 529cc88d9bbc949c067d3a7b613521e6502351a6 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Tue, 25 Oct 2022 00:37:14 +0200 Subject: [PATCH 03/16] Update translation_RO.json --- Translations/translation_RO.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index 2ac5ab0f..6925f121 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -7,7 +7,7 @@ ], "tempUnitFahrenheit": true, "messages": { - "SettingsCalibrationWarning": "Vă rugăm să vă asigurați că vârful și mânerul sunt la temperatura camerei la următoarea pornire!", + "SettingsCalibrationWarning": "Vă rugăm să vă asigurati că vârful si mânerul sunt la temperatura camerei la următoarea pornire!", "SettingsResetWarning": "Sigur doriti să restaurati la setările implicite?", "UVLOWarningString": "DC LOW", "UndervoltageString": "Sub tensiune", @@ -166,7 +166,7 @@ "Sensibilitate", "la mişcare" ], - "desc": "Sensibilitate senzor mișcare (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)" + "desc": "Sensibilitate senzor miscare (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)" }, "SleepTemperature": { "text2": [ @@ -264,7 +264,7 @@ "Durată", "logo încărcare" ], - "desc": "Setați durata logo de pornire (s=secunde)" + "desc": "Setati durata logo de pornire (s=secunde)" }, "AdvancedIdle": { "text2": [ @@ -292,7 +292,7 @@ "Calibrare CJC", "la următoarea pornire" ], - "desc": "Calibrați vârful Cold Jonction Compensation la următoarea pornire (nu este necesar dacă Delta T este < 5°C)" + "desc": "Calibrati vârful Cold Jonction Compensation la următoarea pornire (nu este necesar dacă Delta T este < 5°C)" }, "VoltageCalibration": { "text2": [ From 310055d5a9466c16b60b879b8abe6d7de054b7da Mon Sep 17 00:00:00 2001 From: Dmitry Gribenchuk Date: Tue, 25 Oct 2022 09:18:13 +0300 Subject: [PATCH 04/16] update translation_UK.json translation_RU.json translation_BE.json --- Translations/translation_BE.json | 2 +- Translations/translation_RU.json | 2 +- Translations/translation_UK.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json index 19364d60..2fcda516 100644 --- a/Translations/translation_BE.json +++ b/Translations/translation_BE.json @@ -8,7 +8,7 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "SettingsCalibrationWarning": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!", "SettingsResetWarning": "Вы ўпэннены, што жадаеце зкінуць налады да першапачатковых значэнняў?", "UVLOWarningString": "НАПРУГА--", "UndervoltageString": "Нізкая напруга", diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index b77f8744..f5eaa28a 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -8,7 +8,7 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "SettingsCalibrationWarning": "Пожалуйста, убедитесь, что кончик и ручка имеют комнатную температуру при следующей загрузке!", "SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?", "UVLOWarningString": "НАПРЯЖ--", "UndervoltageString": "Низ. напряжение", diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 8eee2d8e..92d46dee 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -8,7 +8,7 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "SettingsCalibrationWarning": "Під час наступного завантаження переконайтеся, що наконечник і ручка мають кімнатну температуру!", "SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? (A=Так, В=Ні)", "UVLOWarningString": "АККУМ--", "UndervoltageString": "Низька напруга", From 587c8390a81671987f13179076f17d12081c8a98 Mon Sep 17 00:00:00 2001 From: Dmitry Gribenchuk Date: Tue, 25 Oct 2022 09:20:59 +0300 Subject: [PATCH 05/16] update translation_PL.json --- Translations/translation_PL.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index c50d556d..95e62abb 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -7,7 +7,7 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "SettingsCalibrationWarning": "Upewnij się, że końcówka i uchwyt mają temperaturę pokojową podczas następnego rozruchu!", "SettingsResetWarning": "Czy na pewno chcesz przywrócić ustawienia fabryczne?", "UVLOWarningString": "NIS. NAP", "UndervoltageString": "Zbyt niskie nap.", From 653fb096492e808cc5f7d955b339484b1dc83c45 Mon Sep 17 00:00:00 2001 From: Dmitry Gribenchuk Date: Tue, 25 Oct 2022 15:58:02 +0300 Subject: [PATCH 06/16] update translation_RU.json translation_UK.json --- Translations/translation_RU.json | 4 ++-- Translations/translation_UK.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index f5eaa28a..13bb0245 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -37,8 +37,8 @@ "UnlockingKeysString": "РАЗБЛОК", "WarningKeysLockedString": "!ЗАБЛОК!", "WarningThermalRunaway": [ - "Thermal", - "Runaway" + "Утечка", + "Температуры" ] }, "characters": { diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 92d46dee..319e077a 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -37,8 +37,8 @@ "UnlockingKeysString": "РОЗБЛОК.", "WarningKeysLockedString": "!ЗАБЛОК!", "WarningThermalRunaway": [ - "Thermal", - "Runaway" + "Тепловий", + "Втікач" ] }, "characters": { From ccaac853e6bd10376833fa3146a553889b57ef3d Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Thu, 27 Oct 2022 16:31:07 +0200 Subject: [PATCH 07/16] Update translation_RO.json --- Translations/translation_RO.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index 6925f121..7f0897b8 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -292,7 +292,7 @@ "Calibrare CJC", "la următoarea pornire" ], - "desc": "Calibrati vârful Cold Jonction Compensation la următoarea pornire (nu este necesar dacă Delta T este < 5°C)" + "desc": "Calibrati vârful Cold Junction Compensation la următoarea pornire (nu este necesar dacă Delta T este < 5°C)" }, "VoltageCalibration": { "text2": [ From aa377db618570503c198ca22dc6244e434e1fa52 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Thu, 27 Oct 2022 16:32:44 +0200 Subject: [PATCH 08/16] Update translation_RO.json --- Translations/translation_RO.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index 7f0897b8..cf55879d 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -164,7 +164,7 @@ "MotionSensitivity": { "text2": [ "Sensibilitate", - "la mişcare" + "la miscare" ], "desc": "Sensibilitate senzor miscare (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)" }, From 7aa3b386968cb5b6597a82b105f0b356f8a8a604 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Thu, 27 Oct 2022 17:28:40 +0200 Subject: [PATCH 09/16] cleared up some wording along with some typo fixes --- Documentation/Settings.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/Settings.md b/Documentation/Settings.md index 7501a2ad..76174c77 100644 --- a/Documentation/Settings.md +++ b/Documentation/Settings.md @@ -130,7 +130,13 @@ Flash temperature reading at idle if tip is hot Note: If the difference between the target temperature and the measured temperature is less than 5°C, **calibration is NOT required at all**. -This is used to calibrate the offset between ADC and Op-amp of the tip at next boot (Idealy it has to be done at boot, before internal components get warm.). But this setting is ***not permanent!*** It resetes after the calibration is completed (At next boot the checkbox will be unchecked!). If you need to repeat the calibration however, you have to set the checkbox *again*, unplug your device and let it cool down to room/ambient temperature & power it up, idealy while it sits on the desk. +This is used to calibrate the offset between ADC and Op-amp of the tip **at next boot** (Ideally it has to be done at boot, before internal components get warm.). If the checkbox is set, the calibration will only be performed at the next boot. After a successful calibration the checkbox will be unchecked again! If you need to repeat the calibration however, you have to set the checkbox *again*, unplug your device and let it cool down to room/ambient temperature & power it up, ideally while it sits on the desk. + +Also, the calibration will only take place if both of the following conditions are met: +- The tip must be installed. +- The temperature difference between tip and handle must be less than 10°C. + +Otherwise, the calibration will be performed the next time the device is started and both conditions are met, unless the corresponding checkbox is unchecked. Hence, never repeat the calibration in quick succession! From 0199af15215d2ee60b0c05da7ee433eb63697fbe Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Thu, 27 Oct 2022 17:53:27 +0200 Subject: [PATCH 10/16] Update Settings.md --- Documentation/Settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Settings.md b/Documentation/Settings.md index 76174c77..7b85506e 100644 --- a/Documentation/Settings.md +++ b/Documentation/Settings.md @@ -134,7 +134,7 @@ This is used to calibrate the offset between ADC and Op-amp of the tip **at next Also, the calibration will only take place if both of the following conditions are met: - The tip must be installed. -- The temperature difference between tip and handle must be less than 10°C. +- The temperature difference between tip and handle must be less than 10°C. (~ ambient / room temperature) Otherwise, the calibration will be performed the next time the device is started and both conditions are met, unless the corresponding checkbox is unchecked. From 70dc258233b171e39c63cf55e354cfc5d0ad2021 Mon Sep 17 00:00:00 2001 From: JugglerLKR Date: Fri, 28 Oct 2022 15:01:44 +0300 Subject: [PATCH 11/16] Update translation_RU.json minor changes due to slightly incorrect translation. simplifed CJC translation thermal runaway - no need to translate for searching purposes --- Translations/translation_RU.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 13bb0245..318b309d 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -8,7 +8,7 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Пожалуйста, убедитесь, что кончик и ручка имеют комнатную температуру при следующей загрузке!", + "SettingsCalibrationWarning": "Пожалуйста, убедитесь, что жало и корпус имеют комнатную температуру при следующей загрузке!", "SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?", "UVLOWarningString": "НАПРЯЖ--", "UndervoltageString": "Низ. напряжение", @@ -37,8 +37,8 @@ "UnlockingKeysString": "РАЗБЛОК", "WarningKeysLockedString": "!ЗАБЛОК!", "WarningThermalRunaway": [ - "Утечка", - "Температуры" + "Thermal", + "Runaway" ] }, "characters": { @@ -293,7 +293,7 @@ "Калибровка", "температуры" ], - "desc": "Калибровка компенсации холодного спая жала при следующей загрузке (не требуется, если Delta T < 5°C)" + "desc": "Калибровка датчика температуры жала при следующей загрузке (не требуется, если разница менее 5°C)" }, "VoltageCalibration": { "text2": [ From e9395bfbd08baba68624d34612ff443b653d8c80 Mon Sep 17 00:00:00 2001 From: yegor Date: Fri, 28 Oct 2022 16:27:54 +0300 Subject: [PATCH 12/16] Update translation_UK.json --- Translations/translation_UK.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 319e077a..e3a5b159 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -8,7 +8,7 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Під час наступного завантаження переконайтеся, що наконечник і ручка мають кімнатну температуру!", + "SettingsCalibrationWarning": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!", "SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? (A=Так, В=Ні)", "UVLOWarningString": "АККУМ--", "UndervoltageString": "Низька напруга", @@ -37,8 +37,8 @@ "UnlockingKeysString": "РОЗБЛОК.", "WarningKeysLockedString": "!ЗАБЛОК!", "WarningThermalRunaway": [ - "Тепловий", - "Втікач" + "Некерований", + "розігрів" ] }, "characters": { @@ -290,10 +290,10 @@ }, "CalibrateCJC": { "text2": [ - "Calibrate CJC", - "at next boot" + "Калібрувати КХС", + "при наступному завантаженні" ], - "desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)" + "desc": "Калібрувати Компенсацію Холодного Спаю жала при наступному завантаженні(непотрібне при різниці температур < 5°C)" }, "VoltageCalibration": { "text2": [ From dd63518c9f0e9302711ac91ddffb1d1ed850bf17 Mon Sep 17 00:00:00 2001 From: t-xdk <31767551+t-xdk@users.noreply.github.com> Date: Mon, 31 Oct 2022 00:24:42 +0100 Subject: [PATCH 13/16] Update translation_DA.json --- Translations/translation_DA.json | 190 +++++++++++++++---------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index af4af26a..f71ab4c2 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -7,34 +7,34 @@ ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", - "SettingsResetWarning": "Are you sure to reset settings to default values?", + "SettingsCalibrationWarning": "Sørg for at loddespidsen er ved stuetemperatur, inden næste start!", + "SettingsResetWarning": "Er du sikker du vil resette indstillingerne til standard?", "UVLOWarningString": "Lav Volt", - "UndervoltageString": "Undervoltage", + "UndervoltageString": "Undervolt", "InputVoltageString": "Input V: ", "SleepingSimpleString": "Zzzz", "SleepingAdvancedString": "Dvale...", "SleepingTipAdvancedString": "Tip:", "OffString": "Off", - "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" + "DeviceFailedValidationWarning": "Din enhed er højst sandsyneligt en Kopivare!" }, "messagesWarn": { "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ - "Certain settings", - "were changed!" + "Visse indstillinger", + "Er blevet ændret!" ], "NoAccelerometerMessage": [ - "No accelerometer", - "detected!" + "ingen accelerometer", + "fundet!" ], "NoPowerDeliveryMessage": [ - "No USB-PD IC", - "detected!" + "ingen USB-PD IC", + "Fundet!" ], - "LockingKeysString": "LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!", + "LockingKeysString": "LÅST", + "UnlockingKeysString": "ULÅST", + "WarningKeysLockedString": "!LÅST!", "WarningThermalRunaway": [ "Thermal", "Runaway" @@ -63,36 +63,36 @@ "menuGroups": { "PowerMenu": { "text2": [ - "Power", - "settings" + "Strøm", + "Indstillinger" ], "desc": "" }, "SolderingMenu": { "text2": [ - "Soldering", - "settings" + "Lodde", + "Indstillinger" ], "desc": "" }, "PowerSavingMenu": { "text2": [ - "Sleep", + "Dvale", "mode" ], "desc": "" }, "UIMenu": { "text2": [ - "User", - "interface" + "Bruger", + "Grændseflade" ], "desc": "" }, "AdvancedMenu": { "text2": [ - "Advanced", - "settings" + "Advancerede", + "Indstillinger" ], "desc": "" } @@ -100,31 +100,31 @@ "menuOptions": { "DCInCutoff": { "text2": [ - "Power", - "source" + "Strøm", + "Kilde" ], - "desc": "Strømforsyning. Indstil Cutoff Spændingen. (DC 10V) (S 3,3V per cell)" + "desc": "Strømforsyning. Indstil Cutoff Spændingen. (DC 10V) (S 3,3V per celle)" }, "MinVolCell": { "text2": [ "Minimum", - "voltage" + "Spænding" ], - "desc": "Minimum allowed voltage per battery cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)" + "desc": "Minimum tilladt spænding pr. celle (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)" }, "QCMaxVoltage": { "text2": [ "QC", - "voltage" + "Spænding" ], - "desc": "Max QC voltage the iron should negotiate for" + "desc": "Max QC spænding Loddekolben skal forhandle sig til" }, "PDNegTimeout": { "text2": [ "PD", "timeout" ], - "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers" + "desc": "PD-forhandlingstimeout i trin på 100 ms for kompatibilitet med nogle QC-opladere" }, "BoostTemperature": { "text2": [ @@ -136,55 +136,55 @@ "AutoStart": { "text2": [ "Start-up", - "behavior" + "Opførsel" ], "desc": "Start automatisk med lodning når strøm sættes til. (S=Slukket | L=Lodning | D=Dvale tilstand | R=Dvale tilstand rumtemperatur)" }, "TempChangeShortStep": { "text2": [ - "Temp change", - "short" + "Temp ændring", + "kort" ], - "desc": "Temperature-change-increment on short button press" + "desc": "Temperatur-ændring-stigning ved kort tryk på knappen" }, "TempChangeLongStep": { "text2": [ - "Temp change", - "long" + "Temp ændring", + "lang" ], - "desc": "Temperature-change-increment on long button press" + "desc": "Temperatur-ændring-stigning ved lang tryk på knappen" }, "LockingMode": { "text2": [ - "Allow locking", - "buttons" + "Tillad låsning", + "af knapperne" ], - "desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)" + "desc": "Hold begge knapper nede under lodning for at låse dem (D=deaktiver | B=kun boost-tilstand | F=fuld låsning)" }, "MotionSensitivity": { "text2": [ - "Motion", - "sensitivity" + "Bevægelses", + "følsomhed" ], "desc": "Bevægelsesfølsomhed (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)" }, "SleepTemperature": { "text2": [ - "Sleep", + "Dvale", "temp" ], "desc": "Dvale Temperatur (C)" }, "SleepTimeout": { "text2": [ - "Sleep", + "Dvale", "timeout" ], "desc": "Dvale Timeout (Minutter | Sekunder)" }, "ShutdownTimeout": { "text2": [ - "Shutdown", + "Sluknings", "timeout" ], "desc": "sluknings Timeout (Minutter)" @@ -192,140 +192,140 @@ "HallEffSensitivity": { "text2": [ "Hall sensor", - "sensitivity" + "følsomhed" ], - "desc": "Sensitivity to magnets (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)" + "desc": "følsomhed overfor magneten (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)" }, "TemperatureUnit": { "text2": [ - "Temperature", - "unit" + "Temperatur", + "Enhed" ], "desc": "Temperatur Enhed (C=Celsius | F=Fahrenheit)" }, "DisplayRotation": { "text2": [ - "Display", - "orientation" + "Skærm", + "Orientering" ], "desc": "Skærm Orientering (H=Højre Håndet | V=Venstre Håndet | A=Automatisk)" }, "CooldownBlink": { "text2": [ - "Cooldown", - "flashing" + "Køl ned", + "Blinkning" ], "desc": "Blink temperaturen på skærmen, mens spidsen stadig er varm." }, "ScrollingSpeed": { "text2": [ "Scrolling", - "speed" + "Hastighed" ], - "desc": "Speed info text scrolls past at (S=slow | F=fast)" + "desc": "Hastigheden infotekst ruller forbi med (S=Langsom | F=Hurtigt)" }, "ReverseButtonTempChange": { "text2": [ - "Swap", - "+ - keys" + "Skift", + "+ - tasterne" ], - "desc": "Reverse assignment of buttons for temperature adjustment" + "desc": "Skift tildeling af knapper til temperaturjustering" }, "AnimSpeed": { "text2": [ "Anim.", - "speed" + "Hastighed" ], - "desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)" + "desc": "Hastigheden for ikonanimationer i menuen (O=fra | S=langsomt | M=medium | F=hurtigt)" }, "AnimLoop": { "text2": [ "Anim.", - "loop" + "sløfe" ], - "desc": "Loop icon animations in main menu" + "desc": "ikonanimation sløfe i hovedmenuen" }, "Brightness": { "text2": [ - "Screen", - "brightness" + "Skærm", + "lysstyrke" ], - "desc": "Adjust the OLED screen brightness" + "desc": "Juster lysstyrken på OLED-skærmen" }, "ColourInversion": { "text2": [ - "Invert", - "screen" + "spejlvende", + "skærm" ], - "desc": "Invert the OLED screen colors" + "desc": "spejlvende farverne på OLED-skærmen" }, "LOGOTime": { "text2": [ - "Boot logo", - "duration" + "opstartslogo", + "varighed" ], - "desc": "Set boot logo duration (s=seconds)" + "desc": "Indstiller varigheden for opstartslogoet (s=sekunder)" }, "AdvancedIdle": { "text2": [ - "Detailed", - "idle screen" + "Detaljeret", + "Standby skærm" ], "desc": "Vis detialieret information med en mindre skriftstørrelse på standby skærmen." }, "AdvancedSoldering": { "text2": [ - "Detailed", - "solder screen" + "Detaljeret", + "loddeskærm" ], - "desc": "Vis detialieret information mens der loddes" + "desc": "Vis detaljeret information mens der loddes" }, "PowerLimit": { "text2": [ - "Power", - "limit" + "Strøm", + "begrænsning" ], - "desc": "Maximum power the iron can use (W=watt)" + "desc": "Maksimal effekt Loddekolben kan bruge (W=watt)" }, "CalibrateCJC": { "text2": [ - "Calibrate CJC", - "at next boot" + "kalibrere CJK", + "under næste opstart" ], - "desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)" + "desc": "Kalibrer spids Cold Junction Kompensation ved næste opstart (ikke påkrævet, hvis Delta T er < 5°C)" }, "VoltageCalibration": { "text2": [ - "Calibrate", - "input voltage?" + "Kalibrere", + "input spændingen?" ], "desc": "VIN kalibrering. Knapperne justere, Lang tryk for at gå ud" }, "PowerPulsePower": { "text2": [ - "Power", - "pulse" + "Strøm", + "puls" ], - "desc": "Intensity of power of keep-awake-pulse (watt)" + "desc": "Intensiteten af strøm for hold-vågen-puls (watt)" }, "PowerPulseWait": { "text2": [ - "Power pulse", - "delay" + "Strøm puls", + "Forsinkelse" ], - "desc": "Delay before keep-awake-pulse is triggered (x 2,5s)" + "desc": "Forsinkelse før hold-vågen-puls udløses (x 2,5s)" }, "PowerPulseDuration": { "text2": [ - "Power pulse", - "duration" + "Strøm puls", + "varighed" ], - "desc": "Keep-awake-pulse duration (x 250ms)" + "desc": "Hold-vågen-pulsvarighed (x 250ms)" }, "SettingsReset": { "text2": [ - "Restore default", - "settings" + "Gendan fabriks", + "Indstillinger" ], "desc": "Gendan alle indstillinger" }, From 8512da71ce4b9ef5f1879ddcec5dba919228e258 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Mon, 31 Oct 2022 01:09:54 +0100 Subject: [PATCH 14/16] solving issue #1423 --- Documentation/Menu.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/Menu.md b/Documentation/Menu.md index 869547c1..a8ac4fc5 100644 --- a/Documentation/Menu.md +++ b/Documentation/Menu.md @@ -14,9 +14,10 @@ In this mode the iron works as you would expect, pressing either button will tak This mode allows you to cycle through all the options and set custom values. The menu is arranged so that the most often used settings are first. -- The rear button (`-/B`) cycles through the main options. -- The front button (`+/A`) changes the selected option. -- Note that settings are not saved until you exit the menu. +- The rear button (`-/B`) cycles through the main options. (declines i.e. Additional warning to proceed.) +- The front button (`+/A`) either enters a submenu or changes the selected option. (accepts i.e. Additional warning to proceed.) +- If the device is unplugged before exiting the main menu settings will not be saved. +- To exit the menu, either continue to press (`-/B`) or hold it until the idle screen is reached. Alternatively, you could press (`-/A`) & (`-/B`) simultaneously to exit the submenu and once more to exit the main menu. - If you idle on a setting (i.e., don't press any buttons), after 3 seconds, the screen scrolls a brief description (mini help guide). - Enter submenus using the front button (`+/A`) if you are going to change it or wish to view it. - Scrolling through the all options of a submenu will return you back to its entry location. From c404a79cd69ef4b32306b93cc8d25cadc811781c Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 4 Nov 2022 23:17:41 +0100 Subject: [PATCH 15/16] Update and rename translation_NO.json to translation_NB.json --- ...ranslation_NO.json => translation_NB.json} | 138 +++++++++--------- 1 file changed, 69 insertions(+), 69 deletions(-) rename Translations/{translation_NO.json => translation_NB.json} (63%) diff --git a/Translations/translation_NO.json b/Translations/translation_NB.json similarity index 63% rename from Translations/translation_NO.json rename to Translations/translation_NB.json index ade1435f..7fc588e9 100644 --- a/Translations/translation_NO.json +++ b/Translations/translation_NB.json @@ -1,13 +1,13 @@ { - "languageCode": "NO", - "languageLocalName": "Norsk", + "languageCode": "NB", + "languageLocalName": "Norsk bokmål", "fonts": [ "ascii_basic", "latin_extended" ], "tempUnitFahrenheit": false, "messages": { - "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "SettingsCalibrationWarning": "Sørg for at loddespissen har romtemperatur før du fortsetter!", "SettingsResetWarning": "Er du sikker på at du vil tilbakestille til standardinnstillinger?", "UVLOWarningString": "Lavspenn", "UndervoltageString": "Underspenning", @@ -16,28 +16,28 @@ "SleepingAdvancedString": "Dvale...", "SleepingTipAdvancedString": "Spiss:", "OffString": "Av", - "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" + "DeviceFailedValidationWarning": "Enheten din er sannsynligvis en forfalskning!" }, "messagesWarn": { - "ResetOKMessage": "Reset OK", + "ResetOKMessage": "Tilbakestilling OK", "SettingsResetMessage": [ - "Certain settings", - "were changed!" + "Noen innstillinger", + "ble endret!" ], "NoAccelerometerMessage": [ - "No accelerometer", - "detected!" + "Ingen akselerometer", + "funnet!" ], "NoPowerDeliveryMessage": [ - "No USB-PD IC", - "detected!" + "Ingen USB-PD IC", + "funnet!" ], - "LockingKeysString": "LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!", + "LockingKeysString": "LÅST", + "UnlockingKeysString": "ÅPNET", + "WarningKeysLockedString": "!LÅST!", "WarningThermalRunaway": [ - "Thermal", - "Runaway" + "Termisk", + "rømling" ] }, "characters": { @@ -63,8 +63,8 @@ "menuGroups": { "PowerMenu": { "text2": [ - "Power", - "settings" + "Effekt-", + "innst." ], "desc": "" }, @@ -108,23 +108,23 @@ "MinVolCell": { "text2": [ "Minimum", - "voltage" + "spenning" ], - "desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)" + "desc": "Minimum tillatt spenning per celle (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)" }, "QCMaxVoltage": { "text2": [ - "QC", - "voltage" + "QC-", + "spenning" ], - "desc": "Max QC voltage the iron should negotiate for" + "desc": "Maks QC-spenning bolten skal forhandle om" }, "PDNegTimeout": { "text2": [ - "PD", - "timeout" + "PD-", + "tidsavb." ], - "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers" + "desc": "PD-forhandlingstidsavbrudd i steg på 100 ms for kompatibilitet med noen QC-ladere" }, "BoostTemperature": { "text2": [ @@ -142,24 +142,24 @@ }, "TempChangeShortStep": { "text2": [ - "Temp change", - "short" + "Temp-endring", + "kort" ], - "desc": "Temperature-change-increment on short button press" + "desc": "Hvor mye temperaturen skal endres ved kort trykk på knapp" }, "TempChangeLongStep": { "text2": [ - "Temp change", - "long" + "Temp-endring", + "lang" ], - "desc": "Temperature-change-increment on long button press" + "desc": "Hvor mye temperaturen skal endres ved langt trykk på knapp" }, "LockingMode": { "text2": [ - "Allow locking", - "buttons" + "Tillat å låse", + "knapper" ], - "desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)" + "desc": "Mens du lodder, hold nede begge knapper for å bytte mellom låsemodus (D=deaktiver | B=kun boost | F=full lås)" }, "MotionSensitivity": { "text2": [ @@ -191,10 +191,10 @@ }, "HallEffSensitivity": { "text2": [ - "Hall sensor", - "sensitivity" + "Hall-sensor", + "følsomhet" ], - "desc": "Sensitivity to magnets (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)" + "desc": "Sensitiviteten til Hall-effekt-sensoren for å detektere inaktivitet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)" }, "TemperatureUnit": { "text2": [ @@ -226,45 +226,45 @@ }, "ReverseButtonTempChange": { "text2": [ - "Swap", - "+ - keys" + "Bytt", + "+ - kn." ], - "desc": "Reverse assignment of buttons for temperature adjustment" + "desc": "Bytt om på knappene for å stille temperatur" }, "AnimSpeed": { "text2": [ "Anim.", - "speed" + "hastighet" ], - "desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)" + "desc": "Hastigheten til animasjonene i menyen (O=off | S=slow | M=medium | F=fast)" }, "AnimLoop": { "text2": [ "Anim.", "loop" ], - "desc": "Loop icon animations in main menu" + "desc": "Loop ikon-animasjoner i hovedmenyen" }, "Brightness": { "text2": [ - "Screen", - "brightness" + "Skjerm-", + "lysstyrke" ], - "desc": "Adjust the OLED screen brightness" + "desc": "Juster lysstyrken til OLED-skjermen" }, "ColourInversion": { "text2": [ - "Invert", - "screen" + "Inverter", + "skjerm" ], - "desc": "Invert the OLED screen colors" + "desc": "Inverter fargene på OLED-skjermen" }, "LOGOTime": { "text2": [ - "Boot logo", - "duration" + "Oppstartlogo", + "varighet" ], - "desc": "Set boot logo duration (s=seconds)" + "desc": "Setter varigheten til oppstartlogoen (s=sekunder)" }, "AdvancedIdle": { "text2": [ @@ -282,17 +282,17 @@ }, "PowerLimit": { "text2": [ - "Power", - "limit" + "Effekt-", + "grense" ], - "desc": "Maximum power the iron can use (W=watt)" + "desc": "Maks effekt jernet kan bruke (W=watt)" }, "CalibrateCJC": { "text2": [ - "Calibrate CJC", - "at next boot" + "TempKal?", + "" ], - "desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)" + "desc": "Kalibrer spiss-temperatur." }, "VoltageCalibration": { "text2": [ @@ -303,24 +303,24 @@ }, "PowerPulsePower": { "text2": [ - "Power", - "pulse" + "Effekt-", + "puls" ], - "desc": "Intensity of power of keep-awake-pulse (W=watt)" + "desc": "Hvor høy effekt pulsen for å holde laderen våken skal ha (watt)" }, "PowerPulseWait": { "text2": [ - "Power pulse", - "delay" + "Effektpuls", + "forsink." ], - "desc": "Delay before keep-awake-pulse is triggered (x 2.5s)" + "desc": "Forsinkelse før effektpulsen utløses (x 2.5s)" }, "PowerPulseDuration": { "text2": [ - "Power pulse", - "duration" + "Effektpuls", + "varighet" ], - "desc": "Keep-awake-pulse duration (x 250ms)" + "desc": "Hvor lenge holde-våken-pulsen varer (x 250ms)" }, "SettingsReset": { "text2": [ @@ -332,7 +332,7 @@ "LanguageSwitch": { "text2": [ "Språk:", - " NO Norsk" + " NB Norsk bm" ], "desc": "" } From 680c25ab256d0b65bad625fef6a54640ea89fcc7 Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Fri, 4 Nov 2022 23:19:40 +0100 Subject: [PATCH 16/16] Update Makefile --- source/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Makefile b/source/Makefile index 491a38da..8b0cb7f8 100644 --- a/source/Makefile +++ b/source/Makefile @@ -17,7 +17,7 @@ HEXFILE_DIR=Hexfile OUTPUT_DIR_BASE=Objects OUTPUT_DIR=Objects/$(model) -ALL_LANGUAGES=BG CS DA DE EN ES FI FR HR HU IT JA_JP LT NL NL_BE NO PL PT RU SK SL SR_CYRL SR_LATN SV TR UK VI YUE_HK ZH_CN ZH_TW +ALL_LANGUAGES=BG CS DA DE EN ES FI FR HR HU IT JA_JP LT NL NL_BE NB PL PT RU SK SL SR_CYRL SR_LATN SV TR UK VI YUE_HK ZH_CN ZH_TW LANGUAGE_GROUP_CJK_LANGS=EN JA_JP YUE_HK ZH_TW ZH_CN LANGUAGE_GROUP_CJK_NAME=Chinese+Japanese