Merge branch 'UpsilonNumworks:upsilon-dev' into mickbot-92-patch-1

UpsilonNumworks · Apr 9, 2024 · 3baab60 · 3baab60
2 parents 7fb6f42 + 5e83c03
commit 3baab60
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 91 deletions.
diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp
@@ -117,6 +117,7 @@ constexpr ToolboxMessageTree unitDistanceMeterPico = ToolboxMessageTree::Leaf(I1
 constexpr ToolboxMessageTree unitDistanceMeterNano = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterNanoSymbol, I18n::Message::UnitDistanceMeterNano);
 constexpr ToolboxMessageTree unitDistanceMeterMicro = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterMicroSymbol, I18n::Message::UnitDistanceMeterMicro);
 constexpr ToolboxMessageTree unitDistanceMeterMilli = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterMilliSymbol, I18n::Message::UnitDistanceMeterMilli);
+constexpr ToolboxMessageTree unitDistanceMeterCenti = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterCentiSymbol, I18n::Message::UnitDistanceMeterCenti);
 constexpr ToolboxMessageTree unitDistanceMeter = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterSymbol, I18n::Message::UnitDistanceMeter);
 constexpr ToolboxMessageTree unitDistanceMeterKilo = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterKiloSymbol, I18n::Message::UnitDistanceMeterKilo);
 constexpr ToolboxMessageTree unitDistanceAstronomicalUnit = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceAstronomicalUnitSymbol, I18n::Message::UnitDistanceAstronomicalUnit);
@@ -127,7 +128,7 @@ constexpr ToolboxMessageTree unitDistanceFoot = ToolboxMessageTree::Leaf(I18n::M
 constexpr ToolboxMessageTree unitDistanceYard = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceYardSymbol, I18n::Message::UnitDistanceYard);
 constexpr ToolboxMessageTree unitDistanceMile = ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMileSymbol, I18n::Message::UnitDistanceMile);
 
