diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 5f7701ea4..0d1c93aaa 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -17,7 +17,7 @@ constexpr SettingsMessageTree s_modelMathOptionsChildren[5] = {SettingsMessageTr constexpr SettingsMessageTree s_modelResultDisplayChildren[2] = {SettingsMessageTree(I18n::Message::DefaultResult), SettingsMessageTree(I18n::Message::CompactResult)}; constexpr SettingsMessageTree s_modelFontChildren[2] = {SettingsMessageTree(I18n::Message::LargeFont), SettingsMessageTree(I18n::Message::SmallFont)}; constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)}; -constexpr SettingsMessageTree s_contributorsChildren[17] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::LouisC), SettingsMessageTree(I18n::Message::LucaRusso), SettingsMessageTree(I18n::Message::LelahelHideux)}; +constexpr SettingsMessageTree s_contributorsChildren[16] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::LouisC), SettingsMessageTree(I18n::Message::LelahelHideux)}; #ifdef USERNAME constexpr SettingsMessageTree s_modelAboutChildren[8] = {SettingsMessageTree(I18n::Message::Username), SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)}; #else diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index af9114825..9c2997ae6 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -22,7 +22,7 @@ extern const SettingsMessageTree s_modelMathOptionsChildren[5]; extern const SettingsMessageTree s_modelResultDisplayChildren[2]; extern const SettingsMessageTree s_modelFontChildren[2]; extern const SettingsMessageTree s_accessibilityChildren[6]; -extern const SettingsMessageTree s_contributorsChildren[17]; +extern const SettingsMessageTree s_contributorsChildren[16]; #ifdef USERNAME extern const SettingsMessageTree s_modelAboutChildren[8]; #else diff --git a/apps/settings/sub_menu/contributors_controller.cpp b/apps/settings/sub_menu/contributors_controller.cpp index 2a9f407d0..687ffc412 100644 --- a/apps/settings/sub_menu/contributors_controller.cpp +++ b/apps/settings/sub_menu/contributors_controller.cpp @@ -43,13 +43,12 @@ constexpr static I18n::Message s_developersUsernames[s_numberOfDevelopers] = { I18n::Message::PVenceslasDuet, }; -constexpr static int s_numberOfBetaTesters = 5; +constexpr static int s_numberOfBetaTesters = 4; constexpr static I18n::Message s_betaTestersUsernames[s_numberOfBetaTesters] = { I18n::Message::PCyprienMejat, I18n::Message::PTimeoArnouts, I18n::Message::PLouisC, - I18n::Message::PLucaRusso, I18n::Message::PLelahelHideux, }; diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index 2d980f283..8c7f6b28d 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -313,8 +313,6 @@ TimeoArnouts = "Timéo Arnouts" PTimeoArnouts = "@Dogm" LouisC = "Louis C" PLouisC = "@windows9x95" -LucaRusso = "Luca Russo" -PLucaRusso = "@ElFrance" LelahelHideux = "Lélahel Hideux" PLelahelHideux = "@Lelahelry" SpeedOfLight = "2.998·10^8"