From c1b0465ca45ef59b8a53a16d280b60ce421d5ce1 Mon Sep 17 00:00:00 2001 From: Gabriel Ozouf Date: Tue, 22 Sep 2020 11:15:43 +0200 Subject: [PATCH] [apps/i18n] Add 'Metric' message 'Metric' is used to label the toolbox sub-menus containing metric units when the selected country uses the imperial system. Change-Id: I6f40bcd3151be614a5a02cdd17c70ea4a91bfc00 --- apps/math_toolbox.cpp | 6 +++--- apps/toolbox.de.i18n | 1 + apps/toolbox.en.i18n | 1 + apps/toolbox.es.i18n | 1 + apps/toolbox.fr.i18n | 1 + apps/toolbox.it.i18n | 1 + apps/toolbox.nl.i18n | 1 + apps/toolbox.pt.i18n | 1 + 8 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp index eb828a244..49c4f584c 100644 --- a/apps/math_toolbox.cpp +++ b/apps/math_toolbox.cpp @@ -121,7 +121,7 @@ constexpr ToolboxMessageTree unitDistanceYard = ToolboxMessageTree::Leaf(I18n::M constexpr ToolboxMessageTree unitDistanceMile = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMileSymbol, I18n::Message::UnitDistanceMile); const ToolboxMessageTree * unitDistanceMeterChildren[] = {&unitDistanceMeterPico, &unitDistanceMeterNano, &unitDistanceMeterMicro, &unitDistanceMeterMilli, &unitDistanceMeter, &unitDistanceMeterKilo}; -const ToolboxMessageTree unitDistanceMeterNode = ToolboxMessageTree::Node(I18n::Message::UnitDistanceMeter, unitDistanceMeterChildren); +const ToolboxMessageTree unitDistanceMeterNode = ToolboxMessageTree::Node(I18n::Message::UnitMetricMenu, unitDistanceMeterChildren); const ToolboxMessageTree * unitDistanceChildrenForImperialToolbox[] = { &unitDistanceInch, &unitDistanceFoot, @@ -162,7 +162,7 @@ constexpr ToolboxMessageTree unitMassShortTon = ToolboxMessageTree::Leaf(I18n::M constexpr ToolboxMessageTree unitMassLongTon = ToolboxMessageTree::Leaf(I18n::Message::UnitMassLongTonSymbol, I18n::Message::UnitMassLongTon); const ToolboxMessageTree * unitMassGramChildren[] = {&unitMassGramMicro, &unitMassGramMilli, &unitMassGram, &unitMassGramKilo, &unitMassTonne}; -const ToolboxMessageTree unitMassGramNode = ToolboxMessageTree::Node(I18n::Message::UnitMassGram, unitMassGramChildren); +const ToolboxMessageTree unitMassGramNode = ToolboxMessageTree::Node(I18n::Message::UnitMetricMenu, unitMassGramChildren); const ToolboxMessageTree * unitMassChildrenForImperialToolbox[] = { &unitMassOunce, &unitMassPound, @@ -308,7 +308,7 @@ constexpr ToolboxMessageTree unitVolumeQuart = ToolboxMessageTree::Leaf(I18n::Me constexpr ToolboxMessageTree unitVolumeGallon = ToolboxMessageTree::Leaf(I18n::Message::UnitVolumeGallonSymbol, I18n::Message::UnitVolumeGallon); const ToolboxMessageTree * unitVolumeLiterChildren[] = {&unitVolumeLiterMilli, &unitVolumeLiterCenti, &unitVolumeLiterDeci, &unitVolumeLiter}; -const ToolboxMessageTree unitVolumeLiterNode = ToolboxMessageTree::Node(I18n::Message::UnitVolumeLiter, unitVolumeLiterChildren); +const ToolboxMessageTree unitVolumeLiterNode = ToolboxMessageTree::Node(I18n::Message::UnitMetricMenu, unitVolumeLiterChildren); const ToolboxMessageTree * unitVolumeChildrenForImperialToolbox[] = { &unitVolumeTeaspoon, &unitVolumeTablespoon, diff --git a/apps/toolbox.de.i18n b/apps/toolbox.de.i18n index f5d5d8634..5cbe2768e 100644 --- a/apps/toolbox.de.i18n +++ b/apps/toolbox.de.i18n @@ -91,6 +91,7 @@ UnitVolumeCup = "Tasse" UnitVolumePint = "Pint" UnitVolumeQuart = "Quart" UnitVolumeGallon = "Gallone" +UnitMetricMenu = "Metrisch" UnitImperialMenu = "Empire" Toolbox = "Werkzeugkasten" AbsoluteValue = "Betragsfunktion" diff --git a/apps/toolbox.en.i18n b/apps/toolbox.en.i18n index becb8628e..32a26a0c7 100644 --- a/apps/toolbox.en.i18n +++ b/apps/toolbox.en.i18n @@ -91,6 +91,7 @@ UnitVolumeCup = "Cup" UnitVolumePint = "Pint" UnitVolumeQuart = "Quart" UnitVolumeGallon = "Gallon" +UnitMetricMenu = "Metric" UnitImperialMenu = "Imperial" Toolbox = "Toolbox" AbsoluteValue = "Absolute value" diff --git a/apps/toolbox.es.i18n b/apps/toolbox.es.i18n index 77166234b..7b665f55a 100644 --- a/apps/toolbox.es.i18n +++ b/apps/toolbox.es.i18n @@ -91,6 +91,7 @@ UnitVolumeCup = "Taza" UnitVolumePint = "Pinta" UnitVolumeQuart = "Cuarto" UnitVolumeGallon = "Galón" +UnitMetricMenu = "Métrico" UnitImperialMenu = "Imperial" Toolbox = "Caja de herramientas" AbsoluteValue = "Valor absoluto" diff --git a/apps/toolbox.fr.i18n b/apps/toolbox.fr.i18n index b2ecff04f..1b74fe818 100644 --- a/apps/toolbox.fr.i18n +++ b/apps/toolbox.fr.i18n @@ -91,6 +91,7 @@ UnitVolumeCup = "Tasse" UnitVolumePint = "Pinte" UnitVolumeQuart = "Quart" UnitVolumeGallon = "Gallon" +UnitMetricMenu = "Métrique" UnitImperialMenu = "Impérial" Toolbox = "Boîte à outils" AbsoluteValue = "Valeur absolue" diff --git a/apps/toolbox.it.i18n b/apps/toolbox.it.i18n index b9a149866..aa96c0474 100644 --- a/apps/toolbox.it.i18n +++ b/apps/toolbox.it.i18n @@ -91,6 +91,7 @@ UnitVolumeCup = "Tazza" UnitVolumePint = "Pinta" UnitVolumeQuart = "Quarto" UnitVolumeGallon = "Gallone" +UnitMetricMenu = "Metrico" UnitImperialMenu = "Imperiale" Toolbox = "Toolbox" AbsoluteValue = "Valore assoluto" diff --git a/apps/toolbox.nl.i18n b/apps/toolbox.nl.i18n index bf80e5c8f..bdf5a50ff 100644 --- a/apps/toolbox.nl.i18n +++ b/apps/toolbox.nl.i18n @@ -91,6 +91,7 @@ UnitVolumeCup = "Kop" UnitVolumePint = "Pint" UnitVolumeQuart = "Quart" UnitVolumeGallon = "Gallon" +UnitMetricMenu = "Metriek" UnitImperialMenu = "Imperiaal" Toolbox = "Toolbox" AbsoluteValue = "Absolute waarde" diff --git a/apps/toolbox.pt.i18n b/apps/toolbox.pt.i18n index 90d7fffa4..f0779e3d5 100644 --- a/apps/toolbox.pt.i18n +++ b/apps/toolbox.pt.i18n @@ -91,6 +91,7 @@ UnitVolumeCup = "Xícara de chá" UnitVolumePint = "Quartilho" UnitVolumeQuart = "Quarto" UnitVolumeGallon = "Galão" +UnitMetricMenu = "Métrico" UnitImperialMenu = "Imperial" Toolbox = "Caixa de ferramentas" AbsoluteValue = "Valor absoluto"