Fixed conflicts

apps/calculation/base.de.i18n

@@ -1,9 +1,9 @@
 CalculApp = "Berechnung"
 CalculAppCapital = "BERECHNUNG"
-AdditionalResults = "????"
-DecimalBase = "????"
-HexadecimalBase = "????"
-BinaryBase = "????"
-PrimeFactors = "????"
-MixedFraction = "????"
-EuclideanDivision = "????"
+AdditionalResults = "Weitere Ergebnisse"
+DecimalBase = "Dezimal"
+HexadecimalBase = "Hexadezimal"
+BinaryBase = "Binär"
+PrimeFactors = "Primfaktor"
+MixedFraction = "Gemischte Fraktion"
+EuclideanDivision = "Euklidische Division"

apps/code/catalog.de.i18n

@@ -12,104 +12,113 @@ PythonSingleQuote = "Einfaches Anführungszeichen"
 PythonAbs = "Absolute/r Wert/Größe"
 PythonAcos = "Arkuskosinus"
 PythonAcosh = "Hyperbelkosinus"
-PythonAppend = "Add x to the end of the list"
+PythonAppend = "Hängt x an das Ende der Liste"
 PythonAsin = "Arkussinus"
 PythonAsinh = "Hyperbelsinus"
 PythonAtan = "Arkustangens"
 PythonAtan2 = "Gib atan(y/x)"
 PythonAtanh = "Hyperbeltangens"
-PythonBin = "Ganzzahl nach binär konvertieren"
+PythonBin = "Ganzzahl nach binär"
 PythonCeil = "Aufrundung"
 PythonChoice = "Zufallszahl aus der Liste"
-PythonClear = "Empty the list"
+PythonClear = "Leere die Liste"
 PythonCmathFunction = "cmath-Modul-Funktionspräfix"
-PythonColor = "Definiere eine RGB-Farbe"
+PythonColor = "Definiert eine RGB-Farbe"
 PythonComplex = "a+ib zurückgeben"
-PythonCopySign = "Return x with the sign of y"
+PythonCopySign = "x mit dem Vorzeichen von y"
 PythonCos = "Kosinus"
 PythonCosh = "Hyperbolic cosine"
+<<<<<<< HEAD
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
+=======
+PythonCount = "Zählt wie oft x vorkommt"
+PythonDegrees = "x von Radian zu Grad umwandeln"
+PythonDivMod = "Quotient und Rest"
+PythonDrawString = "Schreibt Text bei (x,y)"
+PythonConstantE = "2.718281828459046"
+PythonErf = "Fehlerfunktion"
+>>>>>>> acb71d29759a3dadac9221570058159adedb7da6
 PythonErfc = "Complementary error function"
 PythonEval = "Return the evaluated expression"
-PythonExp = "Exponential function"
-PythonExpm1 = "Compute exp(x)-1"
-PythonFabs = "Absolute value"
-PythonFillRect = "Fill a rectangle at pixel (x,y)"
-PythonFloat = "Convert x to a float"
+PythonExp = "Exponentialfunktion"
+PythonExpm1 = "Berechne exp(x)-1"
+PythonFabs = "Absoluter Wert"
+PythonFillRect = "Malt ein Rechteck bei Pixel (x,y)"
+PythonFloat = "Wandelt x zu float um"
 PythonFloor = "Floor"
 PythonFmod = "a modulo b"
