diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index bf8931fb0..115be9345 100644 --- a/apps/settings/base.de.i18n +++ b/apps/settings/base.de.i18n @@ -32,3 +32,4 @@ ColorYellow = "Geel " Contributors = "Medewerkers" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " +JoachimLeFournis = "Joachim Le Fournis " diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n index 378676156..5aea4abda 100644 --- a/apps/settings/base.en.i18n +++ b/apps/settings/base.en.i18n @@ -32,3 +32,4 @@ ColorYellow = "Yellow " Contributors = "Contributors" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " +JoachimLeFournis = "Joachim Le Fournis " diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n index f48802316..5950e6ee0 100644 --- a/apps/settings/base.es.i18n +++ b/apps/settings/base.es.i18n @@ -32,3 +32,4 @@ ColorYellow = "Amarillo " Contributors = "Contribuyentes" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " +JoachimLeFournis = "Joachim Le Fournis " diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n index 8d45c25c1..577616edb 100644 --- a/apps/settings/base.fr.i18n +++ b/apps/settings/base.fr.i18n @@ -32,3 +32,4 @@ ColorYellow = "Jaune " Contributors = "Contributeurs" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " +JoachimLeFournis = "Joachim Le Fournis " diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n index 8c4982375..a95bf2b18 100644 --- a/apps/settings/base.pt.i18n +++ b/apps/settings/base.pt.i18n @@ -32,3 +32,4 @@ ColorYellow = "Amarelo " Contributors = "Contribuidores" QuentinGuidee = "Quentin Guidee " DannySimmons = "Danny Simmons " +JoachimLeFournis = "Joachim Le Fournis " diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 5b90d34b8..00c31191a 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -14,12 +14,12 @@ const SettingsMessageTree complexFormatChildren[3] = {SettingsMessageTree(I18n:: const SettingsMessageTree examChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)}; const SettingsMessageTree ledColorChildren[4] = {SettingsMessageTree(I18n::Message::ColorWhite), SettingsMessageTree(I18n::Message::ColorGreen), SettingsMessageTree(I18n::Message::ColorBlue), SettingsMessageTree(I18n::Message::ColorYellow)}; const SettingsMessageTree aboutChildren[4] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)}; -const SettingsMessageTree contributorsChildren[2] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons)}; +const SettingsMessageTree contributorsChildren[3] = {SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis)}; #ifdef EPSILON_BOOT_PROMPT -const SettingsMessageTree menu[11] = +const SettingsMessageTree menu[12] = #else -const SettingsMessageTree menu[10] = +const SettingsMessageTree menu[11] = #endif {SettingsMessageTree(I18n::Message::AngleUnit, angleChildren, 2), SettingsMessageTree(I18n::Message::DisplayMode, floatDisplayModeChildren, 3), @@ -35,7 +35,7 @@ const SettingsMessageTree menu[10] = SettingsMessageTree(I18n::Message::UpdatePopUp), #endif SettingsMessageTree(I18n::Message::About, aboutChildren, 4), - SettingsMessageTree(I18n::Message::Contributors, contributorsChildren, 2)}; + SettingsMessageTree(I18n::Message::Contributors, contributorsChildren, 3)}; #ifdef EPSILON_BOOT_PROMPT const SettingsMessageTree model = SettingsMessageTree(I18n::Message::SettingsApp, menu, 11); #else diff --git a/apps/settings/sub_menu/contributors_controller.h b/apps/settings/sub_menu/contributors_controller.h index 300b94d61..7c7291cb5 100644 --- a/apps/settings/sub_menu/contributors_controller.h +++ b/apps/settings/sub_menu/contributors_controller.h @@ -14,7 +14,7 @@ public: int reusableCellCount(int type) override; void willDisplayCellForIndex(HighlightCell * cell, int index) override; private: - constexpr static int k_totalNumberOfCell = 2; + constexpr static int k_totalNumberOfCell = 3; MessageTableCellWithBuffer m_cells[k_totalNumberOfCell]; }; diff --git a/scripts/config.mak b/scripts/config.mak index d222902fa..dd531024d 100644 --- a/scripts/config.mak +++ b/scripts/config.mak @@ -4,7 +4,7 @@ PLATFORM ?= device DEBUG ?= 0 EPSILON_VERSION ?= 11.2.0 -EPSILON_CUSTOM_VERSION ?= 1.8 +EPSILON_CUSTOM_VERSION ?= 1.8.1 EPSILON_ONBOARDING_APP ?= 1 # Valid values are "none", "update", "beta" EPSILON_BOOT_PROMPT ?= none