diff --git a/.github/workflows/weblate.yml b/.github/workflows/weblate.yml deleted file mode 100644 index 905850dc..00000000 --- a/.github/workflows/weblate.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Weblate PR -on: - create: - branches: ["^translations$"] - -jobs: - pull-request: - name: Open PR to dev - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - name: checkout - - - uses: repo-sync/pull-request@v2 - name: pull-request - with: - destination_branch: "dev" - pr_title: "Merging newest translations into dev" # Title of pull request - pr_body: | # Full markdown support, requires pr_title to be set - Translations automatically submitted by Weblate - - _Translations from [Weblate](https://hosted.weblate.org/projects/ironos/main-firmware/)_ - pr_reviewer: "ralim" - pr_draft: true - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Documentation/Translation.md b/Documentation/Translation.md index 4883ee81..d9016f21 100644 --- a/Documentation/Translation.md +++ b/Documentation/Translation.md @@ -1,6 +1,12 @@ # Translation -Moving forward (after 2022/12/07); IronOS is using Weblate to provide the visual interface to doing translations to make it easier for people to work with. -Currently there is a translation going on, so not _everything_ is perfect but its leaps in the right direction to help make it friendlier for people to edit and also subscribe to be notified when things are updated. +At the present time the main way of performing translations is to open a PR to this repository. +All translations are stored as `json` files in the repository. Currently there is ongoing work to look into a more user friendly method of editing translations than these but for now these are reliable. -This can be accessed on the [weblate hosted instance](https://hosted.weblate.org/projects/ironos/main-firmware/). +You can create a pull request with the new / updated json configuration file, and this will include this language into the new builds for the firmware. + +For testing you can build locally and test of course; but if you dont want to figure out the build environment; you can just open a PR and github will build the firmware for you using the _actions_ feature. + +This means that once you have a github account you can perform all of your edits inside Github should this be desired. + +Translations are _NOT_ accepted via issues/discussions or email. diff --git a/README.md b/README.md index f2c2cd3b..ef3c393c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ ![CI](https://github.com/Ralim/ts100/workflows/CI%20Build%20all/badge.svg) ![GitHub all](https://img.shields.io/github/downloads/ralim/IronOS/total) ![Latest Release](https://img.shields.io/github/v/release/ralim/IronOS) -[![Translation status](https://hosted.weblate.org/widgets/ironos/-/glossary/svg-badge.svg)](https://hosted.weblate.org/engage/ironos/) # IronOS - Flexible Soldering iron control Firmware @@ -82,8 +81,9 @@ Operation details are over in the [Menu information.](https://ralim.github.io/Ir ## Translations -Is your preferred language missing localisation of languages? -This project is using Weblate for managing translations in a user friendly way; [the user interface for this is on their hosted website.](https://hosted.weblate.org/engage/ironos/) +Is your preferred language missing localisation of some of the text? +Translations are stored as `json` files in the Translations folder. +PR's are loved and accepted to enhance the firmware. ## Thanks diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json index 07d9667e..2bfeec67 100644 --- a/Translations/translation_BE.json +++ b/Translations/translation_BE.json @@ -34,7 +34,7 @@ "message": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!" }, "CJCCalibrating": { - "message": "каліброўка" + "message": "каліброўка\n" }, "SettingsResetWarning": { "message": "Вы ўпэннены, што жадаеце зкінуць налады да першапачатковых значэнняў?" @@ -43,19 +43,19 @@ "message": "НАПРУГА--" }, "UndervoltageString": { - "message": "Нізкая напруга" + "message": "Нізкая напруга\n" }, "InputVoltageString": { - "message": "Сілкаванне В: " + "message": "Сілкаванне В: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Чаканне..." + "message": "Чаканне...\n" }, "SleepingTipAdvancedString": { - "message": "Джала:" + "message": "Джала: \n" }, "OffString": { "message": "Выкл." @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index 6eac3ef8..5da07bca 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Сигурни ли сте, че искате да върнете фабричните настройки?" @@ -43,19 +43,19 @@ "message": "Ниско DC Напрежение" }, "UndervoltageString": { - "message": "Ниско Напрежение" + "message": "Ниско Напрежение\n" }, "InputVoltageString": { - "message": "Входно V: " + "message": "Входно V: \n" }, "SleepingSimpleString": { "message": "Сън" }, "SleepingAdvancedString": { - "message": "Хър Хър Хър..." + "message": "Хър Хър Хър...\n" }, "SleepingTipAdvancedString": { - "message": "Връх:" + "message": "Връх: \n" }, "OffString": { "message": "Изкл." @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json index 40691ea1..5a21420f 100644 --- a/Translations/translation_CS.json +++ b/Translations/translation_CS.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Opravdu chcete resetovat zařízení do továrního nastavení?" @@ -43,19 +43,19 @@ "message": "Nízké DC" }, "UndervoltageString": { - "message": "Nízké napětí" + "message": "Nízké napětí\n" }, "InputVoltageString": { - "message": "Napětí: " + "message": "Napětí: \n" }, "SleepingSimpleString": { "message": "Zzz " }, "SleepingAdvancedString": { - "message": "Režim spánku..." + "message": "Režim spánku...\n" }, "SleepingTipAdvancedString": { - "message": "Hrot:" + "message": "Hrot: \n" }, "OffString": { "message": "Vyp" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index 0e8e68bc..8b6c7cfd 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Er du sikker du vil resette indstillingerne til standard?" @@ -43,19 +43,19 @@ "message": "Lav Volt" }, "UndervoltageString": { - "message": "Undervolt" + "message": "Undervolt\n" }, "InputVoltageString": { - "message": "Input V: " + "message": "Input V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Dvale..." + "message": "Dvale...\n" }, "SleepingTipAdvancedString": { - "message": "Tip:" + "message": "Tip: \n" }, "OffString": { "message": "Off" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json index 86c2c6c8..6e971c92 100644 --- a/Translations/translation_DE.json +++ b/Translations/translation_DE.json @@ -34,7 +34,7 @@ "message": "Vor dem Neustart bitte sicherstellen, dass Lötspitze & Gerät Raumtemperatur haben!" }, "CJCCalibrating": { - "message": "kalibriere" + "message": "kalibriere\n" }, "SettingsResetWarning": { "message": "Sicher, dass alle Werte zurückgesetzt werden sollen?" @@ -43,19 +43,19 @@ "message": "V niedr." }, "UndervoltageString": { - "message": "Unterspannung" + "message": "Unterspannung\n" }, "InputVoltageString": { - "message": "V Eingang: " + "message": "V Eingang: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Ruhemodus..." + "message": "Ruhemodus...\n" }, "SleepingTipAdvancedString": { - "message": "Temp:" + "message": "Temp: \n" }, "OffString": { "message": "Aus" @@ -241,7 +241,7 @@ }, "BLEEnabled": { "displayText": "BLE\n Enabled", - "description": "" + "description": "Aktiviert BLE" } } -} \ No newline at end of file +} diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json index e53e7e44..d619a539 100644 --- a/Translations/translation_EL.json +++ b/Translations/translation_EL.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Σίγουρα θέλετε επαναφορά αρχικών ρυθμίσεων;" @@ -43,19 +43,19 @@ "message": "Χαμηλ DC" }, "UndervoltageString": { - "message": "Υπόταση" + "message": "Υπόταση\n" }, "InputVoltageString": { - "message": "Είσοδος V: " + "message": "Είσοδος V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Υπνος..." + "message": "Υπνος...\n" }, "SleepingTipAdvancedString": { - "message": "Μύτη:" + "message": "Μύτη: \n" }, "OffString": { "message": "Απ." @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 0917d3c9..b44777e7 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Are you sure you want to restore default settings?" @@ -43,19 +43,19 @@ "message": "DC LOW" }, "UndervoltageString": { - "message": "Undervoltage" + "message": "Undervoltage\n" }, "InputVoltageString": { - "message": "Input V: " + "message": "Input V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Sleeping..." + "message": "Sleeping...\n" }, "SleepingTipAdvancedString": { - "message": "Tip:" + "message": "Tip: \n" }, "OffString": { "message": "Off" @@ -241,7 +241,7 @@ }, "BLEEnabled": { "displayText": "BLE\n Enabled", - "description": "" + "description": "Enables BLE" } } } diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json index fd859c65..14006b06 100644 --- a/Translations/translation_ES.json +++ b/Translations/translation_ES.json @@ -7,7 +7,7 @@ "message": "Calibration\ndone!" }, "ResetOKMessage": { - "message": "Hecho." + "message": "Hecho" }, "SettingsResetMessage": { "message": "Ajustes\n¡Reiniciados!" @@ -19,7 +19,7 @@ "message": "Sin USB-PD IC\n¡Detectado!" }, "LockingKeysString": { - "message": " BLOQUEADO" + "message": "BLOQUEADO" }, "UnlockingKeysString": { "message": "DESBLOQUEADO" @@ -28,13 +28,13 @@ "message": "¡BLOQUEADO!" }, "WarningThermalRunaway": { - "message": "Thermal\nRunaway" + "message": "Térmico\nFuera de control" }, "SettingsCalibrationWarning": { - "message": "Before rebooting, make sure tip & handle are at room temperature!" + "message": "¡Antes de reiniciar, asegúrese de que la punta y el mango estén a temperatura ambiente!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrando\n" }, "SettingsResetWarning": { "message": "¿Quieres restablecer los ajustes?" @@ -43,25 +43,25 @@ "message": "CC BAJA" }, "UndervoltageString": { - "message": "Voltaje bajo" + "message": "Voltaje bajo\n" }, "InputVoltageString": { - "message": "Voltaje: " + "message": "Voltaje: \n" }, "SleepingSimpleString": { - "message": "Zzzz" + "message": "Reposo" }, "SleepingAdvancedString": { - "message": "En reposo..." + "message": "En reposo...\n" }, "SleepingTipAdvancedString": { - "message": "Punta:" + "message": "Punta: \n" }, "OffString": { - "message": " No" + "message": "No" }, "DeviceFailedValidationWarning": { - "message": "Your device is most likely a counterfeit!" + "message": "¡Lo más probable es que su dispositivo sea una falsificación!" } }, "characters": { @@ -113,15 +113,15 @@ }, "QCMaxVoltage": { "displayText": "Potencia de\nentrada", - "description": "Potencia en vatios del adaptador de corriente utilizado." + "description": "Potencia en vatios del adaptador de corriente utilizado" }, "PDNegTimeout": { - "displayText": "PD\ntimeout", + "displayText": "PD\ntiempo de espera", "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)" }, "BoostTemperature": { "displayText": "Ajustar la\ntemp. extra", - "description": "Temperatura momentánea que se alcanza al apretar el botón del modo extra." + "description": "Temperatura de la punta utilizada en el \"modo de impulso\"" }, "AutoStart": { "displayText": "Calentar\nal enchufar", @@ -129,15 +129,15 @@ }, "TempChangeShortStep": { "displayText": "Cambio temp.\npuls. cortas", - "description": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-." + "description": "Aumento de la temperatura al pulsar brevemente un botón" }, "TempChangeLongStep": { "displayText": "Cambio temp.\npuls. largas", - "description": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-." + "description": "Aumento de la temperatura al pulsar prolongadamente un botón" }, "LockingMode": { "displayText": "Permitir botones\nbloqueo", - "description": "Al soldar, una pulsación larga en ambos botones los bloquea (D=desactivar | B=sólo potenciar | F=bloqueo total)." + "description": "Mientras suelda, mantenga pulsados ambos botones para alternar su bloqueo (D=desactivar | B=sólo modo boost | F=bloqueo total)" }, "MotionSensitivity": { "displayText": "Detección de\nmovimiento", @@ -145,7 +145,7 @@ }, "SleepTemperature": { "displayText": "Temperatura\nen reposo", - "description": "Temperatura de la punta en reposo." + "description": "Temperatura de la punta en \"reposo\"" }, "SleepTimeout": { "displayText": "Entrar\nen reposo", @@ -169,7 +169,7 @@ }, "CooldownBlink": { "displayText": "Parpadear\nal enfriar", - "description": "La temperatura en pantalla parpadea mientras la punta siga caliente." + "description": "Lectura de la temperatura al ralentí mientras la punta está caliente" }, "ScrollingSpeed": { "displayText": "Velocidad\ndel texto", @@ -177,7 +177,7 @@ }, "ReverseButtonTempChange": { "displayText": "Invertir\nbotones +/-", - "description": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés." + "description": "Intercambio inversa de los botones para ajustar la temperatura" }, "AnimSpeed": { "displayText": "Anim.\nvelocidad", @@ -201,14 +201,14 @@ }, "AdvancedIdle": { "displayText": "Info extra en\nmodo reposo", - "description": "Muestra información detallada en letra pequeña al reposar." + "description": "Mostrar información detallada en una fuente más pequeña en la pantalla inactiva" }, "AdvancedSoldering": { "displayText": "Info extra\nal soldar", - "description": "Muestra más datos por pantalla cuando se está soldando." + "description": "Mostrar información detallada en una fuente más pequeña en la pantalla de soldadura" }, "PowerLimit": { - "displayText": "Ajustar la\npotenc. máx.", + "displayText": "Potencia\nlímite", "description": "Elige el límite de potencia máxima del soldador (en vatios)" }, "CalibrateCJC": { @@ -217,11 +217,11 @@ }, "VoltageCalibration": { "displayText": "Calibrar voltaje\nde entrada", - "description": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir." + "description": "Iniciar calibración VIN (pulsación larga para salir)" }, "PowerPulsePower": { "displayText": "Pulsos bat.\nconstantes", - "description": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios." + "description": "Intensidad de la potencia del pulso de mantenimiento del estado de vigilia (W=vatio)" }, "PowerPulseWait": { "displayText": "Impulso de potencia\ntiempo de espera", @@ -233,15 +233,15 @@ }, "SettingsReset": { "displayText": "Volver a ajustes\nde fábrica", - "description": "Restablece todos los ajustes a los valores originales." + "description": "Restablecer todos los ajustes por defecto" }, "LanguageSwitch": { "displayText": "Idioma:\n ES Castellano", "description": "" }, "BLEEnabled": { - "displayText": "BLE\n Enabled", - "description": "" + "displayText": "BLE\n Activado", + "description": "Habilita BLE" } } } diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json index 0e497f98..ff220ea3 100644 --- a/Translations/translation_FI.json +++ b/Translations/translation_FI.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Haluatko varmasti palauttaa oletusarvot?" @@ -43,19 +43,19 @@ "message": "DC ALH." }, "UndervoltageString": { - "message": "Alijännite" + "message": "Alijännite\n" }, "InputVoltageString": { - "message": "Jännite: " + "message": "Jännite: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Lepotila..." + "message": "Lepotila...\n" }, "SleepingTipAdvancedString": { - "message": "Kärki:" + "message": "Kärki: \n" }, "OffString": { "message": "Off" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json index ab0ea2a7..374be0c7 100644 --- a/Translations/translation_FR.json +++ b/Translations/translation_FR.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?" @@ -43,19 +43,19 @@ "message": "DC FAIBL" }, "UndervoltageString": { - "message": "Sous-tension" + "message": "Sous-tension\n" }, "InputVoltageString": { - "message": "V d'entrée: " + "message": "V d'entrée: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "En veille..." + "message": "En veille...\n" }, "SleepingTipAdvancedString": { - "message": "Panne:" + "message": "Panne: \n" }, "OffString": { "message": "Off" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json index 81d7fdbd..ae5d627e 100644 --- a/Translations/translation_HR.json +++ b/Translations/translation_HR.json @@ -34,7 +34,7 @@ "message": "Prije restarta provjerite da su vrh i ručka na sobnoj temperaturi!" }, "CJCCalibrating": { - "message": "kalibriram" + "message": "kalibriram\n" }, "SettingsResetWarning": { "message": "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?" @@ -43,19 +43,19 @@ "message": "BAT!!!" }, "UndervoltageString": { - "message": "PRENIZAK NAPON" + "message": "PRENIZAK NAPON\n" }, "InputVoltageString": { - "message": "Napon V: " + "message": "Napon V: \n" }, "SleepingSimpleString": { "message": "Zzz " }, "SleepingAdvancedString": { - "message": "SPAVAM..." + "message": "SPAVAM...\n" }, "SleepingTipAdvancedString": { - "message": "Vrh: " + "message": "Vrh: \n" }, "OffString": { "message": "Off" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json index 57741606..cb776a54 100644 --- a/Translations/translation_HU.json +++ b/Translations/translation_HU.json @@ -34,7 +34,7 @@ "message": "Újraindítás előtt a hegy és az eszköz legyen szobahőmérsékletű!" }, "CJCCalibrating": { - "message": "Kalibrálás" + "message": "Kalibrálás\n" }, "SettingsResetWarning": { "message": "Biztos visszaállítja a beállításokat alapértékekre?" @@ -43,19 +43,19 @@ "message": "DC túl alacsony" }, "UndervoltageString": { - "message": "Alulfeszültség" + "message": "Alulfeszültség\n" }, "InputVoltageString": { - "message": "Bemenet V: " + "message": "Bemenet V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Alvás..." + "message": "Alvás...\n" }, "SleepingTipAdvancedString": { - "message": "Hegy:" + "message": "Hegy: \n" }, "OffString": { "message": "Ki" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index da02a9e4..2373cfaf 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -34,7 +34,7 @@ "message": "Prima di riavviare assicurati che la punta e l'impugnatura siano a temperatura ambiente!" }, "CJCCalibrating": { - "message": "Calibrazione in corso" + "message": "Calibrazione in corso\n" }, "SettingsResetWarning": { "message": "Ripristinare le impostazioni predefinite?" @@ -43,19 +43,19 @@ "message": "DC BASSA" }, "UndervoltageString": { - "message": "DC INSUFFICIENTE" + "message": "DC INSUFFICIENTE\n" }, "InputVoltageString": { - "message": "V in:" + "message": "V in: \n" }, "SleepingSimpleString": { "message": "Zzz " }, "SleepingAdvancedString": { - "message": "Riposo" + "message": "Riposo\n" }, "SleepingTipAdvancedString": { - "message": "Punta:" + "message": "Punta: \n" }, "OffString": { "message": "OFF" diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json index ae918ce9..44ef9d88 100755 --- a/Translations/translation_JA_JP.json +++ b/Translations/translation_JA_JP.json @@ -55,7 +55,7 @@ "message": "Sleeping..." }, "SleepingTipAdvancedString": { - "message": "Tip:" + "message": "Tip: " }, "OffString": { "message": "オフ" @@ -240,8 +240,8 @@ "description": "" }, "BLEEnabled": { - "displayText": "BLE\n Enabled", - "description": "" + "displayText": "BLE Enabled", + "description": "Enables BLE" } } -} \ No newline at end of file +} diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json index 939ce266..24d5a65c 100644 --- a/Translations/translation_LT.json +++ b/Translations/translation_LT.json @@ -10,7 +10,7 @@ "message": "Atstatyta" }, "SettingsResetMessage": { - "message": "Nust. atstatyti!\n" + "message": "Nust. \natstatyti!" }, "NoAccelerometerMessage": { "message": "Nerastas\nakselerometras!" @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Ar norite atstatyti nustatymus į numatytas reikšmes?" @@ -43,19 +43,19 @@ "message": "MAŽ VOLT" }, "UndervoltageString": { - "message": "Žema įtampa" + "message": "Žema įtampa\n" }, "InputVoltageString": { - "message": "Įvestis V: " + "message": "Įvestis V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Miegu..." + "message": "Miegu...\n" }, "SleepingTipAdvancedString": { - "message": "Antg:" + "message": "Antg: \n" }, "OffString": { "message": "Išj" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json index ed000e45..ad71b23a 100644 --- a/Translations/translation_NB.json +++ b/Translations/translation_NB.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Er du sikker på at du vil tilbakestille til standardinnstillinger?" @@ -43,19 +43,19 @@ "message": "Lavspenn" }, "UndervoltageString": { - "message": "Underspenning" + "message": "Underspenning\n" }, "InputVoltageString": { - "message": "Innspenn.: " + "message": "Innspenn.: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Dvale..." + "message": "Dvale...\n" }, "SleepingTipAdvancedString": { - "message": "Spiss:" + "message": "Spiss: \n" }, "OffString": { "message": "Av" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json index e6c8ae33..75055077 100644 --- a/Translations/translation_NL.json +++ b/Translations/translation_NL.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Weet je zeker dat je de fabrieksinstellingen terug wilt zetten?" @@ -43,19 +43,19 @@ "message": "DC Laag" }, "UndervoltageString": { - "message": "Onderspanning" + "message": "Onderspanning\n" }, "InputVoltageString": { - "message": "Voeding V: " + "message": "Voeding V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Slaapstand..." + "message": "Slaapstand...\n" }, "SleepingTipAdvancedString": { - "message": "Punt:" + "message": "Punt: \n" }, "OffString": { "message": "Uit" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json index a61b223a..f463f0d7 100644 --- a/Translations/translation_NL_BE.json +++ b/Translations/translation_NL_BE.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Ben je zeker dat je alle standaardwaarden wil resetten?" @@ -43,19 +43,19 @@ "message": "Voedingsspanning LAAG" }, "UndervoltageString": { - "message": "Onderspanning" + "message": "Onderspanning\n" }, "InputVoltageString": { - "message": "Voedingsspanning: " + "message": "Voedingsspanning: \n" }, "SleepingSimpleString": { "message": "Zzz " }, "SleepingAdvancedString": { - "message": "Slaapstand..." + "message": "Slaapstand...\n" }, "SleepingTipAdvancedString": { - "message": "Punt:" + "message": "Punt: \n" }, "OffString": { "message": "Uit" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 215da5c3..813f4cea 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -10,7 +10,7 @@ "message": "Reset OK" }, "SettingsResetMessage": { - "message": "Ust. zresetowane\n" + "message": "Ust. \nzresetowane" }, "NoAccelerometerMessage": { "message": "Nie rozpoznano\nakcelerometru!" @@ -34,7 +34,7 @@ "message": "Upewnij się, że końcówka i uchwyt mają temperaturę pokojową podczas następnego rozruchu!" }, "CJCCalibrating": { - "message": "kalibracja" + "message": "kalibracja\n" }, "SettingsResetWarning": { "message": "Czy na pewno chcesz przywrócić ustawienia fabryczne?" @@ -43,19 +43,19 @@ "message": "NIS. NAP" }, "UndervoltageString": { - "message": "Zbyt niskie nap." + "message": "Zbyt niskie nap.\n" }, "InputVoltageString": { - "message": "Nap. wej.:" + "message": "Nap. wej.: \n" }, "SleepingSimpleString": { "message": "Zzz!" }, "SleepingAdvancedString": { - "message": "Tr. uśpienia" + "message": "Tr. uśpienia\n" }, "SleepingTipAdvancedString": { - "message": "Grot:" + "message": "Grot: \n" }, "OffString": { "message": "Wył" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json index 3527add4..32918db0 100644 --- a/Translations/translation_PT.json +++ b/Translations/translation_PT.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Definições de fábrica?" @@ -43,19 +43,19 @@ "message": "DC BAIXO" }, "UndervoltageString": { - "message": "Subtensão" + "message": "Subtensão\n" }, "InputVoltageString": { - "message": "Tensão " + "message": "Tensão: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Repouso..." + "message": "Repouso...\n" }, "SleepingTipAdvancedString": { - "message": "Ponta:" + "message": "Ponta: \n" }, "OffString": { "message": "Off" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index b2c7f60b..9892bf8b 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Sigur doriti să restaurati la setările implicite?" @@ -43,19 +43,19 @@ "message": "DC LOW" }, "UndervoltageString": { - "message": "Sub tensiune" + "message": "Sub tensiune\n" }, "InputVoltageString": { - "message": "Intrare V: " + "message": "Intrare V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Adormit..." + "message": "Adormit...\n" }, "SleepingTipAdvancedString": { - "message": "Tip:" + "message": "Tip: \n" }, "OffString": { "message": "Nu" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 3b5bc586..dbda0e13 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -34,7 +34,7 @@ "message": "Пожалуйста, убедитесь, что жало и корпус имеют комнатную температуру при следующей загрузке!" }, "CJCCalibrating": { - "message": "калибровка" + "message": "калибровка\n" }, "SettingsResetWarning": { "message": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?" @@ -43,19 +43,19 @@ "message": "НАПРЯЖ--" }, "UndervoltageString": { - "message": "Низ. напряжение" + "message": "Низ. напряжение\n" }, "InputVoltageString": { - "message": "Питание В: " + "message": "Питание В: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Ожидание..." + "message": "Ожидание...\n" }, "SleepingTipAdvancedString": { - "message": "Жало:" + "message": "Жало: \n" }, "OffString": { "message": "Вык" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json index 45ae0e82..9a7f284d 100644 --- a/Translations/translation_SK.json +++ b/Translations/translation_SK.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Naozaj chcete obnoviť továrenské nastavenia?" @@ -43,19 +43,19 @@ "message": "Nízke U!" }, "UndervoltageString": { - "message": "Nízke napätie" + "message": "Nízke napätie\n" }, "InputVoltageString": { - "message": "Vstupné U: " + "message": "Vstupné U: \n" }, "SleepingSimpleString": { "message": "Chrr" }, "SleepingAdvancedString": { - "message": "Pokojový režim." + "message": "Pokojový režim.\n" }, "SleepingTipAdvancedString": { - "message": "Hrot:" + "message": "Hrot: \n" }, "OffString": { "message": "Vyp" @@ -228,7 +228,7 @@ "description": "Interval medzi impulzami udržujúcimi napájací zdroj zapnutý (x 2.5s)" }, "PowerPulseDuration": { - "displayText": "Dĺžka impulzu\n", + "displayText": "Dĺžka\nimpulzu", "description": "Dĺžka impulzu udržujúci napájací zdroj zapnutý (x 250ms)" }, "SettingsReset": { @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json index 143274e4..009d31a8 100644 --- a/Translations/translation_SL.json +++ b/Translations/translation_SL.json @@ -10,13 +10,13 @@ "message": "Reset OK" }, "SettingsResetMessage": { - "message": "Nastavitve OK!\n" + "message": "Nastavitve \nOK!" }, "NoAccelerometerMessage": { - "message": "Ni pospeševalnik\n" + "message": "Ni \npospeševalnik" }, "NoPowerDeliveryMessage": { - "message": "Ni USB-PD čipa!\n" + "message": "Ni USB-PD \nčipa!" }, "LockingKeysString": { "message": "ZAKLENJ." @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Res želite ponastaviti na privzete nastavitve?" @@ -43,19 +43,19 @@ "message": "NIZKA U" }, "UndervoltageString": { - "message": "Nizka napetost" + "message": "Nizka napetost\n" }, "InputVoltageString": { - "message": "Vhodna U: " + "message": "Vhodna U: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Spim..." + "message": "Spim...\n" }, "SleepingTipAdvancedString": { - "message": "Konica" + "message": "Konica \n" }, "OffString": { "message": "Off" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json index 8e1c44b1..bf5be596 100644 --- a/Translations/translation_SR_CYRL.json +++ b/Translations/translation_SR_CYRL.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Да ли заиста желите да вратите поставке на фабричке вредности?" @@ -43,19 +43,19 @@ "message": "НИЗ.НАП." }, "UndervoltageString": { - "message": "ПРЕНИЗАК НАПОН" + "message": "ПРЕНИЗАК НАПОН\n" }, "InputVoltageString": { - "message": "Ул. напон: " + "message": "Ул. напон: \n" }, "SleepingSimpleString": { "message": "Сан" }, "SleepingAdvancedString": { - "message": "Спавање..." + "message": "Спавање...\n" }, "SleepingTipAdvancedString": { - "message": "Врх:" + "message": "Врх: \n" }, "OffString": { "message": "Иск" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json index 4b6fb7a9..7b921652 100644 --- a/Translations/translation_SR_LATN.json +++ b/Translations/translation_SR_LATN.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Da li zaista želite da vratite postavke na fabričke vrednosti?" @@ -43,19 +43,19 @@ "message": "NIZ.NAP." }, "UndervoltageString": { - "message": "PRENIZAK NAPON" + "message": "PRENIZAK NAPON\n" }, "InputVoltageString": { - "message": "Ul. napon: " + "message": "Ul. napon: \n" }, "SleepingSimpleString": { "message": "Zzz" }, "SleepingAdvancedString": { - "message": "Spavanje..." + "message": "Spavanje...\n" }, "SleepingTipAdvancedString": { - "message": "Vrh:" + "message": "Vrh: \n" }, "OffString": { "message": "Isk" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json index 98451dca..5b8a8d3e 100644 --- a/Translations/translation_SV.json +++ b/Translations/translation_SV.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Är du säker på att du vill återställa inställningarna?" @@ -43,19 +43,19 @@ "message": "DC LÅG" }, "UndervoltageString": { - "message": "Underspänning" + "message": "Underspänning\n" }, "InputVoltageString": { - "message": "Inspän. V: " + "message": "Inspän. V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Viloläge..." + "message": "Viloläge...\n" }, "SleepingTipAdvancedString": { - "message": "Spets:" + "message": "Spets: \n" }, "OffString": { "message": "Av" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json index 2dc5e345..25f14dce 100644 --- a/Translations/translation_TR.json +++ b/Translations/translation_TR.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?" @@ -43,19 +43,19 @@ "message": "Güç Az" }, "UndervoltageString": { - "message": "Düşük Voltaj" + "message": "Düşük Voltaj\n" }, "InputVoltageString": { - "message": "Giriş V: " + "message": "Giriş V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Bekleme Modu ..." + "message": "Bekleme Modu...\n" }, "SleepingTipAdvancedString": { - "message": "Uç:" + "message": "Uç: \n" }, "OffString": { "message": "Kapalı" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 6a667262..e13b2b88 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -34,7 +34,7 @@ "message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!" }, "CJCCalibrating": { - "message": "калібрування" + "message": "калібрування\n" }, "SettingsResetWarning": { "message": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? (A=Так, В=Ні)" @@ -43,19 +43,19 @@ "message": "АККУМ--" }, "UndervoltageString": { - "message": "Низька напруга" + "message": "Низька напруга\n" }, "InputVoltageString": { - "message": "Жив.(B): " + "message": "Жив.(B): \n" }, "SleepingSimpleString": { "message": "ZzZzz" }, "SleepingAdvancedString": { - "message": "Очікування..." + "message": "Очікування...\n" }, "SleepingTipAdvancedString": { - "message": "Жало:" + "message": "Жало: \n" }, "OffString": { "message": "Вимк" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json index b8c1a3a3..960f2ba9 100644 --- a/Translations/translation_VI.json +++ b/Translations/translation_VI.json @@ -34,7 +34,7 @@ "message": "Before rebooting, make sure tip & handle are at room temperature!" }, "CJCCalibrating": { - "message": "calibrating" + "message": "calibrating\n" }, "SettingsResetWarning": { "message": "Ban chac chan muon khôi phuc tat ca cài đat ve mac đinh?" @@ -43,19 +43,19 @@ "message": "DC thap" }, "UndervoltageString": { - "message": "Đien áp thap" + "message": "Đien áp thap\n" }, "InputVoltageString": { - "message": "Đau vào V: " + "message": "Đau vào V: \n" }, "SleepingSimpleString": { "message": "Zzzz" }, "SleepingAdvancedString": { - "message": "Đang ngu..." + "message": "Đang ngu...\n" }, "SleepingTipAdvancedString": { - "message": "Meo:" + "message": "Meo: \n" }, "OffString": { "message": "Tat" @@ -244,4 +244,4 @@ "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json index 0ac2650f..3dacb87f 100644 --- a/Translations/translation_YUE_HK.json +++ b/Translations/translation_YUE_HK.json @@ -55,7 +55,7 @@ "message": "Sleeping..." }, "SleepingTipAdvancedString": { - "message": "Tip:" + "message": "Tip: " }, "OffString": { "message": "關" @@ -240,8 +240,8 @@ "description": "" }, "BLEEnabled": { - "displayText": "BLE\n Enabled", + "displayText": "BLE Enabled", "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json index 49f1693e..25d29b27 100644 --- a/Translations/translation_ZH_CN.json +++ b/Translations/translation_ZH_CN.json @@ -55,7 +55,7 @@ "message": "Zzzz..." }, "SleepingTipAdvancedString": { - "message": "--->" + "message": "<--- " }, "OffString": { "message": "关" @@ -240,8 +240,8 @@ "description": "" }, "BLEEnabled": { - "displayText": "BLE\n Enabled", + "displayText": "BLE Enabled", "description": "" } } -} \ No newline at end of file +} diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json index 50cc70cc..4e009263 100644 --- a/Translations/translation_ZH_TW.json +++ b/Translations/translation_ZH_TW.json @@ -55,7 +55,7 @@ "message": "Sleeping..." }, "SleepingTipAdvancedString": { - "message": "Tip:" + "message": "Tip: " }, "OffString": { "message": "關" @@ -240,8 +240,8 @@ "description": "" }, "BLEEnabled": { - "displayText": "BLE\n Enabled", + "displayText": "BLE Enabled", "description": "" } } -} \ No newline at end of file +} diff --git a/source/Core/Threads/OperatingModes/Soldering.cpp b/source/Core/Threads/OperatingModes/Soldering.cpp index 0d997ee6..269200c3 100644 --- a/source/Core/Threads/OperatingModes/Soldering.cpp +++ b/source/Core/Threads/OperatingModes/Soldering.cpp @@ -133,13 +133,12 @@ void gui_solderingMode(uint8_t jumpToSleep) { if (x10Watt > 999) { // If we exceed 99.9W we drop the decimal place to keep it all fitting OLED::print(SmallSymbolSpace, FontStyle::SMALL); OLED::printNumber(x10WattHistory.average() / 10, 3, FontStyle::SMALL); - OLED::print(SmallSymbolWatts, FontStyle::SMALL); } else { OLED::printNumber(x10WattHistory.average() / 10, 2, FontStyle::SMALL); OLED::print(SmallSymbolDot, FontStyle::SMALL); OLED::printNumber(x10WattHistory.average() % 10, 1, FontStyle::SMALL); - OLED::print(SmallSymbolWatts, FontStyle::SMALL); } + OLED::print(SmallSymbolWatts, FontStyle::SMALL); } if (OLED::getRotation()) {