diff --git a/apps/code/catalog.de.i18n b/apps/code/catalog.de.i18n index 0e5a92fda..403c914a1 100644 --- a/apps/code/catalog.de.i18n +++ b/apps/code/catalog.de.i18n @@ -102,9 +102,9 @@ PythonIsFinite = "Prüfen, ob x endlich ist" PythonIsInfinite = "Prüfen, ob x unendlich ist" PythonIsNaN = "Prüfen, ob x keine Zahl ist" PythonIsKeyDown = "Wahr, wenn die Taste k gedrückt ist" -PythonBattery = "Return battery voltage" -PythonBatteryLevel = "Return battery level" -PythonBatteryIscharging = "Return if battery is charging" +PythonBattery = "Rückgabe der Batteriespannung" +PythonBatteryLevel = "Gibt den Batteriestand zurück" +PythonBatteryIscharging = "Gibt zurück, ob die Batterie geladen wird" PythonKandinskyFunction = "Kandinsky-Modul Funktionspräfix" PythonLdexp = "Liefert x*(2**i), Inverse von frexp" PythonLength = "Länge eines Objekts" diff --git a/apps/code/catalog.es.i18n b/apps/code/catalog.es.i18n index e8c62d967..b6e2c8704 100644 --- a/apps/code/catalog.es.i18n +++ b/apps/code/catalog.es.i18n @@ -87,9 +87,9 @@ PythonIonFunction = "ion module function prefix" PythonIsFinite = "Check if x is finite" PythonIsInfinite = "Check if x is infinity" PythonIsKeyDown = "Return True if the k key is down" -PythonBattery = "Return battery voltage" -PythonBatteryLevel = "Return battery level" -PythonBatteryIscharging = "Return if battery is charging" +PythonBattery = "Rückgabe der Batteriespannung" +PythonBatteryLevel = "Gibt den Batteriestand zurück" +PythonBatteryIscharging = "Gibt zurück, ob die Batterie geladen wird" PythonIsNaN = "Check if x is a NaN" PythonKandinskyFunction = "kandinsky module function prefix" PythonLdexp = "Return x*(2**i), inverse of frexp" diff --git a/apps/code/catalog.hu.i18n b/apps/code/catalog.hu.i18n index 1c78c3b13..136541807 100644 --- a/apps/code/catalog.hu.i18n +++ b/apps/code/catalog.hu.i18n @@ -87,9 +87,9 @@ PythonIonFunction = "ion modul funkció elötag" PythonIsFinite = "x véges-e" PythonIsInfinite = "x végtelen-e" PythonIsKeyDown = "True-t válaszol ha a k gomb le van nyomva" -PythonBattery = "Return battery voltage" -PythonBatteryLevel = "Return battery level" -PythonBatteryIscharging = "Return if battery is charging" +PythonBattery = "Az akkumulátor feszültségének visszaadása" +PythonBatteryLevel = "Az akkumulátor töltöttségi szintjének visszaadása" +PythonBatteryIscharging = "Visszaadja, ha az akkumulátor töltődik" PythonIsNaN = "Ellenörizze hogy x nem NaN" PythonKandinskyFunction = "kandinsky modul funkció elötag" PythonLdexp = "frexp ellentéte : x*(2**i)" diff --git a/apps/code/catalog.it.i18n b/apps/code/catalog.it.i18n index 5d14e7cdc..f525e7297 100644 --- a/apps/code/catalog.it.i18n +++ b/apps/code/catalog.it.i18n @@ -101,9 +101,9 @@ PythonIonFunction = "Prefisso di funzione modulo ion" PythonIsFinite = "Testa se x è finito" PythonIsInfinite = "Testa se x est infinito" PythonIsKeyDown = "Restituisce True premendo tasto k" -PythonBattery = "Return battery voltage" -PythonBatteryLevel = "Return battery level" -PythonBatteryIscharging = "Return if battery is charging" +PythonBattery = "Restituisce la tensione della batteria" +PythonBatteryLevel = "Restituisce il livello della batteria" +PythonBatteryIscharging = "Restituisce se la batteria è in carica" PythonIsNaN = "Testa se x è NaN" PythonKandinskyFunction = "Prefisso funzione modulo kandinsky" PythonLdexp = "Inversa di frexp : x*(2**i)" diff --git a/apps/code/catalog.nl.i18n b/apps/code/catalog.nl.i18n index 503cb9873..2a1373594 100644 --- a/apps/code/catalog.nl.i18n +++ b/apps/code/catalog.nl.i18n @@ -102,9 +102,9 @@ PythonIonFunction = "ion module voorvoegsel" PythonIsFinite = "Controleer of x eindig is" PythonIsInfinite = "Controleer of x oneindig is" PythonIsKeyDown = "Geef True als k toets omlaag is" -PythonBattery = "Return battery voltage" -PythonBatteryLevel = "Return battery level" -PythonBatteryIscharging = "Return if battery is charging" +PythonBattery = "Return batterijspanning" +PythonBatteryLevel = "Batterijniveau teruggeven" +PythonBatteryIscharging = "Keer terug als de batterij wordt opgeladen" PythonIsNaN = "Controleer of x geen getal is" PythonKandinskyFunction = "kandinsky module voorvoegsel" PythonLdexp = "Geeft x*(2**i), inversie van frexp" diff --git a/apps/code/catalog.pt.i18n b/apps/code/catalog.pt.i18n index fd043ba0a..4245cc850 100644 --- a/apps/code/catalog.pt.i18n +++ b/apps/code/catalog.pt.i18n @@ -87,9 +87,9 @@ PythonIonFunction = "Prefixo da função do módulo ion" PythonIsFinite = "Verificar se x é finito" PythonIsInfinite = "Verificar se x é infinito" PythonIsKeyDown = "Devolve True se tecla k pressionada" -PythonBattery = "Return battery voltage" -PythonBatteryLevel = "Return battery level" -PythonBatteryIscharging = "Return if battery is charging" +PythonBattery = "Retornar a voltagem da bateria" +PythonBatteryLevel = "Retornar nível de bateria" +PythonBatteryIscharging = "Retorne se a bateria estiver carregando" PythonIsNaN = "Verificar se x é um NaN" PythonKandinskyFunction = "Prefixo da função do módulo kandinsky" PythonLdexp = "Devolve x*(2**i), inverso de frexp" diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index 062f4175c..21f932f75 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -181,10 +181,10 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) { MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell; static const char * mpVersion = MICROPY_VERSION_STRING; - static char batteryLevel[15]; - int batteryLen = Poincare::Number::FloatNumber(Ion::Battery::voltage()).serialize(batteryLevel, 15, Poincare::Preferences::PrintFloatMode::Decimal, 3); + static char batteryLevel[5]; + int batteryLen = Poincare::Number::FloatNumber(Ion::Battery::voltage()).serialize(batteryLevel, 4, Poincare::Preferences::PrintFloatMode::Decimal, 3); batteryLevel[batteryLen] = 'V'; - batteryLevel[batteryLen+1] = '\0'; + batteryLevel[batteryLen + 1] = '\0'; static const char * messages[] = { (const char*) Ion::username(), diff --git a/apps/settings/sub_menu/about_controller.h b/apps/settings/sub_menu/about_controller.h index beef15d95..9a92b70f9 100644 --- a/apps/settings/sub_menu/about_controller.h +++ b/apps/settings/sub_menu/about_controller.h @@ -22,11 +22,10 @@ public: int typeAtLocation(int i, int j) override; int numberOfRows() const override; private: - constexpr static int k_totalNumberOfCell = 8; + constexpr static int k_totalNumberOfCell = 9; bool hasUsernameCell() const; ContributorsController m_contributorsController; MessageTableCellWithChevronAndMessage m_contributorsCell; - //SelectableViewWithMessages m_view; MessageTableCellWithBuffer m_cells[k_totalNumberOfCell]; HardwareTest::PopUpController m_hardwareTestPopUpController; };