From e74f0b1a9faef0e329d7f28cb13da0aacdab1994 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Mon, 10 Feb 2020 16:54:24 +0100 Subject: [PATCH] [apps/math_toolbox] Shortcut Ohm menu --- apps/math_toolbox.cpp | 5 +---- apps/toolbox.de.i18n | 1 - apps/toolbox.en.i18n | 1 - apps/toolbox.es.i18n | 1 - apps/toolbox.fr.i18n | 1 - apps/toolbox.pt.i18n | 1 - 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp index e07b83b00..641149fc5 100644 --- a/apps/math_toolbox.cpp +++ b/apps/math_toolbox.cpp @@ -269,9 +269,6 @@ const ToolboxMessageTree unitResistanceOhmChildren[] = { ToolboxMessageTree::Leaf(I18n::Message::UnitResistanceOhmNanoSymbol, I18n::Message::UnitResistanceOhmNano), ToolboxMessageTree::Leaf(I18n::Message::UnitResistanceOhmPicoSymbol, I18n::Message::UnitResistanceOhmPico)}; -const ToolboxMessageTree unitResistanceChildren[] = { - ToolboxMessageTree::Node(I18n::Message::UnitResistanceOhmMenu, unitResistanceOhmChildren)}; - const ToolboxMessageTree unitConductanceSiemensChildren[] = { ToolboxMessageTree::Leaf(I18n::Message::UnitConductanceSiemensTeraSymbol, I18n::Message::UnitConductanceSiemensTera), ToolboxMessageTree::Leaf(I18n::Message::UnitConductanceSiemensGigaSymbol, I18n::Message::UnitConductanceSiemensGiga), @@ -323,7 +320,7 @@ const ToolboxMessageTree unitChildren[] = { ToolboxMessageTree::Node(I18n::Message::UnitElectricChargeMenu, unitElectricChargeCoulombChildren), ToolboxMessageTree::Node(I18n::Message::UnitPotentialMenu, unitPotentialVoltChildren), ToolboxMessageTree::Node(I18n::Message::UnitCapacitanceMenu, unitCapacitanceFaradChildren), - ToolboxMessageTree::Node(I18n::Message::UnitResistanceMenu, unitResistanceChildren), + ToolboxMessageTree::Node(I18n::Message::UnitResistanceMenu, unitResistanceOhmChildren), ToolboxMessageTree::Node(I18n::Message::UnitConductanceMenu, unitConductanceChildren), ToolboxMessageTree::Node(I18n::Message::UnitMagneticFieldMenu, unitMagneticFieldChildren), ToolboxMessageTree::Node(I18n::Message::InductanceMenu, unitInductanceChildren), diff --git a/apps/toolbox.de.i18n b/apps/toolbox.de.i18n index b230d0bf5..a7e4e4d28 100644 --- a/apps/toolbox.de.i18n +++ b/apps/toolbox.de.i18n @@ -145,7 +145,6 @@ UnitCapacitanceFaradMicro = "Microfarad" UnitCapacitanceFaradNano = "Nanofarad" UnitCapacitanceFaradPico = "Picofarad" UnitResistanceMenu = "Electrical resistance" -UnitResistanceOhmMenu = "Ohm" UnitResistanceOhmTera = "Teraohm" UnitResistanceOhmGiga = "Gigaohm" UnitResistanceOhmMega = "Megaohm" diff --git a/apps/toolbox.en.i18n b/apps/toolbox.en.i18n index 9c066be3a..ee81fa938 100644 --- a/apps/toolbox.en.i18n +++ b/apps/toolbox.en.i18n @@ -145,7 +145,6 @@ UnitCapacitanceFaradMicro = "Microfarad" UnitCapacitanceFaradNano = "Nanofarad" UnitCapacitanceFaradPico = "Picofarad" UnitResistanceMenu = "Electrical resistance" -UnitResistanceOhmMenu = "Ohm" UnitResistanceOhmTera = "Teraohm" UnitResistanceOhmGiga = "Gigaohm" UnitResistanceOhmMega = "Megaohm" diff --git a/apps/toolbox.es.i18n b/apps/toolbox.es.i18n index 6976ca250..087f727f2 100644 --- a/apps/toolbox.es.i18n +++ b/apps/toolbox.es.i18n @@ -145,7 +145,6 @@ UnitCapacitanceFaradMicro = "Microfarad" UnitCapacitanceFaradNano = "Nanofarad" UnitCapacitanceFaradPico = "Picofarad" UnitResistanceMenu = "Electrical resistance" -UnitResistanceOhmMenu = "Ohm" UnitResistanceOhmTera = "Teraohm" UnitResistanceOhmGiga = "Gigaohm" UnitResistanceOhmMega = "Megaohm" diff --git a/apps/toolbox.fr.i18n b/apps/toolbox.fr.i18n index e4aa0b2ef..3a7e6a601 100644 --- a/apps/toolbox.fr.i18n +++ b/apps/toolbox.fr.i18n @@ -145,7 +145,6 @@ UnitCapacitanceFaradMicro = "Microfarad" UnitCapacitanceFaradNano = "Nanofarad" UnitCapacitanceFaradPico = "Picofarad" UnitResistanceMenu = "Résistance électrique" -UnitResistanceOhmMenu = "Ohm" UnitResistanceOhmTera = "Teraohm" UnitResistanceOhmGiga = "Gigaohm" UnitResistanceOhmMega = "Megaohm" diff --git a/apps/toolbox.pt.i18n b/apps/toolbox.pt.i18n index 4914e946b..2e3e9f336 100644 --- a/apps/toolbox.pt.i18n +++ b/apps/toolbox.pt.i18n @@ -145,7 +145,6 @@ UnitCapacitanceFaradMicro = "Microfarad" UnitCapacitanceFaradNano = "Nanofarad" UnitCapacitanceFaradPico = "Picofarad" UnitResistanceMenu = "Electrical resistance" -UnitResistanceOhmMenu = "Ohm" UnitResistanceOhmTera = "Teraohm" UnitResistanceOhmGiga = "Gigaohm" UnitResistanceOhmMega = "Megaohm"