-PythonFrExp = "Mantissa and exponent of x"
-PythonGamma = "Gamma function"
-PythonGetPixel = "Return pixel (x,y) color"
-PythonGetrandbits = "Integer with k random bits"
-PythonHex = "Convert integer to hexadecimal"
-PythonImportCmath = "Import cmath module"
-PythonImportIon = "Import ion module"
-PythonImportKandinsky = "Import kandinsky module"
-PythonImportRandom = "Import random module"
-PythonImportMath = "Import math module"
-PythonImportTime = "Import time module"
-PythonImportTurtle = "Import turtle module"
-PythonIndex = "Index of the first x occurrence"
-PythonInput = "Prompt a value"
-PythonInsert = "Insert x at index i in the list"
-PythonInt = "Convert x to an integer"
+PythonFrExp = "Rest und Exponent von x"
+PythonGamma = "Gammafunktion"
+PythonGetPixel = "Farbe von Pixel (x,y)"
+PythonGetrandbits = "Ganzzahl mit k zufälligen Bits"
+PythonHex = "Ganzzahl zu Hexadecimal"
+PythonImportCmath = "cmath Modul importieren"
+PythonImportIon = "ion Modul importieren"
+PythonImportKandinsky = "kandinsky Modul importieren"
+PythonImportRandom = "random Modul importieren"
+PythonImportMath = "math Modul importieren"
+PythonImportTime = "time Modul importieren"
+PythonImportTurtle = "turtle Modul importieren"
+PythonIndex = "Index, bei dem x zuerst vorkommt"
+PythonInput = "Eingabeaufforderung"
+PythonInsert = "x bei index i in der Liste einsetzen"
+PythonInt = "x zu Ganzzahl"
 PythonIonFunction = "ion module function prefix"
-PythonIsFinite = "Check if x is finite"
-PythonIsInfinite = "Check if x is infinity"
-PythonIsNaN = "Check if x is a NaN"
-PythonIsKeyDown = "Return True if the k key is down"
+PythonIsFinite = "Prüft ob x endlich ist"
+PythonIsInfinite = "Prüft ob x unendlich ist"
+PythonIsNaN = "Prüft ob x NaN ist"
+PythonIsKeyDown = "true wenn k gedrückt ist"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
+PythonKeyLeft = "Linke Pfeiltaste"
+PythonKeyUp = "Pfeiltaste nach oben"
+PythonKeyDown = "Pfeiltaste nach unten"
+PythonKeyRight = "Rechte Pfeiltaste"
+PythonKeyOk = "OK Taste"
+PythonKeyBack = "ZURÜCK Taste"
+PythonKeyHome = "HOME Taste"
+PythonKeyOnOff = "AN/AUS Taste"
+PythonKeyShift = "SHIFT Taste"
+PythonKeyAlpha = "ALPHA Taste"
+PythonKeyXnt = "X,N,T Taste"
+PythonKeyVar = "VAR Taste"
+PythonKeyToolbox = "WERKZEUGBOX Taste"
+PythonKeyBackspace = "LÖSCHEN Taste"
+PythonKeyExp = "EXPONENTIAL Taste"
+PythonKeyLn = "NATURAL LOGARITHM Taste"
+PythonKeyLog = "DECIMAL LOGARITHM Taste"
+PythonKeyImaginary = "IMAGINÄRES I Taste"
+PythonKeyComma = "KOMMA Taste"
+PythonKeyPower = "HOCH Taste"
+PythonKeySine = "SINUS Taste"
+PythonKeyCosine = "COSINUS Taste"
+PythonKeyTangent = "TANGENZ Taste"
+PythonKeyPi = "PI Taste"
+PythonKeySqrt = "WURZEL Taste"
+PythonKeySquare = "QUADRAT Taste"
+PythonKeySeven = "7 Taste"
+PythonKeyEight = "8 Taste"
+PythonKeyNine = "9 Taste"
 PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
 PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
+PythonKeyFour = "4 Taste"
+PythonKeyFive = "5 Taste"
+PythonKeySix = "6 Taste"
+PythonKeyMultiplication = "MULTIPLIKATIONSTASTE"
+PythonKeyDivision = "DIVISIONSTASTE"
+PythonKeyOne = "1 Taste"
+PythonKeyTwo = "2 Taste"
+PythonKeyThree = "3 Taste"
+PythonKeyPlus = "PLUS Taste"
+PythonKeyMinus = "MINUS Taste"
+PythonKeyZero = "0 Taste"
+PythonKeyDot = "PUNKT Taste"
+PythonKeyEe = "10 HOCH X Taste"
+PythonKeyAns = "ANS Taste"
+PythonKeyExe = "EXE Taste"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"
@@ -140,27 +149,27 @@ PythonReverse = "Reverse the elements of the list"
 PythonRound = "Round to n digits"
 PythonSeed = "Initialize random number generator"
 PythonSetPixel = "Color pixel (x,y)"
