From e6397d7093ad0c7b008693b5e48de741d2ee425e Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Tue, 11 Feb 2020 17:17:37 +0100 Subject: [PATCH] [apps/math_toolbox] Remove tera- giga- mega- picogram --- apps/math_toolbox.cpp | 5 +---- apps/shared.universal.i18n | 4 ---- apps/toolbox.de.i18n | 4 ---- apps/toolbox.en.i18n | 4 ---- apps/toolbox.es.i18n | 4 ---- apps/toolbox.fr.i18n | 4 ---- apps/toolbox.pt.i18n | 4 ---- 7 files changed, 1 insertion(+), 28 deletions(-) diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp index 61890c0f9..305d4c0f5 100644 --- a/apps/math_toolbox.cpp +++ b/apps/math_toolbox.cpp @@ -116,15 +116,12 @@ const ToolboxMessageTree unitDistanceChildren[] = { ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceParsecSymbol, I18n::Message::UnitDistanceParsec)}; const ToolboxMessageTree unitMassGramChildren[] = { - ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramTeraSymbol, I18n::Message::UnitMassGramTera), - ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramGigaSymbol, I18n::Message::UnitMassGramGiga), - ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramMegaSymbol, I18n::Message::UnitMassGramMega), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramKiloSymbol, I18n::Message::UnitMassGramKilo), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramSymbol, I18n::Message::UnitMassGram), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramMilliSymbol, I18n::Message::UnitMassGramMilli), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramMicroSymbol, I18n::Message::UnitMassGramMicro), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramNanoSymbol, I18n::Message::UnitMassGramNano), - ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramPicoSymbol, I18n::Message::UnitMassGramPico),}; +}; const ToolboxMessageTree unitMassChildren[] = { ToolboxMessageTree::Node(I18n::Message::UnitMassGramMenu, unitMassGramChildren), diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index 50ae71b26..16b03fc8e 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -17,15 +17,11 @@ UnitDistanceMeterPicoSymbol = "_pm" UnitDistanceAstronomicalUnitSymbol = "_au" UnitDistanceLightYearSymbol = "_ly" UnitDistanceParsecSymbol = "_pc" -UnitMassGramTeraSymbol = "_Tg" -UnitMassGramGigaSymbol = "_Gg" -UnitMassGramMegaSymbol = "_Mg" UnitMassGramKiloSymbol = "_kg" UnitMassGramSymbol = "_g" UnitMassGramMilliSymbol = "_mg" UnitMassGramMicroSymbol = "_μg" UnitMassGramNanoSymbol = "_ng" -UnitMassGramPicoSymbol = "_pg" UnitMassTonneSymbol = "_t" UnitCurrentAmpereSymbol = "_A" UnitCurrentAmpereMilliSymbol = "_mA" diff --git a/apps/toolbox.de.i18n b/apps/toolbox.de.i18n index ba7bbf26c..44eb713f3 100644 --- a/apps/toolbox.de.i18n +++ b/apps/toolbox.de.i18n @@ -24,15 +24,11 @@ UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" UnitMassMenu = "Mass" UnitMassGramMenu = "Gram" -UnitMassGramTera = "Teragram" -UnitMassGramGiga = "Gigagram" -UnitMassGramMega = "Megagram" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" UnitMassGramMilli = "Milligram" UnitMassGramMicro = "Microgram" UnitMassGramNano = "Nanogram" -UnitMassGramPico = "Picogram" UnitMassTonne = "Tonne" UnitCurrentMenu = "Electric current" UnitCurrentAmpere = "Ampere" diff --git a/apps/toolbox.en.i18n b/apps/toolbox.en.i18n index 4d024c857..b1924db93 100644 --- a/apps/toolbox.en.i18n +++ b/apps/toolbox.en.i18n @@ -24,15 +24,11 @@ UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" UnitMassMenu = "Mass" UnitMassGramMenu = "Gram" -UnitMassGramTera = "Teragram" -UnitMassGramGiga = "Gigagram" -UnitMassGramMega = "Megagram" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" UnitMassGramMilli = "Milligram" UnitMassGramMicro = "Microgram" UnitMassGramNano = "Nanogram" -UnitMassGramPico = "Picogram" UnitMassTonne = "Tonne" UnitCurrentMenu = "Electric current" UnitCurrentAmpere = "Ampere" diff --git a/apps/toolbox.es.i18n b/apps/toolbox.es.i18n index caac7ae4d..d8349b6eb 100644 --- a/apps/toolbox.es.i18n +++ b/apps/toolbox.es.i18n @@ -24,15 +24,11 @@ UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" UnitMassMenu = "Mass" UnitMassGramMenu = "Gram" -UnitMassGramTera = "Teragram" -UnitMassGramGiga = "Gigagram" -UnitMassGramMega = "Megagram" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" UnitMassGramMilli = "Milligram" UnitMassGramMicro = "Microgram" UnitMassGramNano = "Nanogram" -UnitMassGramPico = "Picogram" UnitMassTonne = "Tonne" UnitCurrentMenu = "Electric current" UnitCurrentAmpere = "Ampere" diff --git a/apps/toolbox.fr.i18n b/apps/toolbox.fr.i18n index 5cf4db660..868d96e9e 100644 --- a/apps/toolbox.fr.i18n +++ b/apps/toolbox.fr.i18n @@ -24,15 +24,11 @@ UnitDistanceLightYear = "Année lumière" UnitDistanceParsec = "Parsec" UnitMassMenu = "Masse" UnitMassGramMenu = "Gramme" -UnitMassGramTera = "Teragramme" -UnitMassGramGiga = "Gigagramme" -UnitMassGramMega = "Megagramme" UnitMassGramKilo = "Kilogramme" UnitMassGram = "Gramme" UnitMassGramMilli = "Milligramme" UnitMassGramMicro = "Microgramme" UnitMassGramNano = "Nanogramme" -UnitMassGramPico = "Picogramme" UnitMassTonne = "Tonne" UnitCurrentMenu = "Intensité du courant électrique" UnitCurrentAmpere = "Ampère" diff --git a/apps/toolbox.pt.i18n b/apps/toolbox.pt.i18n index e542a7e6e..2f66baadb 100644 --- a/apps/toolbox.pt.i18n +++ b/apps/toolbox.pt.i18n @@ -24,15 +24,11 @@ UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" UnitMassMenu = "Mass" UnitMassGramMenu = "Gram" -UnitMassGramTera = "Teragram" -UnitMassGramGiga = "Gigagram" -UnitMassGramMega = "Megagram" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" UnitMassGramMilli = "Milligram" UnitMassGramMicro = "Microgram" UnitMassGramNano = "Nanogram" -UnitMassGramPico = "Picogram" UnitMassTonne = "Tonne" UnitCurrentMenu = "Electric current" UnitCurrentAmpere = "Ampere"