diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index 966232b04..640e480a0 100644 --- a/apps/settings/base.de.i18n +++ b/apps/settings/base.de.i18n @@ -14,16 +14,13 @@ ToDeactivateExamMode1 = "Um den Testmodus auszuschalten," ToDeactivateExamMode2 = "schließen Sie den Rechner an einen" ToDeactivateExamMode3 = "Computer oder eine Steckdose an." # --------------------- Please do not edit these messages --------------------- -ExamModeWarning1 = "Caution: the compliance of the" -ExamModeWarning2 = "exam mode of this software isn't" -ExamModeWarning3 = "guaranteed by NumWorks. You are" -ExamModeWarning4 = "hold liable when using this non" -ExamModeWarning5 = "official version during" -ExamModeWarning6 = "examinations." -AboutWarning1 = "Caution: this is a non-official version of" -AboutWarning2 = "the software and NumWorks can't be hold" -AboutWarning3 = "liable for the issues that would raise due" -AboutWarning4 = "to its use." +ExamModeWarning1 = "Caution: NumWorks does not guarantee" +ExamModeWarning2 = "that this non-official software has" +ExamModeWarning3 = "a compliant exam mode." +AboutWarning1 = "Caution: you are using a non-official" +AboutWarning2 = "version of the software and NumWorks" +AboutWarning3 = "is not liable for the issues that it" +AboutWarning4 = "might raise." # ----------------------------------------------------------------------------- About = "Über" Degrees = "Grad " diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n index ff192dc25..befcaf66a 100644 --- a/apps/settings/base.en.i18n +++ b/apps/settings/base.en.i18n @@ -14,16 +14,13 @@ ToDeactivateExamMode1 = "To deactivate the exam mode," ToDeactivateExamMode2 = "plug the calculator to a computer" ToDeactivateExamMode3 = "or to a power socket." # --------------------- Please do not edit these messages --------------------- -ExamModeWarning1 = "Caution: the compliance of the" -ExamModeWarning2 = "exam mode of this software isn't" -ExamModeWarning3 = "guaranteed by NumWorks. You are" -ExamModeWarning4 = "hold liable when using this non" -ExamModeWarning5 = "official version during" -ExamModeWarning6 = "examinations." -AboutWarning1 = "Caution: this is a non-official version of" -AboutWarning2 = "the software and NumWorks can't be hold" -AboutWarning3 = "liable for the issues that would raise due" -AboutWarning4 = "to its use." +ExamModeWarning1 = "Caution: NumWorks does not guarantee" +ExamModeWarning2 = "that this non-official software has" +ExamModeWarning3 = "a compliant exam mode." +AboutWarning1 = "Caution: you are using a non-official" +AboutWarning2 = "version of the software and NumWorks" +AboutWarning3 = "is not liable for the issues that it" +AboutWarning4 = "might raise." # ----------------------------------------------------------------------------- About = "About" Degrees = "Degrees " diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n index 07c214d1d..fc397adc2 100644 --- a/apps/settings/base.es.i18n +++ b/apps/settings/base.es.i18n @@ -14,16 +14,13 @@ ToDeactivateExamMode1 = "Para desactivar el modo examen," ToDeactivateExamMode2 = "conecte la calculadora a un ordenador" ToDeactivateExamMode3 = "o a un enchufe eléctrico." # --------------------- Please do not edit these messages --------------------- -ExamModeWarning1 = "Caution: the compliance of the" -ExamModeWarning2 = "exam mode of this software isn't" -ExamModeWarning3 = "guaranteed by NumWorks. You are" -ExamModeWarning4 = "hold liable when using this non" -ExamModeWarning5 = "official version during" -ExamModeWarning6 = "examinations." -AboutWarning1 = "Caution: this is a non-official version of" -AboutWarning2 = "the software and NumWorks can't be hold" -AboutWarning3 = "liable for the issues that would raise due" -AboutWarning4 = "to its use." +ExamModeWarning1 = "Caution: NumWorks does not guarantee" +ExamModeWarning2 = "that this non-official software has" +ExamModeWarning3 = "a compliant exam mode." +AboutWarning1 = "Caution: you are using a non-official" +AboutWarning2 = "version of the software and NumWorks" +AboutWarning3 = "is not liable for the issues that it" +AboutWarning4 = "might raise." # ----------------------------------------------------------------------------- About = "Acerca" Degrees = "Grados " diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n index 3e97428d3..a5170f320 100644 --- a/apps/settings/base.fr.i18n +++ b/apps/settings/base.fr.i18n @@ -15,15 +15,12 @@ ToDeactivateExamMode2 = "brancher la calculatrice à un" ToDeactivateExamMode3 = "ordinateur ou à une prise de courant." # --------------------- Please do not edit these messages --------------------- ExamModeWarning1 = "Attention, la conformité du mode" -ExamModeWarning2 = "examen de ce logiciel n'est pas" -ExamModeWarning3 = "garantie par NumWorks. En utilisant" -ExamModeWarning4 = "cette version non officielle lors" -ExamModeWarning5 = "d'un examen, vous engagez votre" -ExamModeWarning6 = "responsabilité." -AboutWarning1 = "Attention, ceci est une version non" +ExamModeWarning2 = "examen de ce logiciel non officiel" +ExamModeWarning3 = "n'est pas garantie par NumWorks." +AboutWarning1 = "Attention, vous utilisez une version non" AboutWarning2 = "officielle du logiciel et NumWorks ne" AboutWarning3 = "saurait être tenu responsable des problèmes" -AboutWarning4 = "que pourrait entrainer son utilisation." +AboutWarning4 = "que cela pourrait entrainer." # ----------------------------------------------------------------------------- About = "À propos" Degrees = "Degrés " diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n index c0d919dca..a6c28391b 100644 --- a/apps/settings/base.pt.i18n +++ b/apps/settings/base.pt.i18n @@ -14,16 +14,13 @@ ToDeactivateExamMode1 = "Para desactivar o modo de exame," ToDeactivateExamMode2 = "ligue a calculadora a um computador" ToDeactivateExamMode3 = "ou a uma tomada eléctrica." # --------------------- Please do not edit these messages --------------------- -ExamModeWarning1 = "Caution: the compliance of the" -ExamModeWarning2 = "exam mode of this software isn't" -ExamModeWarning3 = "guaranteed by NumWorks. You are" -ExamModeWarning4 = "hold liable when using this non" -ExamModeWarning5 = "official version during" -ExamModeWarning6 = "examinations." -AboutWarning1 = "Caution: this is a non-official version of" -AboutWarning2 = "the software and NumWorks can't be hold" -AboutWarning3 = "liable for the issues that would raise due" -AboutWarning4 = "to its use." +ExamModeWarning1 = "Caution: NumWorks does not guarantee" +ExamModeWarning2 = "that this non-official software has" +ExamModeWarning3 = "a compliant exam mode." +AboutWarning1 = "Caution: you are using a non-official" +AboutWarning2 = "version of the software and NumWorks" +AboutWarning3 = "is not liable for the issues that it" +AboutWarning4 = "might raise." # ----------------------------------------------------------------------------- About = "Acerca" Degrees = "Graus " diff --git a/apps/settings/sub_menu/exam_mode_controller.cpp b/apps/settings/sub_menu/exam_mode_controller.cpp index 81e066da9..103e7a1c4 100644 --- a/apps/settings/sub_menu/exam_mode_controller.cpp +++ b/apps/settings/sub_menu/exam_mode_controller.cpp @@ -37,7 +37,7 @@ void ExamModeController::didEnterResponderChain(Responder * previousFirstRespond m_contentView.setMessages(deactivateMessages, k_numberOfDeactivationMessageLines); // --------------------- Please don't edit these lines ---------------------- } else if (numberOfCautionLines() > 0) { - I18n::Message cautionMessages[] = {I18n::Message::ExamModeWarning1, I18n::Message::ExamModeWarning2, I18n::Message::ExamModeWarning3, I18n::Message::ExamModeWarning4, I18n::Message::ExamModeWarning5, I18n::Message::ExamModeWarning6}; + I18n::Message cautionMessages[] = {I18n::Message::ExamModeWarning1, I18n::Message::ExamModeWarning2, I18n::Message::ExamModeWarning3}; m_contentView.setMessages(cautionMessages, numberOfCautionLines()); } // -------------------------------------------------------------------------- diff --git a/apps/settings/sub_menu/exam_mode_controller.h b/apps/settings/sub_menu/exam_mode_controller.h index 8b45feda5..db1e423ef 100644 --- a/apps/settings/sub_menu/exam_mode_controller.h +++ b/apps/settings/sub_menu/exam_mode_controller.h @@ -19,7 +19,7 @@ public: void willDisplayCellForIndex(HighlightCell * cell, int index) override; private: static constexpr int k_numberOfDeactivationMessageLines = 3; - static constexpr int k_numberOfCautionMessageLines = 6; + static constexpr int k_numberOfCautionMessageLines = 3; int numberOfCautionLines() const; int initialSelectedRow() const override; GlobalPreferences::ExamMode examMode(); diff --git a/apps/settings/sub_menu/selectable_view_with_messages.h b/apps/settings/sub_menu/selectable_view_with_messages.h index 393deec30..4c5a3d847 100644 --- a/apps/settings/sub_menu/selectable_view_with_messages.h +++ b/apps/settings/sub_menu/selectable_view_with_messages.h @@ -16,7 +16,7 @@ private: View * subviewAtIndex(int index) override; void layoutSubviews(bool force = false) override; SelectableTableView * m_selectableTableView; - static constexpr int k_maxNumberOfLines = 6; + static constexpr int k_maxNumberOfLines = 4; MessageTextView m_messageLines[k_maxNumberOfLines]; int m_numberOfMessages; };