From ce5f8236a9250295366fe8b44aa7da206ae6d35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 7 Feb 2020 10:34:37 +0100 Subject: [PATCH] [apps] Add comment around warning regarding non-official releases --- apps/settings/base.de.i18n | 2 ++ apps/settings/base.en.i18n | 2 ++ apps/settings/base.es.i18n | 2 ++ apps/settings/base.fr.i18n | 2 ++ apps/settings/base.pt.i18n | 2 ++ apps/settings/sub_menu/about_controller_non_official.cpp | 2 ++ apps/settings/sub_menu/exam_mode_controller.cpp | 2 ++ 7 files changed, 14 insertions(+) diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index 3738e5a73..966232b04 100644 --- a/apps/settings/base.de.i18n +++ b/apps/settings/base.de.i18n @@ -13,6 +13,7 @@ ActivateDutchExamMode = "Activate Dutch exam mode" 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" @@ -23,6 +24,7 @@ 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." +# ----------------------------------------------------------------------------- About = "Über" Degrees = "Grad " Gradians = "Gone " diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n index 78f746bad..ff192dc25 100644 --- a/apps/settings/base.en.i18n +++ b/apps/settings/base.en.i18n @@ -13,6 +13,7 @@ ActivateDutchExamMode = "Activate Dutch exam mode" 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" @@ -23,6 +24,7 @@ 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." +# ----------------------------------------------------------------------------- About = "About" Degrees = "Degrees " Gradians = "Gradians " diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n index 94d225356..07c214d1d 100644 --- a/apps/settings/base.es.i18n +++ b/apps/settings/base.es.i18n @@ -13,6 +13,7 @@ ActivateDutchExamMode = "Activate Dutch exam mode" 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" @@ -23,6 +24,7 @@ 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." +# ----------------------------------------------------------------------------- About = "Acerca" Degrees = "Grados " Gradians = "Gradianes " diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n index 03f09be38..3e97428d3 100644 --- a/apps/settings/base.fr.i18n +++ b/apps/settings/base.fr.i18n @@ -13,6 +13,7 @@ ActivateDutchExamMode = "Activate Dutch exam mode" ToDeactivateExamMode1 = "Pour désactiver le mode examen," 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" @@ -23,6 +24,7 @@ AboutWarning1 = "Attention, ceci est une version non" AboutWarning2 = "officielle du logiciel et NumWorks ne" AboutWarning3 = "saurait être tenu responsable des problèmes" AboutWarning4 = "que pourrait entrainer son utilisation." +# ----------------------------------------------------------------------------- About = "À propos" Degrees = "Degrés " Gradians = "Grades " diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n index 431adacca..c0d919dca 100644 --- a/apps/settings/base.pt.i18n +++ b/apps/settings/base.pt.i18n @@ -13,6 +13,7 @@ ActivateDutchExamMode = "Activate Dutch exam mode" 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" @@ -23,6 +24,7 @@ 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." +# ----------------------------------------------------------------------------- About = "Acerca" Degrees = "Graus " Gradians = "Grados " diff --git a/apps/settings/sub_menu/about_controller_non_official.cpp b/apps/settings/sub_menu/about_controller_non_official.cpp index bf6cff8b2..84995e4a4 100644 --- a/apps/settings/sub_menu/about_controller_non_official.cpp +++ b/apps/settings/sub_menu/about_controller_non_official.cpp @@ -5,8 +5,10 @@ namespace Settings { void AboutController::viewWillAppear() { GenericSubController::viewWillAppear(); + // --------------------- Please don't edit these lines ---------------------- I18n::Message cautionMessages[] = {I18n::Message::AboutWarning1, I18n::Message::AboutWarning2, I18n::Message::AboutWarning3, I18n::Message::AboutWarning4}; m_view.setMessages(cautionMessages, sizeof(cautionMessages)/sizeof(I18n::Message)); + // -------------------------------------------------------------------------- } } diff --git a/apps/settings/sub_menu/exam_mode_controller.cpp b/apps/settings/sub_menu/exam_mode_controller.cpp index 488bb198c..81e066da9 100644 --- a/apps/settings/sub_menu/exam_mode_controller.cpp +++ b/apps/settings/sub_menu/exam_mode_controller.cpp @@ -35,10 +35,12 @@ void ExamModeController::didEnterResponderChain(Responder * previousFirstRespond if (GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) { I18n::Message deactivateMessages[] = {I18n::Message::ToDeactivateExamMode1, I18n::Message::ToDeactivateExamMode2, I18n::Message::ToDeactivateExamMode3}; 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}; m_contentView.setMessages(cautionMessages, numberOfCautionLines()); } + // -------------------------------------------------------------------------- } HighlightCell * ExamModeController::reusableCell(int index, int type) {