From 1adefc3bc4b4161cd4034c11f8b7fc1dd02d8a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 9 Oct 2018 10:54:34 +0200 Subject: [PATCH] [typo] "Desactivate" -> "Deactivate" --- apps/exam_pop_up_controller.cpp | 2 +- apps/global_preferences.h | 4 ++-- apps/shared.de.i18n | 2 +- apps/shared.en.i18n | 2 +- apps/shared.es.i18n | 2 +- apps/shared.fr.i18n | 2 +- apps/shared.pt.i18n | 2 +- apps/shared/list_parameter_controller.cpp | 2 +- apps/shared/storage_list_parameter_controller.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/exam_pop_up_controller.cpp b/apps/exam_pop_up_controller.cpp index 0a0cb85c3..364f95899 100644 --- a/apps/exam_pop_up_controller.cpp +++ b/apps/exam_pop_up_controller.cpp @@ -53,7 +53,7 @@ ExamPopUpController::ContentView::ContentView(Responder * parentResponder) : }, parentResponder), KDFont::SmallFont), m_okButton(parentResponder, I18n::Message::Ok, Invocation([](void * context, void * sender) { ExamPopUpController * controller = (ExamPopUpController *)context; - GlobalPreferences::ExamMode nextExamMode = controller->isActivatingExamMode() ? GlobalPreferences::ExamMode::Activate : GlobalPreferences::ExamMode::Desactivate; + GlobalPreferences::ExamMode nextExamMode = controller->isActivatingExamMode() ? GlobalPreferences::ExamMode::Activate : GlobalPreferences::ExamMode::Deactivate; GlobalPreferences::sharedGlobalPreferences()->setExamMode(nextExamMode); AppsContainer * container = (AppsContainer *)controller->app()->container(); if (controller->isActivatingExamMode()) { diff --git a/apps/global_preferences.h b/apps/global_preferences.h index 361ee5047..da338d7a6 100644 --- a/apps/global_preferences.h +++ b/apps/global_preferences.h @@ -7,7 +7,7 @@ class GlobalPreferences { public: enum class ExamMode { Activate, - Desactivate + Deactivate }; static GlobalPreferences * sharedGlobalPreferences(); I18n::Language language() const; @@ -24,7 +24,7 @@ public: private: GlobalPreferences() : m_language(I18n::Language::EN), - m_examMode(ExamMode::Desactivate), + m_examMode(ExamMode::Deactivate), #ifdef EPSILON_BOOT_PROMPT m_showPopUp(true), #endif diff --git a/apps/shared.de.i18n b/apps/shared.de.i18n index 7945477fa..b51dab0c2 100644 --- a/apps/shared.de.i18n +++ b/apps/shared.de.i18n @@ -1,4 +1,4 @@ -ActivateDesactivate = "Aktivieren/Deaktivieren" +ActivateDeactivate = "Aktivieren/Deaktivieren" ActiveExamModeMessage1 = "Alle Ihre Daten werden " ActiveExamModeMessage2 = "geloescht, wenn Sie den " ActiveExamModeMessage3 = "Testmodus einschalten." diff --git a/apps/shared.en.i18n b/apps/shared.en.i18n index 290eb30fe..b4261e628 100644 --- a/apps/shared.en.i18n +++ b/apps/shared.en.i18n @@ -1,4 +1,4 @@ -ActivateDesactivate = "Turn on/off" +ActivateDeactivate = "Turn on/off" ActiveExamModeMessage1 = "All your data will be " ActiveExamModeMessage2 = "deleted when you activate " ActiveExamModeMessage3 = "the exam mode." diff --git a/apps/shared.es.i18n b/apps/shared.es.i18n index ee188e9d1..3270b96df 100644 --- a/apps/shared.es.i18n +++ b/apps/shared.es.i18n @@ -1,4 +1,4 @@ -ActivateDesactivate = "Activar/Desactivar" +ActivateDeactivate = "Activar/Desactivar" ActiveExamModeMessage1 = "Todos sus datos se " ActiveExamModeMessage2 = "eliminaran al activar " ActiveExamModeMessage3 = "el modo examen." diff --git a/apps/shared.fr.i18n b/apps/shared.fr.i18n index 48f3b180d..8d064edd4 100644 --- a/apps/shared.fr.i18n +++ b/apps/shared.fr.i18n @@ -1,4 +1,4 @@ -ActivateDesactivate = "Activer/Desactiver" +ActivateDeactivate = "Activer/Desactiver" ActiveExamModeMessage1 = "Toutes vos donnees seront " ActiveExamModeMessage2 = "supprimees si vous activez " ActiveExamModeMessage3 = "le mode examen." diff --git a/apps/shared.pt.i18n b/apps/shared.pt.i18n index e09a4c1a3..c6baab16c 100644 --- a/apps/shared.pt.i18n +++ b/apps/shared.pt.i18n @@ -1,4 +1,4 @@ -ActivateDesactivate = "Activar/Desactivar" +ActivateDeactivate = "Activar/Desactivar" ActiveExamModeMessage1 = "Todos os seus dados serao " ActiveExamModeMessage2 = "apagados se voce ligar " ActiveExamModeMessage3 = "o modo de exame." diff --git a/apps/shared/list_parameter_controller.cpp b/apps/shared/list_parameter_controller.cpp index 1c6ce6b36..845112371 100644 --- a/apps/shared/list_parameter_controller.cpp +++ b/apps/shared/list_parameter_controller.cpp @@ -11,7 +11,7 @@ ListParameterController::ListParameterController(Responder * parentResponder, Fu #if FUNCTION_COLOR_CHOICE m_colorCell(functionColorMessage), #endif - m_enableCell(I18n::Message::ActivateDesactivate), + m_enableCell(I18n::Message::ActivateDeactivate), m_deleteCell(deleteFunctionMessage) { } diff --git a/apps/shared/storage_list_parameter_controller.h b/apps/shared/storage_list_parameter_controller.h index 5a7701ed8..c9536ab0e 100644 --- a/apps/shared/storage_list_parameter_controller.h +++ b/apps/shared/storage_list_parameter_controller.h @@ -19,7 +19,7 @@ public: #if FUNCTION_COLOR_CHOICE m_colorCell(functionColorMessage), #endif - m_enableCell(I18n::Message::ActivateDesactivate), + m_enableCell(I18n::Message::ActivateDeactivate), m_deleteCell(deleteFunctionMessage) {}