-PythonSin = "Sine"
+PythonSin = "Sinus"
 PythonSinh = "Hyperbolic sine"
 PythonSleep = "Suspend the execution for t seconds"
 PythonSort = "Sort the list"
-PythonSqrt = "Square root"
+PythonSqrt = "Wurzel"
 PythonSum = "Sum the items of a list"
-PythonTan = "Tangent"
+PythonTan = "Tangens"
 PythonTanh = "Hyperbolic tangent"
 PythonTimeFunction = "time module function prefix"
 PythonTrunc = "x truncated to an integer"
 PythonTurtleBackward = "Move backward by x pixels"
-PythonTurtleBlack = "Black color"
-PythonTurtleBlue = "Blue color"
-PythonTurtleBrown = "Brown color"
+PythonTurtleBlack = "Schwarze Farbe"
+PythonTurtleBlue = "Blaue Farbe"
+PythonTurtleBrown = "Braune Farbe"
 PythonTurtleCircle = "Circle of radius r pixels"
-PythonTurtleColor = "Set the pen color"
+PythonTurtleColor = "Stiftfarbe setzen"
 PythonTurtleForward = "Move forward by x pixels"
 PythonTurtleFunction = "turtle module function prefix"
 PythonTurtleGoto = "Move to (x,y) coordinates"
-PythonTurtleGreen = "Green color"
-PythonTurtleGrey = "Grey color"
+PythonTurtleGreen = "Grüne Farbe"
+PythonTurtleGrey = "Graue Farbe"
 PythonTurtleHeading = "Return the current heading"
 PythonTurtleHideturtle = "Hide the turtle"
 PythonTurtleIsdown = "Return True if the pen is down"
@@ -169,19 +178,19 @@ PythonTurtleOrange = "Orange color"
 PythonTurtlePendown = "Pull the pen down"
 PythonTurtlePensize = "Set the line thickness to x pixels"
 PythonTurtlePenup = "Pull the pen up"
-PythonTurtlePink = "Pink color"
+PythonTurtlePink = "Pinke Farbe"
 PythonTurtlePosition = "Return the current (x,y) location"
 PythonTurtlePurple = "Purple color"
-PythonTurtleRed = "Red color"
+PythonTurtleRed = "Rote Farbe"
 PythonTurtleReset = "Reset the drawing"
 PythonTurtleRight = "Turn right by a degrees"
 PythonTurtleSetheading = "Set the orientation to a degrees"
-PythonTurtleSetposition = "Positionne la tortue"
-PythonTurtleShowturtle = "Show the turtle"
-PythonTurtleSpeed = "Drawing speed between 0 and 10"
-PythonTurtleWhite = "White color"
-PythonTurtleYellow = "Yellow color"
-PythonUniform = "Floating point number in [a,b]"
+PythonTurtleSetposition = "Position des turtles"
+PythonTurtleShowturtle = "Die turtle anzeigen"
+PythonTurtleSpeed = "Zeichengeschwindigkeit zwischen 0 und 10"
+PythonTurtleWhite = "Weiße Farbe"
+PythonTurtleYellow = "Gelbe Farbe"
+PythonUniform = "Fließkommazahl in [a,b]"
 PythonTimeFromImport = "Import time module"
 PythonTimeImport = "Import time module"
 PythonTimePrefix = "time module function prefix"

apps/home/base.de.i18n

@@ -1,4 +1,4 @@
 Apps = "Anwendungen"
 AppsCapital = "OMEGA"
-ForbidenAppInExamMode1 = "This application is"
-ForbidenAppInExamMode2 = "forbidden in exam mode"
+ForbidenAppInExamMode1 = "Diese Anwendung ist im"
+ForbidenAppInExamMode2 = "Prüfungsmodus verboten"

