UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2019-12-27 23:30:25 +01:00
parent d837111da5 76a6678a29
commit 4da34b7d81
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/base.de.i18n
View File

@@ -24,7 +24,7 @@ Brightness = "Helligkeit"
SoftwareVersion = "Epsilon version"
CustomSoftwareVersion = "Omega version"
Username = "Name"
MicroPythonVersion = "MicroPythonversion"
MicroPythonVersion = "µPythonversion"
SerialNumber = "Seriennummer"
UpdatePopUp = "Erinnerung: Update"
BetaPopUp = "Beta pop-up"

2
apps/settings/base.en.i18n
View File

@@ -24,7 +24,7 @@ Brightness = "Brightness"
SoftwareVersion = "Epsilon version"
CustomSoftwareVersion = "Omega version"
Username = "Name"
MicroPythonVersion = "MicroPython version"
MicroPythonVersion = "µPython version"
SerialNumber = "Serial number"
UpdatePopUp = "Update pop-up"
BetaPopUp = "Beta pop-up"

2
apps/settings/base.es.i18n
View File

@@ -24,7 +24,7 @@ Brightness = "Brillo"
SoftwareVersion = "Versión de Epsilon"
CustomSoftwareVersion = "Versión de Omega"
Username = "Apellido"
MicroPythonVersion = "Version de MicroPython"
MicroPythonVersion = "Version de µPython"
SerialNumber = "Número serie"
UpdatePopUp = "Pop-up de actualización"
BetaPopUp = "Beta pop-up"

2
apps/settings/base.fr.i18n
View File

@@ -24,7 +24,7 @@ Brightness = "Luminosité"
SoftwareVersion = "Version d'Epsilon"
CustomSoftwareVersion = "Version d'Omega"
Username = "Nom"
MicroPythonVersion = "Version de MicroPython"
MicroPythonVersion = "Version de µPython"
SerialNumber = "Numéro série"
UpdatePopUp = "Rappel mise à jour"
BetaPopUp = "Rappel version bêta"

2
apps/settings/base.pt.i18n
View File

@@ -24,7 +24,7 @@ Brightness = "Brilho"
SoftwareVersion = "Versão do Epsilon"
CustomSoftwareVersion = "Versão do Omega"
Username = "Nome"
MicroPythonVersion = "Versao do MicroPython"
MicroPythonVersion = "Versao do µPython"
SerialNumber = "Número serie"
UpdatePopUp = "Alertas de atualização"
BetaPopUp = "Beta pop-up"

6
apps/settings/sub_menu/about_controller.cpp
View File

@@ -4,6 +4,9 @@
#include <cmath>
#include <apps/settings/main_controller.h>
#define MP_STRINGIFY_HELPER(x) #x
#define MP_STRINGIFY(x) MP_STRINGIFY_HELPER(x)
namespace Settings {
AboutController::AboutController(Responder * parentResponder) :
@@ -94,8 +97,7 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
}
else {
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell;
// TODO: Use MICROPY_VERSION_STRING from "mpconfig"
static const char * mpVersion = "1.11.0";
static const char * mpVersion = MICROPY_VERSION_STRING;
static const char * messages[] = {
#ifdef USERNAME
Ion::username(),