From 6253ecd84dd35299a9a32d48fb9fea87a45d3401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Wed, 5 Apr 2017 15:33:48 +0200
Subject: [PATCH] [apps/shared] Change title of zoom (interactive zoom) and
 initialization (predefined zoom)

Change-Id: Ice1c1a86b6beb4305e43b27f3a418478b3833d23
---
 apps/i18n.cpp                                           | 4 +---
 apps/i18n.h                                             | 2 --
 apps/regression/initialisation_parameter_controller.cpp | 2 +-
 apps/shared/initialisation_parameter_controller.cpp     | 2 +-
 apps/shared/zoom_parameter_controller.cpp               | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/i18n.cpp b/apps/i18n.cpp
index b602359fa..f3093eaf1 100644
--- a/apps/i18n.cpp
+++ b/apps/i18n.cpp
@@ -17,7 +17,7 @@ constexpr static char deviationFrenchDefinition[] = {Ion::Charset::SmallSigma, '
 constexpr static char deviationEnglishDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'S', 't', 'a', 'n', 'd', 'a', 'r', 'd', ' ','d','e', 'v', 'i', 'a', 't','i','o','n', 0};
 constexpr static char deviationSpanishDefinition[] = {Ion::Charset::SmallSigma, ' ', ':', ' ', 'D', 'e','s','v','i','a','c','i','o','n',' ','t','i','p','i','c','a',0};
 
-const char * messages[203][3] {
+const char * messages[201][3] {
   {"Attention", "Warning", "Cuidado"},
   {"Valider", "Confirm", "Confirmar"},
   {"Suivant", "Next", "Siguiente"},
@@ -104,8 +104,6 @@ const char * messages[203][3] {
   {"Aucune fonction activee", "No function is turned on", "Ninguna funcion activada"},
   {"Axes", "Axes", "Ejes"},
   {"Zoom", "Zoom", "Zoom"},
-  {"Zoom interactif", "Interactive zoom", "Zoom interactivo"},
-  {"Zoom predefini", "Predefined zoom", "Zoom predefinido"},
   {"Initialisation", "Preadjustment", "Inicializacion"},
   {" Deplacer : ", "Move: ", "Mover : "},
   {"Zoomer : ", "Zoom: ", "Zoom : "},
diff --git a/apps/i18n.h b/apps/i18n.h
index 6e4cf6a55..09a890077 100644
--- a/apps/i18n.h
+++ b/apps/i18n.h
@@ -89,8 +89,6 @@ namespace I18n {
     NoActivatedFunction,
     Axis,
     Zoom,
-    InteractiveZoom,
-    PredefinedZoom,
     Initialization,
     Move,
     ToZoom,
diff --git a/apps/regression/initialisation_parameter_controller.cpp b/apps/regression/initialisation_parameter_controller.cpp
index 39c923852..653bb4c13 100644
--- a/apps/regression/initialisation_parameter_controller.cpp
+++ b/apps/regression/initialisation_parameter_controller.cpp
@@ -15,7 +15,7 @@ InitialisationParameterController::InitialisationParameterController(Responder *
 }
 
 const char * InitialisationParameterController::title() {
-  return I18n::translate(I18n::Message::PredefinedZoom);
+  return I18n::translate(I18n::Message::Initialization);
 }
 
 View * InitialisationParameterController::view() {
diff --git a/apps/shared/initialisation_parameter_controller.cpp b/apps/shared/initialisation_parameter_controller.cpp
index 2e2f4807e..035f7bc92 100644
--- a/apps/shared/initialisation_parameter_controller.cpp
+++ b/apps/shared/initialisation_parameter_controller.cpp
@@ -13,7 +13,7 @@ InitialisationParameterController::InitialisationParameterController(Responder *
 }
 
 const char * InitialisationParameterController::title() {
-  return I18n::translate(I18n::Message::PredefinedZoom);
+  return I18n::translate(I18n::Message::Initialization);
 }
 
 View * InitialisationParameterController::view() {
diff --git a/apps/shared/zoom_parameter_controller.cpp b/apps/shared/zoom_parameter_controller.cpp
index 916eebf8d..8c73b3efc 100644
--- a/apps/shared/zoom_parameter_controller.cpp
+++ b/apps/shared/zoom_parameter_controller.cpp
@@ -12,7 +12,7 @@ ZoomParameterController::ZoomParameterController(Responder * parentResponder, In
 }
 
 const char * ZoomParameterController::title() {
-  return I18n::translate(I18n::Message::InteractiveZoom);
+  return I18n::translate(I18n::Message::Zoom);
 }
 
 View * ZoomParameterController::view() {