apps/settings/base.de.i18n

@@ -7,7 +7,13 @@ EditionLinear = "Linear "
 Edition2D = "Natürlich "
 ComplexFormat = "Komplex"
 ExamMode = "Testmodus"
+<<<<<<< HEAD
 ExamModeActive = "Wieder starten Testmodus"
+=======
+ActivateExamMode = "Testmodus starten"
+ExamModeActive = "Testmodus neustarten"
+ActivateDutchExamMode = "Niederländischen Testmodus starten"
+>>>>>>> acb71d29759a3dadac9221570058159adedb7da6
 ToDeactivateExamMode1 = "Um den Testmodus auszuschalten,"
 ToDeactivateExamMode2 = "schließen Sie den Rechner an einen"
 ToDeactivateExamMode3 = "Computer oder eine Steckdose an."
@@ -36,12 +42,12 @@ SoftwareVersion = "Epsilon version"
 CustomSoftwareVersion = "Omega version"
 Username = "Name"
 MicroPythonVersion = "µPythonversion"
-ResultDisplay = "Resultaatweergave"
-DefaultResult = "Standaard "
+ResultDisplay = "Ergebniswiedergabe"
+DefaultResult = "Standard "
 CompactResult = "Compact "
 FontSizes = "Python Schriftgröße"
-LargeFont = "Große "
-SmallFont = "Kleine "
+LargeFont = "Groß "
+SmallFont = "Klein "
 SerialNumber = "Seriennummer"
 UpdatePopUp = "Erinnerung: Update"
 BetaPopUp = "Beta pop-up"
@@ -53,13 +59,13 @@ AccessibilityGamma = "Gammakorrektur"
 AccessibilityGammaRed = "Rotes Gamma"
 AccessibilityGammaGreen = "Grünes Gamma"
 AccessibilityGammaBlue = "Blaues Gamma"
-MathOptions = "Mathe-optionen"
+MathOptions = "Berechnungseinstellungen"
 SymbolMultiplication = "Multiplikation"
 SymbolMultiplicationCross = "Kreuz "
 SymbolMultiplicationMiddleDot = "Mittelpunkt "
 SymbolMultiplicationStar = "Stern "
 SymbolMultiplicationAutoSymbol = "automatisch "
-PythonFont = "Python schriftart"
+PythonFont = "Python Schriftart"
 Large = "Groß "
 Small = "Klein "
 MemUse = "Speicher"

apps/shared.de.i18n

@@ -82,11 +82,11 @@ XStart = "X Startwert"
 Zoom = "Zoom"
 Developers = "Entwickler"
 BetaTesters = "Beta-Tester"
-LEDColor = "LEDs farbe"
+LEDColor = "LED Farbe"
 ExamModeMode = "Modus"
 ExamModeModeStandard = "Standard "
-ExamModeModeNoSym = "Ohne symbolisch "
-ExamModeModeNoSymNoText = "No sym no text "
+ExamModeModeNoSym = "Ohne Symbole "
+ExamModeModeNoSymNoText = "Ohne Symbole & Text "
 ExamModeModeDutch = "Niederländisch "
 ColorRed = "Rot "
 ColorWhite = "Weiss "

apps/toolbox.de.i18n

@@ -1,17 +1,17 @@
-Unit = "Units"
-UnitTimeMenu = "Time"
-UnitTimeSecondMenu = "Second"
-UnitTimeSecond = "Second"
-UnitTimeSecondMilli = "Millisecond"
-UnitTimeSecondMicro = "Microsecond"
-UnitTimeSecondNano = "Nanosecond"
+Unit = "Einheiten"
+UnitTimeMenu = "Zeit"
+UnitTimeSecondMenu = "Sekunde"
+UnitTimeSecond = "Sekunde"
+UnitTimeSecondMilli = "Millisekunde"
+UnitTimeSecondMicro = "Microsekunde"
+UnitTimeSecondNano = "Nanosekunde"
 UnitTimeMinute = "Minute"
