Merge branch 'RedGl0w-omega-master' into omega-master

This commit is contained in:
Quentin
2019-11-05 23:47:34 +01:00
7 changed files with 43 additions and 13 deletions

View File

@@ -364,13 +364,20 @@ const ToolboxMessageTree Electromagnetism[] = {
ToolboxMessageTree::Leaf(I18n::Message::CoulombTag, I18n::Message::Coulomb, false, I18n::Message::Coulomb),
ToolboxMessageTree::Leaf(I18n::Message::Vacuum_permittivityTag, I18n::Message::Vacuum_permittivity, false, I18n::Message::Vacuum_permittivity),
ToolboxMessageTree::Leaf(I18n::Message::Vacuum_permeabilityTag, I18n::Message::Vacuum_permeability, false, I18n::Message::Vacuum_permeability),
ToolboxMessageTree::Leaf(I18n::Message::PlanckTag, I18n::Message::Planck, false, I18n::Message::Planck)
ToolboxMessageTree::Leaf(I18n::Message::PlanckTag, I18n::Message::Planck, false, I18n::Message::Planck),
ToolboxMessageTree::Leaf(I18n::Message::ElementalChargeTag, I18n::Message::ElementalCharge, false, I18n::Message::ElementalCharge)
};
const ToolboxMessageTree Gravitation[] = {
ToolboxMessageTree::Leaf(I18n::Message::GAccelerationTag, I18n::Message::GAcceleration, false, I18n::Message::GAcceleration),
ToolboxMessageTree::Leaf(I18n::Message::GConstantTag, I18n::Message::GConstant, false, I18n::Message::GConstant)
};
const ToolboxMessageTree Physics[] = {
ToolboxMessageTree::Node(I18n::Message::UnitOfMesurement, UnitOfMesurement),
ToolboxMessageTree::Node(I18n::Message::Thermodynamics, Thermodynamics),
ToolboxMessageTree::Node(I18n::Message::Electromagnetism, Electromagnetism)
ToolboxMessageTree::Node(I18n::Message::Electromagnetism, Electromagnetism),
ToolboxMessageTree::Node(I18n::Message::Gravitation, Gravitation)
};
const ToolboxMessageTree menu[] = {

View File

@@ -215,15 +215,18 @@ DannySimmons = "Danny Simmons "
JoachimLeFournis = "Joachim Le Fournis "
JeanBaptisteBoric = "Jean-Baptiste Boric "
MaximeFriess = "Maxime Friess "
SpeedOfLight = "2.998*10^8"
YearLight = "9.461*10^12"
Boltzmann = "1.38064852*10^-23"
Avogadro = "6.02214076*10^23"
SpeedOfLight = "2.998·10^8"
YearLight = "9.461·10^12"
Boltzmann = "1.38064852·10^-23"
Avogadro = "6.02214076·10^23"
Gas = "8.31446261815324"
Coulomb = "8.9875517887*10^9"
Vacuum_permittivity = "8.8541878128*10^-12"
Vacuum_permeability = "4π*10^-7"
Planck = "6.62607015*10^-34"
ElectronMass = "9.109383*10^-31"
ProtonMass = "1.672649*10^-27"
NeutronMass = "1.67493*10^-27"
Coulomb = "8.9875517887·10^9"
Vacuum_permittivity = "8.8541878128·10^-12"
Vacuum_permeability = "4π·10^-7"
Planck = "6.62607015·10^-34"
ElectronMass = "9.109383·10^-31"
ProtonMass = "1.672649·10^-27"
NeutronMass = "1.67493·10^-27"
ElementalCharge = "1.60217662·10^-19"
GAcceleration = "9.80665"
GConstant = "6.674·10^-11"

View File

@@ -322,3 +322,7 @@ PlanckTag = "Planck - Konstante (m^2·kg·s^-1)"
ElectronMassTag = "Masse eines Elektrons (kg)"
ProtonMassTag = "Masse eines Protons (kg)"
NeutronMassTag = "Masse eines Neutrons (kg)"
Gravitation = "Gravitation"
ElementalChargeTag = "Elementarladung (C)"
GAccelerationTag = "Beschleunigung (m·s^-2)"
GConstantTag = "Konstant (m^3·kg^-1·s^-2)"

View File

@@ -322,3 +322,7 @@ PlanckTag = "Planck constant (m^2·kg·s^-1)"
ElectronMassTag = "Mass of an electron (kg)"
ProtonMassTag = "Mass of a proton (kg)"
NeutronMassTag = "Mass of a neutron (kg)"
Gravitation = "Gravitation"
ElementalChargeTag = "Elemental Charge (C)"
GAccelerationTag = "Acceleration (m·s^-2)"
GConstantTag = "Constant (m^3·kg^-1·s^-2)"

View File

@@ -322,3 +322,7 @@ PlanckTag = "Constante de Planck (m^2·kg·s^-1)"
ElectronMassTag = "Masa de un electrón (kg)"
ProtonMassTag = "Masa de un protón (kg)"
NeutronMassTag = "Masa de un neutrón (kg)"
Gravitation = "Gravitación"
ElementalChargeTag = "Carga elemental (C)"
GAccelerationTag = "Aceleración (m·s^-2)"
GConstantTag = "Constante (m^3·kg^-1·s^-2)"

View File

@@ -322,3 +322,7 @@ PlanckTag = "Const de Planck (m^2·kg·s^-1)"
ElectronMassTag = "Masse d'un électron (kg)"
ProtonMassTag = "Masse d'un proton (kg)"
NeutronMassTag = "Masse d'un neutron (kg)"
Gravitation = "Gravitation"
ElementalChargeTag = "Charge élémentaire (C)"
GAccelerationTag = "Accélération (m·s^-2)"
GConstantTag = "Constante (m^3·kg^-1·s^-2)"

View File

@@ -323,3 +323,7 @@ PlanckTag = "Constante de Planck (m^2·kg·s^-1)"
ElectronMassTag = "Massa de um elétron (kg)"
ProtonMassTag = "Massa de um próton (kg)"
NeutronMassTag = "Massa de um nêutron (kg)"
Gravitation = "Gravitação"
ElementalChargeTag = "Carga elementar (C)"
GAccelerationTag = "Aceleração (m·s^-2)"
GConstantTag = "Constante (m^3·kg^-1·s^-2)"