diff --git a/apps/reader/base.de.i18n b/apps/reader/base.de.i18n index 9cbb39897..873f577b1 100644 --- a/apps/reader/base.de.i18n +++ b/apps/reader/base.de.i18n @@ -1,5 +1,3 @@ ReaderApp = "Leser" ReaderAppCapital = "LESER" NoFileToDisplay = "Keine Dateien zum Anzeigen" -FileError1 = "Fehler beim Lesen der Datei" -FileError2 = "Bitte überprüfen Sie die Syntax" diff --git a/apps/reader/base.en.i18n b/apps/reader/base.en.i18n index 2cb016526..812b213b8 100644 --- a/apps/reader/base.en.i18n +++ b/apps/reader/base.en.i18n @@ -1,5 +1,3 @@ ReaderApp = "Reader" ReaderAppCapital = "READER" NoFileToDisplay = "No file to display" -FileError1 = "Error while reading file" -FileError2 = "Please check its syntax" diff --git a/apps/reader/base.es.i18n b/apps/reader/base.es.i18n index 76962dca3..674bec03e 100644 --- a/apps/reader/base.es.i18n +++ b/apps/reader/base.es.i18n @@ -1,5 +1,3 @@ ReaderApp = "Lector" ReaderAppCapital = "LECTOR" NoFileToDisplay ="No hay archivos para mostrar" -FileError1 = "Error al leer el archivo" -FileError2 = "Por favor revise su sintaxis" diff --git a/apps/reader/base.fr.i18n b/apps/reader/base.fr.i18n index b74e6add0..e017f6bda 100644 --- a/apps/reader/base.fr.i18n +++ b/apps/reader/base.fr.i18n @@ -1,5 +1,3 @@ ReaderApp = "Liseuse" ReaderAppCapital = "LISEUSE" NoFileToDisplay = "Aucun fichier à afficher" -FileError1 = "Erreur durant la lecture du fichier" -FileError2 = "Veuillez vérifier sa syntaxe" \ No newline at end of file diff --git a/apps/reader/base.hu.i18n b/apps/reader/base.hu.i18n index 9580dc40a..d0595b0c6 100644 --- a/apps/reader/base.hu.i18n +++ b/apps/reader/base.hu.i18n @@ -1,5 +1,3 @@ ReaderApp = "Olvasó" ReaderAppCapital = "OLVASÓ" NoFileToDisplay = "Nincs megjeleníthető fájl" -FileError1 = "Hiba a fájl olvasása közben" -FileError2 = "Kérjük, ellenőrizze a szintaxisát" diff --git a/apps/reader/base.it.i18n b/apps/reader/base.it.i18n index abfa80eda..98caf87b7 100644 --- a/apps/reader/base.it.i18n +++ b/apps/reader/base.it.i18n @@ -1,5 +1,3 @@ ReaderApp = "Lettore" ReaderAppCapital = "LETTORE" NoFileToDisplay = "essun file da visualizzare" -FileError1 = "Errore durante la lettura del file" -FileError2 = "Si prega di controllare la sua sintassi" diff --git a/apps/reader/base.nl.i18n b/apps/reader/base.nl.i18n index 9f8c2304f..0e744c24c 100644 --- a/apps/reader/base.nl.i18n +++ b/apps/reader/base.nl.i18n @@ -1,5 +1,3 @@ ReaderApp = "Lezer" ReaderAppCapital = "LEZER" NoFileToDisplay = "Geen bestanden om weer te geven" -FileError1 = "Fout tijdens het lezen van bestand" -FileError2 = "Controleer de syntaxis ervan" diff --git a/apps/reader/base.pt.i18n b/apps/reader/base.pt.i18n index 0c2281287..0be936522 100644 --- a/apps/reader/base.pt.i18n +++ b/apps/reader/base.pt.i18n @@ -1,5 +1,3 @@ ReaderApp = "Leitor" ReaderAppCapital = "LEITOR" NoFileToDisplay = "Nenhum arquivo para exibir" -FileError1 = "Erro ao ler o arquivo" -FileError2 = "Verifique sua sintaxe" diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index 3eb0e59fb..8f8cd5898 100644 --- a/apps/settings/base.de.i18n +++ b/apps/settings/base.de.i18n @@ -72,14 +72,6 @@ Time = "Uhrzeit" RTCWarning1 = "Das Aktivieren der Uhr verkürzt die" RTCWarning2 = "Akkulaufzeit im Bereitschaftsmodus." SyntaxHighlighting = "Syntaxhervorhebung" -USBExplanation1 = "USB-Schutz schützt Ihren" -USBExplanation2 = "Taschenrechner vor" -USBExplanation3 = "unbeabsichtigter Verriegelung" -USBProtection = "USB-Schutz" -USBProtectionLevel = "Akzeptierte Updates" -USBDefaultLevel = "Basierend auf Upsilon" -USBLowLevel = "Basierend auf Omega" -USBParanoidLevel = "Nichts" Normal = "Normal" IdleTimeBeforeDimming = "Abdunkeln nach (s)" IdleTimeBeforeSuspend = "Anhalten nach (s)" diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n index c6a048e2a..56f152054 100644 --- a/apps/settings/base.en.i18n +++ b/apps/settings/base.en.i18n @@ -72,14 +72,6 @@ Time = "Time" RTCWarning1 = "Enabling the clock drains the battery faster" RTCWarning2 = "when the calculator is powered off." SyntaxHighlighting = "Syntax Highlighting" -USBExplanation1 = "The USB protection protects" -USBExplanation2 = "the calculator from" -USBExplanation3 = "unintentional locking" -USBProtection = "USB Protection" -USBProtectionLevel = "Updates accepted" -USBDefaultLevel = "Based on Upsilon" -USBLowLevel = "Based on Omega" -USBParanoidLevel = "None" Normal = "Normal" IdleTimeBeforeDimming = "Dim after (s)" IdleTimeBeforeSuspend = "Suspend after (s)" diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n index 839f25ba8..42ce777f2 100644 --- a/apps/settings/base.es.i18n +++ b/apps/settings/base.es.i18n @@ -72,14 +72,6 @@ Time = "Hora" RTCWarning1 = "Activar el reloj gasta la batería más rápido" RTCWarning2 = "cuando la calculadora está apagada." SyntaxHighlighting = "Resaltado de sintaxis" -USBExplanation1 = "La protección USB protege" -USBExplanation2 = "su calculadora del" -USBExplanation3 = "bloqueo involuntario" -USBProtection = "Protección USB" -USBProtectionLevel = "Actualizaciones aceptadas" -USBDefaultLevel = "Basado en Upsilon" -USBLowLevel = "Basado en Omega" -USBParanoidLevel = "Ninguno" Normal = "Normal" IdleTimeBeforeDimming = "Oscurecer después de (s)" IdleTimeBeforeSuspend = "Suspender después de (s)" diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n index 87a4596ce..676e64687 100644 --- a/apps/settings/base.fr.i18n +++ b/apps/settings/base.fr.i18n @@ -72,14 +72,6 @@ Time = "Heure" RTCWarning1 = "Activer l'horloge décharge la batterie plus" RTCWarning2 = "vite quand la calculatrice est éteinte." SyntaxHighlighting = "Coloration syntaxique" -USBExplanation1 = "La protection USB protège votre" -USBExplanation2 = "calculatrice contre un verrouillage" -USBExplanation3 = "non-intentionnel" -USBProtection = "Protection USB" -USBProtectionLevel = "Mise à jour acceptées" -USBDefaultLevel = "Basées sur Upsilon" -USBLowLevel = "Basées sur Omega" -USBParanoidLevel = "Aucune" Normal = "Normale" IdleTimeBeforeDimming = "Assombrir après (s)" IdleTimeBeforeSuspend = "Éteindre après (s)" diff --git a/apps/settings/base.hu.i18n b/apps/settings/base.hu.i18n index 99dc79fc3..a46e8cdda 100644 --- a/apps/settings/base.hu.i18n +++ b/apps/settings/base.hu.i18n @@ -72,14 +72,6 @@ Time = "Óra" RTCWarning1 = "Amikor a számológép alvómódban van, az óra" RTCWarning2 = "használása az elemet gyorsabban meríti ki." SyntaxHighlighting = "Szintaxis kiemelés" -USBExplanation1 = "Az USB-védelem megvédi" -USBExplanation2 = "a számológépet a nem" -USBExplanation3 = "szándékos reteszeléstől" -USBProtection = "USB védelem" -USBProtectionLevel = "Elfogadott frissítések" -USBDefaultLevel = "Upsilon alapján" -USBLowLevel = "Omega alapján" -USBParanoidLevel = "Egyik sem" Normal = "Normale" IdleTimeBeforeDimming = "Assombrir après (s)" IdleTimeBeforeSuspend = "Éteindre après (s)" diff --git a/apps/settings/base.it.i18n b/apps/settings/base.it.i18n index 2603da889..e7dfe4d7f 100644 --- a/apps/settings/base.it.i18n +++ b/apps/settings/base.it.i18n @@ -72,14 +72,6 @@ Time = "Time" RTCWarning1 = "Enabling the clock drains the battery faster" RTCWarning2 = "when the calculator is powered off." SyntaxHighlighting = "Evidenziazione della sintassi" -USBExplanation1 = "La protezione USB protegge" -USBExplanation2 = "la calcolatrice dal" -USBExplanation3 = "blocco involontario" -USBProtection = "Protezione USB" -USBProtectionLevel = "Aggiornamenti accettati" -USBDefaultLevel = "Basato su Upsilon" -USBLowLevel = "A base di Omega" -USBParanoidLevel = "Nessuno" Normal = "Normale" IdleTimeBeforeDimming = "Scurisci dopo (s)" IdleTimeBeforeSuspend = "Sospendi dopo (s)" diff --git a/apps/settings/base.nl.i18n b/apps/settings/base.nl.i18n index d71a76824..f26e546c4 100644 --- a/apps/settings/base.nl.i18n +++ b/apps/settings/base.nl.i18n @@ -72,14 +72,6 @@ Time = "Time" RTCWarning1 = "Enabling the clock drains the battery faster" RTCWarning2 = "when the calculator is powered off." SyntaxHighlighting = "Syntax Highlighting" -USBExplanation1 = "USB-beveiliging beschermt uw" -USBExplanation2 = "rekenmachine tegen" -USBExplanation3 = "onbedoelde vergrendeling" -USBProtection = "USB-beveiliging" -USBProtectionLevel = "Updates geaccepteerd" -USBDefaultLevel = "Gebaseerd op Upsilon" -USBLowLevel = "Op basis van Omega" -USBParanoidLevel = "Geen" Normal = "Normaal" IdleTimeBeforeDimming = "Donkerder maken na (s)" IdleTimeBeforeSuspend = "Suspend after (s)" diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n index b7639cb6e..950bc9927 100644 --- a/apps/settings/base.pt.i18n +++ b/apps/settings/base.pt.i18n @@ -72,14 +72,6 @@ Time = "Time" RTCWarning1 = "Enabling the clock drains the battery faster" RTCWarning2 = "when the calculator is powered off." SyntaxHighlighting = "Destaque da sintaxe" -USBExplanation1 = "A proteção USB protege" -USBExplanation2 = "sua calculadora contra" -USBExplanation3 = "bloqueios não intencionais" -USBProtection = "Proteção USB" -USBProtectionLevel = "Atualizações aceitas" -USBDefaultLevel = "Baseado em Upsilon" -USBLowLevel = "Baseado em Ômega" -USBParanoidLevel = "Nenhum" Normal = "Normal" IdleTimeBeforeDimming = "Diminuir depois (s)" IdleTimeBeforeSuspend = "Suspender depois (s)" diff --git a/apps/settings/base.universal.i18n b/apps/settings/base.universal.i18n index 124dc2112..210e673fb 100644 --- a/apps/settings/base.universal.i18n +++ b/apps/settings/base.universal.i18n @@ -1,4 +1 @@ UsbSetting = "USB" -USBDefaultLevelDesc = "L0" -USBLowLevelDesc = "L1" -USBParanoidLevelDesc = "L2" diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 4b590b45f..7e71771f9 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -15,8 +15,6 @@ constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMess constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)}; constexpr SettingsMessageTree s_modelDateTimeChildren[3] = {SettingsMessageTree(I18n::Message::ActivateClock), SettingsMessageTree(I18n::Message::Date), SettingsMessageTree(I18n::Message::Time)}; constexpr SettingsMessageTree s_symbolChildren[4] = {SettingsMessageTree(I18n::Message::SymbolMultiplicationCross),SettingsMessageTree(I18n::Message::SymbolMultiplicationMiddleDot),SettingsMessageTree(I18n::Message::SymbolMultiplicationStar),SettingsMessageTree(I18n::Message::SymbolMultiplicationAutoSymbol)}; -constexpr SettingsMessageTree s_usbProtectionChildren[2] = {SettingsMessageTree(I18n::Message::USBProtection), SettingsMessageTree(I18n::Message::USBProtectionLevel, s_usbProtectionLevelChildren)}; -constexpr SettingsMessageTree s_usbProtectionLevelChildren[3] = {SettingsMessageTree(I18n::Message::USBDefaultLevel), SettingsMessageTree(I18n::Message::USBLowLevel), SettingsMessageTree(I18n::Message::USBParanoidLevel)}; constexpr SettingsMessageTree s_externalChildren[2] = {SettingsMessageTree(I18n::Message::ExtAppWrite), SettingsMessageTree(I18n::Message::ExtAppEnabled)}; constexpr SettingsMessageTree s_symbolFunctionChildren[3] = {SettingsMessageTree(I18n::Message::SymbolDefaultFunction), SettingsMessageTree(I18n::Message::SymbolArgDefaultFunction), SettingsMessageTree(I18n::Message::SymbolArgFunction)}; constexpr SettingsMessageTree s_modelMathOptionsChildren[6] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren), SettingsMessageTree(I18n::Message::SymbolFunction, s_symbolFunctionChildren), SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren), SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren)}; diff --git a/apps/settings/sub_menu/preferences_controller.cpp b/apps/settings/sub_menu/preferences_controller.cpp index 06650e842..dbf254966 100644 --- a/apps/settings/sub_menu/preferences_controller.cpp +++ b/apps/settings/sub_menu/preferences_controller.cpp @@ -170,15 +170,6 @@ Layout PreferencesController::layoutForPreferences(I18n::Message message) { return LayoutHelper::String(text, strlen(text), font); } - // DFU Protection level - case I18n::Message::USBDefaultLevel: - case I18n::Message::USBLowLevel: - case I18n::Message::USBParanoidLevel: - { - const char * text = " "; - return LayoutHelper::String(text, strlen(text), k_layoutFont); - } - default: assert(false); return Layout(); diff --git a/build/utilities/translations_clean.py b/build/utilities/translations_clean.py index bc955991a..afee202fa 100644 --- a/build/utilities/translations_clean.py +++ b/build/utilities/translations_clean.py @@ -32,7 +32,7 @@ IGNORE_PATHS = [ ] IGNORE_PATHS_CONTENTS = [ "__pycache__", ".png", ".esc", ".ttf", ".ico", ".jpg", ".jar", ".icn", - ".bnr", ".i18n" + ".bnr", ".i18n", ".cache" ] # If the key contain something that's in this list, keep it to prevent code breaking