-UnitTimeHour = "Hour"
-UnitTimeDay = "Day"
-UnitTimeWeek = "Week"
-UnitTimeMonth = "Month"
-UnitTimeYear = "Year"
-UnitDistanceMenu = "Distance"
+UnitTimeHour = "Stunde"
+UnitTimeDay = "Tag"
+UnitTimeWeek = "Woche"
+UnitTimeMonth = "Monat"
+UnitTimeYear = "Jahr"
+UnitDistanceMenu = "Distanz"
 UnitDistanceMeterMenu = "Meter"
 UnitDistanceMeterKilo = "Kilometer"
 UnitDistanceMeter = "Meter"
@@ -19,43 +19,43 @@ UnitDistanceMeterMilli = "Millimeter"
 UnitDistanceMeterMicro = "Micrometer"
 UnitDistanceMeterNano = "Nanometer"
 UnitDistanceMeterPico = "Picometer"
-UnitDistanceAstronomicalUnit = "Astronomical unit"
-UnitDistanceLightYear = "Light year"
+UnitDistanceAstronomicalUnit = "Astronomische Einheit"
+UnitDistanceLightYear = "Lichtjahr"
 UnitDistanceParsec = "Parsec"
-UnitMassMenu = "Mass"
-UnitMassGramKilo = "Kilogram"
-UnitMassGram = "Gram"
-UnitMassGramMilli = "Milligram"
-UnitMassGramMicro = "Microgram"
-UnitMassGramNano = "Nanogram"
+UnitMassMenu = "Masse"
+UnitMassGramKilo = "Kilogramm"
+UnitMassGram = "Gramm"
+UnitMassGramMilli = "Milligramm"
+UnitMassGramMicro = "Microgramm"
+UnitMassGramNano = "Nanogramm"
 UnitMassTonne = "Tonne"
-UnitCurrentMenu = "Electric current"
+UnitCurrentMenu = "Elektrischer Strom"
 UnitCurrentAmpere = "Ampere"
 UnitCurrentAmpereMilli = "Milliampere"
 UnitCurrentAmpereMicro = "Microampere"
-UnitTemperatureMenu = "Temperature"
+UnitTemperatureMenu = "Temperaturen"
 UnitTemperatureKelvin = "Kelvin"
-UnitAmountMenu = "Amount of substance"
-UnitAmountMole = "Mole"
-UnitAmountMoleMilli = "Millimole"
-UnitAmountMoleMicro = "Micromole"
-UnitLuminousIntensityMenu = "Luminous intensity"
+UnitAmountMenu = "Substanzmenge"
+UnitAmountMole = "Mol"
+UnitAmountMoleMilli = "Millimol"
+UnitAmountMoleMicro = "Micromol"
+UnitLuminousIntensityMenu = "Helligkeit"
 UnitLuminousIntensityCandela = "Candela"
-UnitFrequencyMenu = "Frequency"
+UnitFrequencyMenu = "Frequenz"
 UnitFrequencyHertzGiga = "Gigahertz"
 UnitFrequencyHertzMega = "Megahertz"
 UnitFrequencyHertzKilo = "Kilohertz"
 UnitFrequencyHertz = "Hertz"
-UnitForceMenu = "Force"
+UnitForceMenu = "Kraft"
 UnitForceNewtonKilo = "Kilonewton"
 UnitForceNewton = "Newton"
 UnitForceNewtonMilli = "Millinewton"
-UnitPressureMenu = "Pressure"
+UnitPressureMenu = "Druck"
 UnitPressurePascal = "Pascal"
 UnitPressurePascalHecto = "Hectopascal"
 UnitPressureBar = "Bar"
 UnitPressureAtm = "Atmosphere"
-UnitEnergyMenu = "Energy"
+UnitEnergyMenu = "Energie"
 UnitEnergyJouleMenu = "Joule"
 UnitEnergyJouleKilo = "Kilojoule"
 UnitEnergyJoule = "Joule"
