From 33901b688a2a36fee4109c441e427ed89941ff54 Mon Sep 17 00:00:00 2001 From: Alvin Wong Date: Sun, 4 Apr 2021 16:10:47 +0800 Subject: [PATCH] Change warnUser to use printWholeScreen --- Translations/translation_BG.json | 20 +++++++++----- Translations/translation_CS.json | 20 +++++++++----- Translations/translation_DA.json | 20 +++++++++----- Translations/translation_DE.json | 20 +++++++++----- Translations/translation_EN.json | 20 +++++++++----- Translations/translation_ES.json | 20 +++++++++----- Translations/translation_FI.json | 20 +++++++++----- Translations/translation_FR.json | 20 +++++++++----- Translations/translation_HR.json | 22 +++++++++------ Translations/translation_HU.json | 20 +++++++++----- Translations/translation_IT.json | 20 +++++++++----- Translations/translation_LT.json | 20 +++++++++----- Translations/translation_NL.json | 27 ++++++++++++++---- Translations/translation_NL_BE.json | 20 +++++++++----- Translations/translation_NO.json | 22 +++++++++------ Translations/translation_PL.json | 20 +++++++++----- Translations/translation_PT.json | 20 +++++++++----- Translations/translation_RU.json | 20 +++++++++----- Translations/translation_SK.json | 20 +++++++++----- Translations/translation_SL.json | 20 +++++++++----- Translations/translation_SR_CYRL.json | 20 +++++++++----- Translations/translation_SR_LATN.json | 20 +++++++++----- Translations/translation_SV.json | 20 +++++++++----- Translations/translation_TR.json | 17 +++++++++--- Translations/translation_UK.json | 20 +++++++++----- Translations/translation_YUE_HK.json | 18 ++++++++---- Translations/translation_ZH_TW.json | 18 ++++++++---- Translations/translations_def.js | 40 ++++++++++----------------- source/Core/Inc/Translation.h | 4 +-- source/Core/Threads/GUIThread.cpp | 23 ++++++--------- 30 files changed, 385 insertions(+), 226 deletions(-) diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index 39e77a7d..f622c05e 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Захранване: ", "OffString": "Изкл.", "ResetOKMessage": "Нулиране завършено", - "YourGainMessage": "Усилване:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Усилване:" }, "messagesWarn": { "SettingsResetMessage": [ "Настройките бяха", "нулирани!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json index bade6a37..43aa36f6 100644 --- a/Translations/translation_CS.json +++ b/Translations/translation_CS.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Ohřev: ", "OffString": "Vyp", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Zisk:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Zisk:" }, "messagesWarn": { "SettingsResetMessage": [ "Tov. nas. obnov.", "" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "P", diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index 266c5e69..aac0b919 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "Off", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "H", diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json index c1f78508..eeca28ea 100644 --- a/Translations/translation_DE.json +++ b/Translations/translation_DE.json @@ -22,19 +22,25 @@ "TipDisconnectedString": "Spitze fehlt", "SolderingAdvancedPowerPrompt": "Leistung: ", "OffString": "Aus", - "NoAccelerometerMessage": "Kein Bewegungssensor\nerkannt!", - "NoPowerDeliveryMessage": "Kein USB-PD IC\nerkannt!", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Dein Faktor:", - "LockingKeysString": "GESPERRT", - "UnlockingKeysString": "ENTSPERRT", - "WarningKeysLockedString": "!GESPERRT!" + "YourGainMessage": "Dein Faktor:" }, "messagesWarn": { "SettingsResetMessage": [ "Einstellungen", "zurückgesetzt!" - ] + ], + "NoAccelerometerMessage": [ + "Kein Bewegungssensor", + "erkannt!" + ], + "NoPowerDeliveryMessage": [ + "Kein USB-PD IC", + "erkannt!" + ], + "LockingKeysString": "GESPERRT", + "UnlockingKeysString": "ENTSPERRT", + "WarningKeysLockedString": "!GESPERRT!" }, "characters": { "SettingRightChar": "R", diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 0ab345c0..096a5c6e 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -23,18 +23,24 @@ "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "Off", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": "LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": "LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json index 39acef47..22b441c0 100644 --- a/Translations/translation_ES.json +++ b/Translations/translation_ES.json @@ -23,18 +23,24 @@ "OffString": " No", "ResetOKMessage": "Hecho. ", "YourGainMessage": "Gananc.:", - "SettingsResetMessage": "Ajustes borrados", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "SettingsResetMessage": "Ajustes borrados" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json index 2fa1322c..d6eafde1 100644 --- a/Translations/translation_FI.json +++ b/Translations/translation_FI.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Teho: ", "OffString": "OFF", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "O", diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json index 7e833919..337ffe9b 100644 --- a/Translations/translation_FR.json +++ b/Translations/translation_FR.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Puissance : ", "OffString": "Off", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Gain : ", - "NoAccelerometerMessage": "Accéléromètre\nnon détecté !", - "NoPowerDeliveryMessage": "Pas d'USB-PD\ndétecté !", - "LockingKeysString": "VERROUIL", - "UnlockingKeysString": "DEVERROU", - "WarningKeysLockedString": "! VERR. !" + "YourGainMessage": "Gain : " }, "messagesWarn": { "SettingsResetMessage": [ "Réglage", "réinit. !" - ] + ], + "NoAccelerometerMessage": [ + "Accéléromètre", + "non détecté !" + ], + "NoPowerDeliveryMessage": [ + "Pas d'USB-PD", + "détecté !" + ], + "LockingKeysString": "VERROUIL", + "UnlockingKeysString": "DEVERROU", + "WarningKeysLockedString": "! VERR. !" }, "characters": { "SettingRightChar": "D", diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json index 586a4fe9..286776ba 100644 --- a/Translations/translation_HR.json +++ b/Translations/translation_HR.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Snaga: ", "OffString": "Off", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -42,7 +48,7 @@ "SettingFastChar": "B", "SettingSlowChar": "S", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json index 4b50b5fe..2366c047 100644 --- a/Translations/translation_HU.json +++ b/Translations/translation_HU.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Telj: ", "OffString": "Ki", "ResetOKMessage": "Törlés OK", - "YourGainMessage": "Erősítés:", - "NoAccelerometerMessage": "Nincs gyorsulásmérő!", - "NoPowerDeliveryMessage": "Nincs USB-PD IC!", - "LockingKeysString": "LEZÁRVA", - "UnlockingKeysString": "FELOLDVA", - "WarningKeysLockedString": "!LEZÁRVA!" + "YourGainMessage": "Erősítés:" }, "messagesWarn": { "SettingsResetMessage": [ "Beállítások", "törölve!" - ] + ], + "NoAccelerometerMessage": [ + "Nincs", + "gyorsulásmérő!" + ], + "NoPowerDeliveryMessage": [ + "Nincs USB-PD IC!", + "" + ], + "LockingKeysString": "LEZÁRVA", + "UnlockingKeysString": "FELOLDVA", + "WarningKeysLockedString": "!LEZÁRVA!" }, "characters": { "SettingRightChar": "J", diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index fb561b48..6f16d4e5 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Potenz:", "OffString": "OFF", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Guad.: ", - "NoAccelerometerMessage": "Accelerometro\nnon rilevato", - "NoPowerDeliveryMessage": "USB-PD non\ndisponibile", - "LockingKeysString": "Blocc.", - "UnlockingKeysString": "Sblocc.", - "WarningKeysLockedString": "BLOCCATO" + "YourGainMessage": "Guad.: " }, "messagesWarn": { "SettingsResetMessage": [ "Reset effettuato", "" - ] + ], + "NoAccelerometerMessage": [ + "Accelerometro", + "non rilevato" + ], + "NoPowerDeliveryMessage": [ + "USB-PD non", + "disponibile" + ], + "LockingKeysString": "Blocc.", + "UnlockingKeysString": "Sblocc.", + "WarningKeysLockedString": "BLOCCATO" }, "characters": { "SettingRightChar": "D", diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json index 5e73d8c9..4a4da44b 100644 --- a/Translations/translation_LT.json +++ b/Translations/translation_LT.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Galia: ", "OffString": "Išj", "ResetOKMessage": "Atstatytas OK", - "YourGainMessage": "Greitis:", - "NoAccelerometerMessage": "Nerastas\nakselerometras!", - "NoPowerDeliveryMessage": "Nerastas\nUSB-PD IC !", - "LockingKeysString": " UŽRAKIN", - "UnlockingKeysString": "ATRAKIN", - "WarningKeysLockedString": "!UŽRAK!" + "YourGainMessage": "Greitis:" }, "messagesWarn": { "SettingsResetMessage": [ "Nust. atstatyti!", "" - ] + ], + "NoAccelerometerMessage": [ + "Nerastas", + "akselerometras!" + ], + "NoPowerDeliveryMessage": [ + "Nerastas", + "USB-PD IC !" + ], + "LockingKeysString": " UŽRAKIN", + "UnlockingKeysString": "ATRAKIN", + "WarningKeysLockedString": "!UŽRAK!" }, "characters": { "SettingRightChar": "D", diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json index b7aaccb0..d7d0018b 100644 --- a/Translations/translation_NL.json +++ b/Translations/translation_NL.json @@ -22,17 +22,32 @@ "SolderingAdvancedPowerPrompt": "Vermogen: ", "OffString": "Uit", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Niveau:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " GEBLOKKEERD", - "UnlockingKeysString": "GEDEBLOKKEERD", - "WarningKeysLockedString": "!GEBLOKKEERD!" + "YourGainMessage": "Niveau:" }, "messagesWarn": { "SettingsResetMessage": [ "Instellingen", "zijn gereset!" + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": [ + " GEBLOKKEERD", + "" + ], + "UnlockingKeysString": [ + "GEDEBLOKKEERD", + "" + ], + "WarningKeysLockedString": [ + "!GEBLOKKEERD!", + "" ] }, "characters": { diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json index 86bfeea8..14ab1080 100644 --- a/Translations/translation_NL_BE.json +++ b/Translations/translation_NL_BE.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Vermogen: ", "OffString": "Uit", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", diff --git a/Translations/translation_NO.json b/Translations/translation_NO.json index e89c1f95..f16812cd 100644 --- a/Translations/translation_NO.json +++ b/Translations/translation_NO.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Effekt: ", "OffString": "Av", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "H", @@ -42,7 +48,7 @@ "SettingFastChar": "H", "SettingSlowChar": "L", "SettingMediumChar": "M", - "SettingOffChar":"O", + "SettingOffChar": "O", "SettingStartSolderingChar": "L", "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "O", diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 34af3833..aff5590b 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -23,18 +23,24 @@ "SolderingAdvancedPowerPrompt": "Moc: ", "OffString": "Wył", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Us.zysk:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " ZABLOK.", - "UnlockingKeysString": "ODBLOK.", - "WarningKeysLockedString": "!ZABLOK!" + "YourGainMessage": "Us.zysk:" }, "messagesWarn": { "SettingsResetMessage": [ "Ust. zresetowane", "" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " ZABLOK.", + "UnlockingKeysString": "ODBLOK.", + "WarningKeysLockedString": "!ZABLOK!" }, "characters": { "SettingRightChar": "P", diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json index a9294c60..4c475913 100644 --- a/Translations/translation_PT.json +++ b/Translations/translation_PT.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "Off", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index e2e8f1e6..bfb01c22 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Питание: ", "OffString": "Выкл.", "ResetOKMessage": "Сброс OK", - "YourGainMessage": "Прирост:", - "NoAccelerometerMessage": "Не определен\nакселерометр!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Прирост:" }, "messagesWarn": { "SettingsResetMessage": [ "Настройки", "сброшены!" - ] + ], + "NoAccelerometerMessage": [ + "Не определен", + "акселерометр!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "П", diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json index 58b13827..17c55126 100644 --- a/Translations/translation_SK.json +++ b/Translations/translation_SK.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Výkon: ", "OffString": "Vyp", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Zisk:", - "NoAccelerometerMessage": "Bez pohyb. senz.", - "NoPowerDeliveryMessage": "Chýba čip USB-PD", - "LockingKeysString": " ZABLOK.", - "UnlockingKeysString": "ODBLOK.", - "WarningKeysLockedString": "!ZABLOK!" + "YourGainMessage": "Zisk:" }, "messagesWarn": { "SettingsResetMessage": [ "Tov. nas. obnov.", "" - ] + ], + "NoAccelerometerMessage": [ + "Bez pohyb. senz.", + "" + ], + "NoPowerDeliveryMessage": [ + "Chýba čip USB-PD", + "" + ], + "LockingKeysString": " ZABLOK.", + "UnlockingKeysString": "ODBLOK.", + "WarningKeysLockedString": "!ZABLOK!" }, "characters": { "SettingRightChar": "P", diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json index 7d978208..9f7b11e1 100644 --- a/Translations/translation_SL.json +++ b/Translations/translation_SL.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Moč: ", "OffString": "Off", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Ojačenje", - "NoAccelerometerMessage": "Ni pospeševalnik", - "NoPowerDeliveryMessage": "Ni USB-PD čipa!", - "LockingKeysString": "ZAKLENJ.", - "UnlockingKeysString": "ODKLENJ.", - "WarningKeysLockedString": "ZAKLENJ." + "YourGainMessage": "Ojačenje" }, "messagesWarn": { "SettingsResetMessage": [ "Nastavitve OK!", "" - ] + ], + "NoAccelerometerMessage": [ + "Ni pospeševalnik", + "" + ], + "NoPowerDeliveryMessage": [ + "Ni USB-PD čipa!", + "" + ], + "LockingKeysString": "ZAKLENJ.", + "UnlockingKeysString": "ODKLENJ.", + "WarningKeysLockedString": "ZAKLENJ." }, "characters": { "SettingRightChar": "D", diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json index 8c2cda41..4dbf42c3 100644 --- a/Translations/translation_SR_CYRL.json +++ b/Translations/translation_SR_CYRL.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Снага: ", "OffString": "Иск", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "Д", diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json index 504a2f27..5eeb9fd0 100644 --- a/Translations/translation_SR_LATN.json +++ b/Translations/translation_SR_LATN.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Snaga: ", "OffString": "Isk", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json index 02d2dc78..7c63b4c6 100644 --- a/Translations/translation_SV.json +++ b/Translations/translation_SV.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Ström: ", "OffString": "Av", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", - "LockingKeysString": " LOCKED", - "UnlockingKeysString": "UNLOCKED", - "WarningKeysLockedString": "!LOCKED!" + "YourGainMessage": "Your gain:" }, "messagesWarn": { "SettingsResetMessage": [ "Settings were", "reset!" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "H", diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json index 49b7fea1..4768d0f8 100644 --- a/Translations/translation_TR.json +++ b/Translations/translation_TR.json @@ -22,15 +22,24 @@ "SolderingAdvancedPowerPrompt": "Güç: ", "OffString": "Kapalı", "ResetOKMessage": "Sıfırlama Tamam", - "YourGainMessage": "Kazancınız:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!" + "YourGainMessage": "Kazancınız:" }, "messagesWarn": { "SettingsResetMessage": [ "Ayarlar", "Sıfırlandı" - ] + ], + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], + "LockingKeysString": "LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 259985e0..542da8f2 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -22,18 +22,24 @@ "SolderingAdvancedPowerPrompt": "Живлення: ", "OffString": "Вимк", "ResetOKMessage": "Скид. OK", - "YourGainMessage": "Приріст:", - "NoAccelerometerMessage": "Акселерометр\nне виявлено!", - "NoPowerDeliveryMessage": "USB-PD IC\nне виявлено!", - "LockingKeysString": " ЗАБЛОК.", - "UnlockingKeysString": "РОЗБЛОК.", - "WarningKeysLockedString": "!ЗАБЛОК!" + "YourGainMessage": "Приріст:" }, "messagesWarn": { "SettingsResetMessage": [ "Налаштування", "скинуті!" - ] + ], + "NoAccelerometerMessage": [ + "Акселерометр", + "не виявлено!" + ], + "NoPowerDeliveryMessage": [ + "USB-PD IC", + "не виявлено!" + ], + "LockingKeysString": " ЗАБЛОК.", + "UnlockingKeysString": "РОЗБЛОК.", + "WarningKeysLockedString": "!ЗАБЛОК!" }, "characters": { "SettingRightChar": "П", diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json index 737a8b61..d2562ec0 100644 --- a/Translations/translation_YUE_HK.json +++ b/Translations/translation_YUE_HK.json @@ -23,16 +23,22 @@ "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "關", "ResetOKMessage": "已重設！", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", + "YourGainMessage": "Your gain:" + }, + "messagesWarn": { + "SettingsResetMessage": "設定已被重設！", + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], "LockingKeysString": "已鎖定", "UnlockingKeysString": "已解除鎖定", "WarningKeysLockedString": "!撳掣鎖定!" }, - "messagesWarn": { - "SettingsResetMessage": "設定已被重設！" - }, "characters": { "SettingRightChar": "右", "SettingLeftChar": "左", diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json index b957882e..79c15a24 100644 --- a/Translations/translation_ZH_TW.json +++ b/Translations/translation_ZH_TW.json @@ -23,16 +23,22 @@ "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "關", "ResetOKMessage": "已重設！", - "YourGainMessage": "Your gain:", - "NoAccelerometerMessage": "No accelerometer\ndetected!", - "NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", + "YourGainMessage": "Your gain:" + }, + "messagesWarn": { + "SettingsResetMessage": "設定已被重設！", + "NoAccelerometerMessage": [ + "No accelerometer", + "detected!" + ], + "NoPowerDeliveryMessage": [ + "No USB-PD IC", + "detected!" + ], "LockingKeysString": "已鎖定", "UnlockingKeysString": "已解除鎖定", "WarningKeysLockedString": "!按鍵鎖定!" }, - "messagesWarn": { - "SettingsResetMessage": "設定已被重設！" - }, "characters": { "SettingRightChar": "右", "SettingLeftChar": "左", diff --git a/Translations/translations_def.js b/Translations/translations_def.js index 229d9b95..0f79c20d 100644 --- a/Translations/translations_def.js +++ b/Translations/translations_def.js @@ -89,36 +89,26 @@ var def = "id": "YourGainMessage", "maxLen": 8, "default": "Your Gain" - }, - { - "id": "NoAccelerometerMessage", - "maxLen": 16, - "default": "No accelerometer\ndetected!" - }, - { - "id": "NoPowerDeliveryMessage", - "maxLen": 16, - "default": "No USB-PD IC\ndetected!" - }, - { - "id": "LockingKeysString", - "maxLen": 8, - "default": "LOCKING" - }, - { - "id": "UnlockingKeysString", - "maxLen": 8, - "default": "UNLOCK" - }, - { - "id": "WarningKeysLockedString", - "maxLen": 8, - "default": "LOCKED!" } ], "messagesWarn": [ { "id": "SettingsResetMessage" + }, + { + "id": "NoAccelerometerMessage" + }, + { + "id": "NoPowerDeliveryMessage" + }, + { + "id": "LockingKeysString" + }, + { + "id": "UnlockingKeysString" + }, + { + "id": "WarningKeysLockedString" } ], "characters": [ diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index 43446a3f..e8461976 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -37,14 +37,14 @@ extern const char *SolderingAdvancedPowerPrompt; extern const char *OffString; extern const char *ResetOKMessage; extern const char *YourGainMessage; + +extern const char *SettingsResetMessage; extern const char *NoAccelerometerMessage; extern const char *NoPowerDeliveryMessage; extern const char *LockingKeysString; extern const char *UnlockingKeysString; extern const char *WarningKeysLockedString; -extern const char *SettingsResetMessage; - extern const char *SettingRightChar; extern const char *SettingLeftChar; extern const char *SettingAutoChar; diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 7f049aff..b39afb0b 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -43,10 +43,10 @@ static uint16_t min(uint16_t a, uint16_t b) { else return a; } -void warnUser(const char *warning, const FontStyle font, const int timeout) { + +void warnUser(const char *warning, const int timeout) { OLED::clearScreen(); - OLED::setCursor(0, 0); - OLED::print(warning, font); + OLED::printWholeScreen(warning); OLED::refresh(); waitForButtonPressOrTimeout(timeout); } @@ -462,7 +462,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) { case BUTTON_BOTH_LONG: // Unlock buttons buttonsLocked = false; - warnUser(UnlockingKeysString, FontStyle::LARGE, TICKS_SECOND); + warnUser(UnlockingKeysString, TICKS_SECOND); break; case BUTTON_F_LONG: // if boost mode is enabled turn it on @@ -476,7 +476,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) { case BUTTON_F_SHORT: case BUTTON_B_SHORT: // Do nothing and display a lock warming - warnUser(WarningKeysLockedString, FontStyle::LARGE, TICKS_SECOND / 2); + warnUser(WarningKeysLockedString, TICKS_SECOND / 2); break; default: break; @@ -511,7 +511,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) { if (systemSettings.lockingMode != 0) { // Lock buttons buttonsLocked = true; - warnUser(LockingKeysString, FontStyle::LARGE, TICKS_SECOND); + warnUser(LockingKeysString, TICKS_SECOND); } break; default: @@ -713,12 +713,7 @@ void showDebugMenu(void) { void showWarnings() { // Display alert if settings were reset if (settingsWereReset) { - if (SettingsResetMessage[0] == '\x01') { // `\x01` is used as newline. - // Empty first line means that this uses large font (for CJK). - warnUser(SettingsResetMessage + 1, FontStyle::LARGE, 10 * TICKS_SECOND); - } else { - warnUser(SettingsResetMessage, FontStyle::SMALL, 10 * TICKS_SECOND); - } + warnUser(SettingsResetMessage, 10 * TICKS_SECOND); } #ifndef NO_WARN_MISSING // We also want to alert if accel or pd is not detected / not responding @@ -732,7 +727,7 @@ void showWarnings() { if (systemSettings.accelMissingWarningCounter < 2) { systemSettings.accelMissingWarningCounter++; saveSettings(); - warnUser(NoAccelerometerMessage, FontStyle::SMALL, 10 * TICKS_SECOND); + warnUser(NoAccelerometerMessage, 10 * TICKS_SECOND); } } #ifdef POW_PD @@ -741,7 +736,7 @@ void showWarnings() { if (systemSettings.pdMissingWarningCounter < 2) { systemSettings.pdMissingWarningCounter++; saveSettings(); - warnUser(NoPowerDeliveryMessage, FontStyle::SMALL, 10 * TICKS_SECOND); + warnUser(NoPowerDeliveryMessage, 10 * TICKS_SECOND); } } #endif