From 284207a367ccd346b1766b8201510fcdc33e6ef3 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Tue, 11 Feb 2020 17:55:15 +0100 Subject: [PATCH] [apps/math_toolbox] Remove tera- giga- micro- nano- picoelectronvolt --- apps/math_toolbox.cpp | 6 +----- apps/shared.universal.i18n | 5 ----- apps/toolbox.de.i18n | 5 ----- apps/toolbox.en.i18n | 5 ----- apps/toolbox.es.i18n | 5 ----- apps/toolbox.fr.i18n | 5 ----- apps/toolbox.pt.i18n | 5 ----- 7 files changed, 1 insertion(+), 35 deletions(-) diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp index 5b38ad73c..7ca52a077 100644 --- a/apps/math_toolbox.cpp +++ b/apps/math_toolbox.cpp @@ -167,15 +167,11 @@ const ToolboxMessageTree unitEnergyJouleChildren[] = { }; const ToolboxMessageTree unitEnergyElectronVoltChildren[] = { - ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltTeraSymbol, I18n::Message::UnitEnergyElectronVoltTera), - ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltGigaSymbol, I18n::Message::UnitEnergyElectronVoltGiga), ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltMegaSymbol, I18n::Message::UnitEnergyElectronVoltMega), ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltKiloSymbol, I18n::Message::UnitEnergyElectronVoltKilo), ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltSymbol, I18n::Message::UnitEnergyElectronVolt), ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltMilliSymbol, I18n::Message::UnitEnergyElectronVoltMilli), - ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltMicroSymbol, I18n::Message::UnitEnergyElectronVoltMicro), - ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltNanoSymbol, I18n::Message::UnitEnergyElectronVoltNano), - ToolboxMessageTree::Leaf(I18n::Message::UnitEnergyElectronVoltPicoSymbol, I18n::Message::UnitEnergyElectronVoltPico)}; +}; const ToolboxMessageTree unitEnergyChildren[] = { ToolboxMessageTree::Node(I18n::Message::UnitEnergyJouleMenu, unitEnergyJouleChildren), diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index 52c5eda1f..74a1caddf 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -45,15 +45,10 @@ UnitPressureAtmSymbol = "_atm" UnitEnergyJouleKiloSymbol = "_kJ" UnitEnergyJouleSymbol = "_J" UnitEnergyJouleMilliSymbol = "_mJ" -UnitEnergyElectronVoltTeraSymbol = "_TeV" -UnitEnergyElectronVoltGigaSymbol = "_GeV" UnitEnergyElectronVoltMegaSymbol = "_MeV" UnitEnergyElectronVoltKiloSymbol = "_keV" UnitEnergyElectronVoltSymbol = "_eV" UnitEnergyElectronVoltMilliSymbol = "_meV" -UnitEnergyElectronVoltMicroSymbol = "_μeV" -UnitEnergyElectronVoltNanoSymbol = "_neV" -UnitEnergyElectronVoltPicoSymbol = "_peV" UnitPowerWattTeraSymbol = "_TW" UnitPowerWattGigaSymbol = "_GW" UnitPowerWattMegaSymbol = "_MW" diff --git a/apps/toolbox.de.i18n b/apps/toolbox.de.i18n index 8d722cfbc..a94ea4e87 100644 --- a/apps/toolbox.de.i18n +++ b/apps/toolbox.de.i18n @@ -61,15 +61,10 @@ UnitEnergyJouleKilo = "Kilojoule" UnitEnergyJoule = "Joule" UnitEnergyJouleMilli = "Millijoule" UnitEnergyEletronVoltMenu = "Electronvolt" -UnitEnergyElectronVoltTera = "Teraelectronvolt" -UnitEnergyElectronVoltGiga = "Gigaelectronvolt" UnitEnergyElectronVoltMega = "Megaelectronvolt" UnitEnergyElectronVoltKilo = "Kiloelectronvolt" UnitEnergyElectronVolt = "Electronvolt" UnitEnergyElectronVoltMilli = "Millielectronvolt" -UnitEnergyElectronVoltMicro = "Microelectronvolt" -UnitEnergyElectronVoltNano = "Nanoelectronvolt" -UnitEnergyElectronVoltPico = "Picoelectronvolt" UnitPowerMenu = "Power" UnitPowerWattTera = "Terawatt" UnitPowerWattGiga = "Gigawatt" diff --git a/apps/toolbox.en.i18n b/apps/toolbox.en.i18n index 2ce6d6303..9ebf60470 100644 --- a/apps/toolbox.en.i18n +++ b/apps/toolbox.en.i18n @@ -61,15 +61,10 @@ UnitEnergyJouleKilo = "Kilojoule" UnitEnergyJoule = "Joule" UnitEnergyJouleMilli = "Millijoule" UnitEnergyEletronVoltMenu = "Electronvolt" -UnitEnergyElectronVoltTera = "Teraelectronvolt" -UnitEnergyElectronVoltGiga = "Gigaelectronvolt" UnitEnergyElectronVoltMega = "Megaelectronvolt" UnitEnergyElectronVoltKilo = "Kiloelectronvolt" UnitEnergyElectronVolt = "Electronvolt" UnitEnergyElectronVoltMilli = "Millielectronvolt" -UnitEnergyElectronVoltMicro = "Microelectronvolt" -UnitEnergyElectronVoltNano = "Nanoelectronvolt" -UnitEnergyElectronVoltPico = "Picoelectronvolt" UnitPowerMenu = "Power" UnitPowerWattTera = "Terawatt" UnitPowerWattGiga = "Gigawatt" diff --git a/apps/toolbox.es.i18n b/apps/toolbox.es.i18n index aa3f628f7..f7f6cf3d3 100644 --- a/apps/toolbox.es.i18n +++ b/apps/toolbox.es.i18n @@ -61,15 +61,10 @@ UnitEnergyJouleKilo = "Kilojoule" UnitEnergyJoule = "Joule" UnitEnergyJouleMilli = "Millijoule" UnitEnergyEletronVoltMenu = "Electronvolt" -UnitEnergyElectronVoltTera = "Teraelectronvolt" -UnitEnergyElectronVoltGiga = "Gigaelectronvolt" UnitEnergyElectronVoltMega = "Megaelectronvolt" UnitEnergyElectronVoltKilo = "Kiloelectronvolt" UnitEnergyElectronVolt = "Electronvolt" UnitEnergyElectronVoltMilli = "Millielectronvolt" -UnitEnergyElectronVoltMicro = "Microelectronvolt" -UnitEnergyElectronVoltNano = "Nanoelectronvolt" -UnitEnergyElectronVoltPico = "Picoelectronvolt" UnitPowerMenu = "Power" UnitPowerWattTera = "Terawatt" UnitPowerWattGiga = "Gigawatt" diff --git a/apps/toolbox.fr.i18n b/apps/toolbox.fr.i18n index aaef048cf..c22fe6c13 100644 --- a/apps/toolbox.fr.i18n +++ b/apps/toolbox.fr.i18n @@ -61,15 +61,10 @@ UnitEnergyJouleKilo = "Kilojoule" UnitEnergyJoule = "Joule" UnitEnergyJouleMilli = "Millijoule" UnitEnergyEletronVoltMenu = "Electronvolt" -UnitEnergyElectronVoltTera = "Teraelectronvolt" -UnitEnergyElectronVoltGiga = "Gigaelectronvolt" UnitEnergyElectronVoltMega = "Megaelectronvolt" UnitEnergyElectronVoltKilo = "Kiloelectronvolt" UnitEnergyElectronVolt = "Electronvolt" UnitEnergyElectronVoltMilli = "Millielectronvolt" -UnitEnergyElectronVoltMicro = "Microelectronvolt" -UnitEnergyElectronVoltNano = "Nanoelectronvolt" -UnitEnergyElectronVoltPico = "Picoelectronvolt" UnitPowerMenu = "Puissance" UnitPowerWattTera = "Terawatt" UnitPowerWattGiga = "Gigawatt" diff --git a/apps/toolbox.pt.i18n b/apps/toolbox.pt.i18n index 6aa0b24ca..4fdda3101 100644 --- a/apps/toolbox.pt.i18n +++ b/apps/toolbox.pt.i18n @@ -61,15 +61,10 @@ UnitEnergyJouleKilo = "Kilojoule" UnitEnergyJoule = "Joule" UnitEnergyJouleMilli = "Millijoule" UnitEnergyEletronVoltMenu = "Electronvolt" -UnitEnergyElectronVoltTera = "Teraelectronvolt" -UnitEnergyElectronVoltGiga = "Gigaelectronvolt" UnitEnergyElectronVoltMega = "Megaelectronvolt" UnitEnergyElectronVoltKilo = "Kiloelectronvolt" UnitEnergyElectronVolt = "Electronvolt" UnitEnergyElectronVoltMilli = "Millielectronvolt" -UnitEnergyElectronVoltMicro = "Microelectronvolt" -UnitEnergyElectronVoltNano = "Nanoelectronvolt" -UnitEnergyElectronVoltPico = "Picoelectronvolt" UnitPowerMenu = "Power" UnitPowerWattTera = "Terawatt" UnitPowerWattGiga = "Gigawatt"