@@ -65,37 +65,37 @@ UnitEnergyElectronVoltMega = "Megaelectronvolt"
 UnitEnergyElectronVoltKilo = "Kiloelectronvolt"
 UnitEnergyElectronVolt = "Electronvolt"
 UnitEnergyElectronVoltMilli = "Millielectronvolt"
-UnitPowerMenu = "Power"
+UnitPowerMenu = "Leistung"
 UnitPowerWattGiga = "Gigawatt"
 UnitPowerWattMega = "Megawatt"
 UnitPowerWattKilo = "Kilowatt"
 UnitPowerWatt = "Watt"
 UnitPowerWattMilli = "Milliwatt"
 UnitPowerWattMicro = "Microwatt"
-UnitElectricChargeMenu = "Electric charge"
+UnitElectricChargeMenu = "Elektrische Ladung"
 UnitChargeCoulomb = "Coulomb"
-UnitPotentialMenu = "Electric potential"
+UnitPotentialMenu = "Elektrisches Potenzial"
 UnitPotentialVoltKilo = "Kilovolt"
 UnitPotentialVolt = "Volt"
 UnitPotentialVoltMilli = "Millivolt"
 UnitPotentialVoltMicro = "Microvolt"
-UnitCapacitanceMenu = "Electrical capacitance"
+UnitCapacitanceMenu = "Elektrische Kapazität"
 UnitCapacitanceFarad = "Farad"
 UnitCapacitanceFaradMilli = "Millifarad"
 UnitCapacitanceFaradMicro = "Microfarad"
-UnitResistanceMenu = "Electrical resistance"
+UnitResistanceMenu = "Elektrischer Widerstand"
 UnitResistanceOhmKilo = "Kiloohm"
 UnitResistanceOhm = "Ohm"
-UnitConductanceMenu = "Electrical conductance"
+UnitConductanceMenu = "Elektrische Leitfähigkeit"
 UnitConductanceSiemens = "Siemens"
 UnitConductanceSiemensMilli = "Millisiemens"
-UnitMagneticFieldMenu = "Magnetic field"
+UnitMagneticFieldMenu = "Magnetisches Feld"
 UnitMagneticFieldTesla = "Tesla"
-InductanceMenu = "Electrical inductance"
+InductanceMenu = "Elektrische Induktion"
 UnitInductanceHenry = "Henry"
-UnitSurfaceMenu = "Area"
-UnitSurfaceHectar = "Hectare"
-UnitVolumeMenu = "Volume"
+UnitSurfaceMenu = "Fläche"
+UnitSurfaceHectar = "Hektar"
+UnitVolumeMenu = "Volumen"
 UnitVolumeLiter = "Liter"
 UnitVolumeLiterDeci = "Deciliter"
 UnitVolumeLiterCenti = "Centiliter"
@@ -409,9 +409,9 @@ NumberElementUue = "119 - Ununennium (Uue)"
 AlphaElementUue = "Uue - Ununennium (119)"
 NumberElementUbn = "120 - Unbinilium (Ubn)"
 AlphaElementUbn = "Ubn - Unbinilium (120)"
-UnitOfMesurement = "Unit of mesurement"
+UnitOfMesurement = "Messeinheit"
 SpeedOfLightTag = "Lichtgeschwindigkeit (m·s^-1)"
-YearLightTag = "Ein Jahr Licht (km)"
+YearLightTag = "Lichtjahr (km)"
 Thermodynamics = "Thermodynamik"
 BoltzmannTag = "Boltzmann Konstante (J·K^-1)"
 AvogadroTag = "Avogadro-Konstante (mol^-1)"
@@ -427,4 +427,4 @@ NeutronMassTag = "Masse eines Neutrons (kg)"
 Gravitation = "Gravitation"
 ElementalChargeTag = "Elementarladung (C)"
 GAccelerationTag = "Beschleunigung (m·s^-2)"
-GConstantTag = "Konstant (m^3·kg^-1·s^-2)"
+GConstantTag = "Konstant (m^3·kg^-1·s^-2)"