-const ToolboxMessageTree * unitDistanceMeterChildren[] = {&unitDistanceMeterPico, &unitDistanceMeterNano, &unitDistanceMeterMicro, &unitDistanceMeterMilli, &unitDistanceMeter, &unitDistanceMeterKilo};
+const ToolboxMessageTree * unitDistanceMeterChildren[] = {&unitDistanceMeterPico, &unitDistanceMeterNano, &unitDistanceMeterMicro, &unitDistanceMeterMilli, &unitDistanceMeterCenti, &unitDistanceMeter, &unitDistanceMeterKilo};
 const ToolboxMessageTree unitDistanceMeterNode = ToolboxMessageTree::Node(I18n::Message::UnitMetricMenu, unitDistanceMeterChildren);
 const ToolboxMessageTree * unitDistanceChildrenForImperialToolbox[] = {
   &unitDistanceInch,
@@ -305,11 +306,13 @@ const ToolboxMessageTree unitInductanceChildren[] = {
 
 const ToolboxMessageTree unitSurfaceChildrenForMetricToolbox[] = {
   ToolboxMessageTree::Leaf(I18n::Message::UnitSurfaceHectarSymbol, I18n::Message::UnitSurfaceHectar),
+  ToolboxMessageTree::Leaf(I18n::Message::UnitSurfaceMeterSquareSymbol, I18n::Message::UnitSurfaceMeterSquare),
   ToolboxMessageTree::Leaf(I18n::Message::UnitSurfaceAcreSymbol, I18n::Message::UnitSurfaceAcre)
 };
 const ToolboxMessageTree unitSurfaceChildrenForImperialToolbox[] = {
   ToolboxMessageTree::Leaf(I18n::Message::UnitSurfaceAcreSymbol, I18n::Message::UnitSurfaceAcre),
-  ToolboxMessageTree::Leaf(I18n::Message::UnitSurfaceHectarSymbol, I18n::Message::UnitSurfaceHectar)
+  ToolboxMessageTree::Leaf(I18n::Message::UnitSurfaceHectarSymbol, I18n::Message::UnitSurfaceHectar),
+  ToolboxMessageTree::Leaf(I18n::Message::UnitSurfaceMeterSquareSymbol, I18n::Message::UnitSurfaceMeterSquare),
 };
 const ToolboxMessageTree unitSurfaceFork[] = {
   ToolboxMessageTree::Node(I18n::Message::UnitSurfaceMenu, unitSurfaceChildrenForMetricToolbox),

diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n
@@ -10,6 +10,7 @@ UnitTimeMonthSymbol = "_month"
 UnitTimeYearSymbol = "_year"
 UnitDistanceMeterKiloSymbol = "_km"
 UnitDistanceMeterSymbol = "_m"
+UnitDistanceMeterCentiSymbol = "_cm"
 UnitDistanceMeterMilliSymbol = "_mm"
 UnitDistanceMeterMicroSymbol = "_μm"
 UnitDistanceMeterNanoSymbol = "_nm"
@@ -82,6 +83,7 @@ UnitConductanceSiemensMilliSymbol = "_mS"
 UnitMagneticFieldTeslaSymbol = "_T"
 UnitInductanceHenrySymbol = "_H"
 UnitSurfaceAcreSymbol = "_acre"
+UnitSurfaceMeterSquareSymbol = "_m^2"
 UnitSurfaceHectarSymbol = "_ha"
 UnitVolumeLiterSymbol = "_L"
 UnitVolumeLiterDeciSymbol = "_dL"

diff --git a/apps/toolbox.de.i18n b/apps/toolbox.de.i18n
@@ -13,17 +13,18 @@ UnitTimeYear = "Jahr"
 UnitDistanceMenu = "Entfernung"
 UnitDistanceMeterKilo = "Kilometer"
 UnitDistanceMeter = "Meter"
+UnitDistanceMeterCenti = "Zentimeter"
 UnitDistanceMeterMilli = "Millimeter"
 UnitDistanceMeterMicro = "Micrometer"
 UnitDistanceMeterNano = "Nanometer"
 UnitDistanceMeterPico = "Pikometer"
+UnitDistanceInch = "Zoll"
+UnitDistanceFoot = "Fuß"
+UnitDistanceYard = "Yard"
+UnitDistanceMile = "Meile"
 UnitDistanceAstronomicalUnit = "Astronomische Einheit"
 UnitDistanceLightYear = "Lichtjahr"
 UnitDistanceParsec = "Parsec"
-UnitDistanceMile = "Meile"
-UnitDistanceYard = "Yard"
-UnitDistanceFoot = "Fuß"
-UnitDistanceInch = "Zoll"
 UnitMassMenu = "Masse"
 UnitMassGramKilo = "Kilogramm"
 UnitMassGram = "Gramm"
@@ -77,13 +78,14 @@ InductanceMenu = "Elektrische Induktivität"
 UnitSurfaceMenu = "Fläche"
 UnitSurfaceAcre = "Morgen"
 UnitSurfaceHectar = "Hektar"
+UnitSurfaceMeterSquare = "Quadratmeter"
 UnitVolumeMenu = "Volumen"
 UnitVolumeLiter = "Liter"
 UnitVolumeLiterDeci = "Deziliter"
 UnitVolumeLiterCenti = "Centiliter"
 UnitVolumeLiterMilli = "Milliliter"
 UnitVolumeTeaspoon = "Teelöffel"
-UnitVolumeTablespoon= "Esslöffel"
+UnitVolumeTablespoon = "Esslöffel"
 UnitVolumeFluidOunce = "Flüssigunze"
 UnitVolumeCup = "Tasse"
 UnitVolumePint = "Pint"
@@ -409,21 +411,16 @@ NumberElementUbn = "120 - Unbinilium (Ubn)"
 AlphaElementUbn = "Ubn - Unbinilium (120)"
 Speed = "Geschwindigkeit"
 SpeedOfSound = "Schallgeschwindigkeit"
-SpeedOfLightTag = "Lichtgeschwindigkeit"
 SpeedOfSound0Tag = "Meeresspiegel, 20 ° C"
 SpeedOfSoundWaterTag = "In Wasser"
 SpeedOfSoundSteelTag = "In Stahl"
 SpeedOfSoundGlassTag = "In Glas"
-EscapeVelocity = "Fluchtgeschwindigkeit"
-EscapeVelocityFromEarth = "Von der Erde"
-EscapeVelocityFromMoon = "Vom Mond"
-EscapeVelocityFromSun = "Von der Sonne"
+SpeedOfLightTag = "Lichtgeschwindigkeit"
 Thermodynamics = "Thermodynamik"
 BoltzmannTag = "Boltzmann Konstante"
 AvogadroTag = "Avogadro-Konstante"
 GasTag = "Gaskonstante"
 Electromagnetism = "Elektromagnetismus"
-CoulombTag = "Coulomb-Konstante"
 ConductivityConstants = "Leitfähigkeitskonstanten"
 Electricity = "Elektrizität"
 ResistivityConstants = "Konstanten der Widerstandsfähigkeit"
@@ -445,6 +442,11 @@ Water = "Wasser"
 Air = "Luft"
 Glass = "Glas"
 Wood = "Holz"
+CoulombTag = "Coulomb-Konstante"
+EscapeVelocity = "Fluchtgeschwindigkeit"
+EscapeVelocityFromEarth = "Von der Erde"
+EscapeVelocityFromMoon = "Vom Mond"
+EscapeVelocityFromSun = "Von der Sonne"
 Vacuum_permittivityTag = "Vakuum-Durchlässigkeit"
 Vacuum_permeabilityTag = "Vakuumdurchlässigkeit"
 PlanckTag = "Planck - Konstante"

diff --git a/apps/toolbox.en.i18n b/apps/toolbox.en.i18n
@@ -13,6 +13,7 @@ UnitTimeYear = "Year"
 UnitDistanceMenu = "Distance"
 UnitDistanceMeterKilo = "Kilometer"
 UnitDistanceMeter = "Meter"
+UnitDistanceMeterCenti = "Centimeter"
 UnitDistanceMeterMilli = "Millimeter"
 UnitDistanceMeterMicro = "Micrometer"
 UnitDistanceMeterNano = "Nanometer"
@@ -77,13 +78,14 @@ InductanceMenu = "Electrical inductance"
 UnitSurfaceMenu = "Area"
 UnitSurfaceAcre = "Acre"
 UnitSurfaceHectar = "Hectare"
+UnitSurfaceMeterSquare = "Square meter"
 UnitVolumeMenu = "Volume"
 UnitVolumeLiter = "Liter"
 UnitVolumeLiterDeci = "Deciliter"
 UnitVolumeLiterCenti = "Centiliter"
 UnitVolumeLiterMilli = "Milliliter"
 UnitVolumeTeaspoon = "Teaspoon"
-UnitVolumeTablespoon= "Tablespoon"
+UnitVolumeTablespoon = "Tablespoon"
 UnitVolumeFluidOunce = "Fluid Ounce"
 UnitVolumeCup = "Cup"
 UnitVolumePint = "Pint"
@@ -99,7 +101,6 @@ Calculation = "Calculation"
 ComplexNumber = "Complex numbers"
 Combinatorics = "Combinatorics"
 Arithmetic = "Arithmetic"
-MatricesAndVectors = "Matrices and vectors"
 Matrices = "Matrix"
 NewMatrix = "New matrix"
 Identity = "Identity matrix of size n"
@@ -414,17 +415,12 @@ SpeedOfSound0Tag = "Sea level, 20°C"
 SpeedOfSoundWaterTag = "In water"
 SpeedOfSoundSteelTag = "In steel"
 SpeedOfSoundGlassTag = "In glass"
-EscapeVelocity = "Escape Velocity"
-EscapeVelocityFromEarth = "Of Earth"
-EscapeVelocityFromMoon = "Of Moon"
-EscapeVelocityFromSun = "Of Sun"
 SpeedOfLightTag = "Speed of light"
 Thermodynamics = "Thermodynamics"
 BoltzmannTag = "Boltzmann Constant"
 AvogadroTag = "Avogadro Constant"
 GasTag = "Gas Constant"
 Electromagnetism = "Electromagnetism"
-CoulombTag = "Coulomb Constant"
 ConductivityConstants = "Conductivity constants"
 Electricity = "Electricity"
 ResistivityConstants = "Resistivity Constants"
@@ -446,6 +442,11 @@ Water = "Water"
 Air = "Air"
 Glass = "Glass"
 Wood = "Wood"
+CoulombTag = "Coulomb Constant"
+EscapeVelocity = "Escape Velocity"
+EscapeVelocityFromEarth = "Of Earth"
+EscapeVelocityFromMoon = "Of Moon"
+EscapeVelocityFromSun = "Of Sun"
 Vacuum_permittivityTag = "Vacuum permittivity"
 Vacuum_permeabilityTag = "Vacuum permeability"
 PlanckTag = "Planck Constant"
@@ -511,4 +512,5 @@ HartreeConstantTag = "Hartree Constant"
 MagneticFluxQuantumTag = "Magnetic Flux Quantum"
 ConductanceQuantumTag = "Conductance Quantum"
 CirculationQuantumTag = "Circulation Quantum"
-Factorial = "Factorial"
+MatricesAndVectors = "Matrices and vectors"
+Factorial = "Factorial"
diff --git a/apps/toolbox.es.i18n b/apps/toolbox.es.i18n
@@ -13,17 +13,18 @@ UnitTimeYear = "Year"
 UnitDistanceMenu = "Distance"
 UnitDistanceMeterKilo = "Kilometer"
 UnitDistanceMeter = "Meter"
+UnitDistanceMeterCenti = "Centímetro"
 UnitDistanceMeterMilli = "Millimeter"
 UnitDistanceMeterMicro = "Micrometer"
 UnitDistanceMeterNano = "Nanometer"
 UnitDistanceMeterPico = "Picometer"
+UnitDistanceInch = "Pulgada"
+UnitDistanceFoot = "Pie"
+UnitDistanceYard = "Yardas"
+UnitDistanceMile = "Milla"
 UnitDistanceAstronomicalUnit = "Astronomical unit"
 UnitDistanceLightYear = "Light year"
 UnitDistanceParsec = "Parsec"
-UnitDistanceMile = "Milla"
-UnitDistanceYard = "Yardas"
-UnitDistanceFoot = "Pie"
-UnitDistanceInch = "Pulgada"
 UnitMassMenu = "Mass"
 UnitMassGramKilo = "Kilogram"
 UnitMassGram = "Gram"
@@ -77,13 +78,14 @@ InductanceMenu = "Electrical inductance"
 UnitSurfaceMenu = "Area"
 UnitSurfaceAcre = "Acre"
 UnitSurfaceHectar = "Hectare"
+UnitSurfaceMeterSquare = "Metro cuadrado"
 UnitVolumeMenu = "Volume"
 UnitVolumeLiter = "Liter"
 UnitVolumeLiterDeci = "Deciliter"
 UnitVolumeLiterCenti = "Centiliter"
 UnitVolumeLiterMilli = "Milliliter"
 UnitVolumeTeaspoon = "Cucharadita"
-UnitVolumeTablespoon= "Cucharada"
+UnitVolumeTablespoon = "Cucharada"
 UnitVolumeFluidOunce = "Onza líquida"
 UnitVolumeCup = "Taza"
 UnitVolumePint = "Pinta"
@@ -408,22 +410,17 @@ AlphaElementUue = "Uue - Ununennio (119)"
 NumberElementUbn = "120 - Unbinilio (Ubn)"
 AlphaElementUbn = "Ubn - Unbinilio (120)"
 Speed = "Velocidad"
-SpeedOfLightTag = "Velocidad de la luz"
 SpeedOfSound = "La velocidad del sonido"
-Thermodynamics = "Termodinámica"
 SpeedOfSound0Tag = "Nivel del mar, 20 ° C"
 SpeedOfSoundWaterTag = "En el agua"
 SpeedOfSoundSteelTag = "En acero"
 SpeedOfSoundGlassTag = "En vidrio"
-EscapeVelocity = "Velocidad de escape"
-EscapeVelocityFromEarth = "De La Tierra"
-EscapeVelocityFromMoon = "De la Luna"
-EscapeVelocityFromSun = "De el Sol"
+SpeedOfLightTag = "Velocidad de la luz"
+Thermodynamics = "Termodinámica"
 BoltzmannTag = "Constante Boltzmann"
 AvogadroTag = "Constante de Avogadro"
 GasTag = "Constante de gas"
 Electromagnetism = "Electromagnetismo"
-CoulombTag = "Constante de Coulomb"
 ConductivityConstants = "Constantes de conductividad"
 Electricity = "Electricidad"
 ResistivityConstants = "Constantes de resistividad"
@@ -445,6 +442,11 @@ Water = "Agua"
 Air = "Aire"
 Glass = "Vidrio"
 Wood = "Madera"
+CoulombTag = "Constante de Coulomb"
+EscapeVelocity = "Velocidad de escape"
+EscapeVelocityFromEarth = "De La Tierra"
+EscapeVelocityFromMoon = "De la Luna"
+EscapeVelocityFromSun = "De el Sol"
 Vacuum_permittivityTag = "Permisividad de vacío"
 Vacuum_permeabilityTag = "Permeabilidad al vacío"
 PlanckTag = "Constante de Planck"

diff --git a/apps/toolbox.fr.i18n b/apps/toolbox.fr.i18n
@@ -13,21 +13,22 @@ UnitTimeYear = "Année"
 UnitDistanceMenu = "Distance"
 UnitDistanceMeterKilo = "Kilomètre"
 UnitDistanceMeter = "Mètre"
+UnitDistanceMeterCenti = "Centimètre"
 UnitDistanceMeterMilli = "Millimètre"
 UnitDistanceMeterMicro = "Micromètre"
 UnitDistanceMeterNano = "Nanomètre"
 UnitDistanceMeterPico = "Picomètre"
 UnitDistanceInch = "Inch"
+UnitDistanceInch = "Pouce"
 UnitDistanceFoot = "Foot"
+UnitDistanceFoot = "Pied"
 UnitDistanceYard = "Yard"
+UnitDistanceYard = "Yard"
+UnitDistanceMile = "Mile"
 UnitDistanceMile = "Mile"
 UnitDistanceAstronomicalUnit = "Unité astronomique"
 UnitDistanceLightYear = "Année-lumière"
 UnitDistanceParsec = "Parsec"
-UnitDistanceMile = "Mile"
-UnitDistanceYard = "Yard"
-UnitDistanceFoot = "Pied"
-UnitDistanceInch = "Pouce"
 UnitMassMenu = "Masse"
 UnitMassGramKilo = "Kilogramme"
 UnitMassGram = "Gramme"
@@ -81,13 +82,14 @@ InductanceMenu = "Inductance"
 UnitSurfaceMenu = "Superficie"
 UnitSurfaceAcre = "Acre"
 UnitSurfaceHectar = "Hectare"
+UnitSurfaceMeterSquare = "Mètre carré"
 UnitVolumeMenu = "Volume"
 UnitVolumeLiter = "Litre"
 UnitVolumeLiterDeci = "Décilitre"
 UnitVolumeLiterCenti = "Centilitre"
 UnitVolumeLiterMilli = "Millilitre"
 UnitVolumeTeaspoon = "Cuillère à café"
-UnitVolumeTablespoon= "Cuillère à soupe"
+UnitVolumeTablespoon = "Cuillère à soupe"
 UnitVolumeFluidOunce = "Once fluide"
 UnitVolumeCup = "Tasse"
 UnitVolumePint = "Pinte"