From 1fb84e31e18ab80a8ff358e615c3bfbbbfc6c8ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Tue, 25 Sep 2018 11:28:27 +0200
Subject: [PATCH] [settings] Change wording of Result Formal & Complex Format:
 Auto-->Decimal, Cartesian & Polar

---
 apps/settings/base.de.i18n        | 4 +++-
 apps/settings/base.en.i18n        | 4 +++-
 apps/settings/base.es.i18n        | 4 +++-
 apps/settings/base.fr.i18n        | 4 +++-
 apps/settings/base.pt.i18n        | 4 +++-
 apps/settings/main_controller.cpp | 4 ++--
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n
index 5f8f446d6..ec4f58b99 100644
--- a/apps/settings/base.de.i18n
+++ b/apps/settings/base.de.i18n
@@ -12,9 +12,11 @@ ExamModeActive = "Testmodus: aktiv"
 About = "UEber"
 Degres = "Grad "
 Radian = "Bogenmass "
-Auto = "Auto "
+Decimal = "Dezimal "
 Scientific = "Wissenschaftlich "
 SignificantFigures = "Signifikante Stellen "
+Cartesian = "Kartesisch "
+Polar = "Polar "
 Brightness = "Helligkeit"
 SoftwareVersion = "Softwareversion"
 SerialNumber = "Seriennummer"
diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n
index ee51a6f23..091f6c544 100644
--- a/apps/settings/base.en.i18n
+++ b/apps/settings/base.en.i18n
@@ -12,9 +12,11 @@ ExamModeActive = "Exam mode: active"
 About = "About"
 Degres = "Degrees "
 Radian = "Radians "
-Auto = "Auto "
+Decimal = "Decimal "
 Scientific = "Scientific "
 SignificantFigures = "Significant figures "
+Cartesian = "Cartesian "
+Polar = "Polar "
 Brightness = "Brightness"
 SoftwareVersion = "Software version"
 SerialNumber = "Serial number"
diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n
index d4b6a3907..72956c600 100644
--- a/apps/settings/base.es.i18n
+++ b/apps/settings/base.es.i18n
@@ -12,9 +12,11 @@ ExamModeActive = "Modo examen: activo"
 About = "Acerca"
 Degres = "Grados "
 Radian = "Radianes "
-Auto = "Auto "
+Decimal = "Decimal "
 Scientific = "Cientifico "
 SignificantFigures = "Cifras significativas "
+Cartesian = "Rectangular "
+Polar = "Polar "
 Brightness = "Brillo"
 SoftwareVersion = "Version de software"
 SerialNumber = "Numero serie"
diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n
index fc2922fa3..f1eea88df 100644
--- a/apps/settings/base.fr.i18n
+++ b/apps/settings/base.fr.i18n
@@ -12,9 +12,11 @@ ExamModeActive = "Mode examen: actif"
 About = "A propos"
 Degres = "Degres "
 Radian = "Radians "
-Auto = "Auto "
+Decimal = "Decimal "
 Scientific = "Scientifique "
 SignificantFigures = "Chiffres significatifs "
+Cartesian = "Cartésien "
+Polar = "Polaire "
 Brightness = "Luminosite"
 SoftwareVersion = "Version du logiciel"
 SerialNumber = "Numero serie"
diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n
index a7443e5f6..9ebff7b8e 100644
--- a/apps/settings/base.pt.i18n
+++ b/apps/settings/base.pt.i18n
@@ -12,9 +12,11 @@ ExamModeActive = "Modo de exame : ativo"
 About = "Acerca"
 Degres = "Graus "
 Radian = "Radianos "
-Auto = "Auto "
+Decimal = "Decimal "
 Scientific = "Cientifico "
 SignificantFigures = "Algarismo significativo "
+Cartesian = "Cartesiano "
+Polar = "Polar "
 Brightness = "Brilho"
 SoftwareVersion = "Versao do software"
 SerialNumber = "Numero serie"
diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp
index 43ded3bd5..7fd26fcec 100644
--- a/apps/settings/main_controller.cpp
+++ b/apps/settings/main_controller.cpp
@@ -10,8 +10,8 @@ namespace Settings {
 
 const SettingsMessageTree angleChildren[2] = {SettingsMessageTree(I18n::Message::Degres), SettingsMessageTree(I18n::Message::Radian)};
 const SettingsMessageTree editionModeChildren[2] = {SettingsMessageTree(I18n::Message::EditionLinear), SettingsMessageTree(I18n::Message::Edition2D)};
-const SettingsMessageTree floatDisplayModeChildren[3] = {SettingsMessageTree(I18n::Message::Auto), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::SignificantFigures)};
-const SettingsMessageTree complexFormatChildren[2] = {SettingsMessageTree(I18n::Message::Default), SettingsMessageTree(I18n::Message::Default)};
+const SettingsMessageTree floatDisplayModeChildren[3] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::SignificantFigures)};
+const SettingsMessageTree complexFormatChildren[2] = {SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
 const SettingsMessageTree examChildren[1] = {SettingsMessageTree(I18n::Message::ActivateExamMode)};
 const SettingsMessageTree aboutChildren[3] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId)};