mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-19 00:37:25 +01:00
Fix conflicts
This commit is contained in:
@@ -46,8 +46,8 @@ AccessibilityGammaRed = "Rotes Gamma"
|
||||
AccessibilityGammaGreen = "Grünes Gamma"
|
||||
AccessibilityGammaBlue = "Blaues Gamma"
|
||||
MathOptions = "Mathe-optionen"
|
||||
SymbolMultiplication = "Multiplikationszeichen"
|
||||
SymbolMultiplicationCross = "Kreuz"
|
||||
SymbolMultiplicationMiddleDot = "Mittelpunkt"
|
||||
SymbolMultiplicationStar = "Stern"
|
||||
SymbolMultiplicationAutoSymbol = "automatisch"
|
||||
SymbolMultiplication = "Multiplikation"
|
||||
SymbolMultiplicationCross = "Kreuz "
|
||||
SymbolMultiplicationMiddleDot = "Mittelpunkt "
|
||||
SymbolMultiplicationStar = "Stern "
|
||||
SymbolMultiplicationAutoSymbol = "automatisch "
|
||||
@@ -46,8 +46,8 @@ AccessibilityGammaRed = "Red gamma"
|
||||
AccessibilityGammaGreen = "Green gamma"
|
||||
AccessibilityGammaBlue = "Blue gamma"
|
||||
MathOptions = "Math options"
|
||||
SymbolMultiplication = "Multiply sign"
|
||||
SymbolMultiplication = "Multiply"
|
||||
SymbolMultiplicationCross = "Cross "
|
||||
SymbolMultiplicationMiddleDot = "Dot "
|
||||
SymbolMultiplicationStar = "Star "
|
||||
SymbolMultiplicationAutoSymbol = "Auto "
|
||||
SymbolMultiplicationAutoSymbol = "Auto "
|
||||
@@ -46,8 +46,8 @@ AccessibilityGammaRed = "Gamma roja"
|
||||
AccessibilityGammaGreen = "Gamma verde"
|
||||
AccessibilityGammaBlue = "Gamma azul"
|
||||
MathOptions = "Matemáticas"
|
||||
SymbolMultiplication = "Signo de multiplicación"
|
||||
SymbolMultiplication = "Multiplicación"
|
||||
SymbolMultiplicationCross = "Contrariar "
|
||||
SymbolMultiplicationMiddleDot = "Punto "
|
||||
SymbolMultiplicationStar = "Estrella "
|
||||
SymbolMultiplicationAutoSymbol = "Auto "
|
||||
SymbolMultiplicationAutoSymbol = "Auto "
|
||||
@@ -46,8 +46,8 @@ AccessibilityGammaRed = "Gamma rouge"
|
||||
AccessibilityGammaGreen = "Gamma vert"
|
||||
AccessibilityGammaBlue = "Gamma bleu"
|
||||
MathOptions = "Math"
|
||||
SymbolMultiplication = "Signe de multiplication"
|
||||
SymbolMultiplicationCross = "Croix"
|
||||
SymbolMultiplicationMiddleDot = "Point"
|
||||
SymbolMultiplicationStar = "Etoile"
|
||||
SymbolMultiplicationAutoSymbol = "Automatique"
|
||||
SymbolMultiplication = "Multiplication"
|
||||
SymbolMultiplicationCross = "Croix "
|
||||
SymbolMultiplicationMiddleDot = "Point "
|
||||
SymbolMultiplicationStar = "Etoile "
|
||||
SymbolMultiplicationAutoSymbol = "Automatique "
|
||||
@@ -46,8 +46,8 @@ AccessibilityGammaRed = "Gama vermelha"
|
||||
AccessibilityGammaGreen = "Gama verde"
|
||||
AccessibilityGammaBlue = "Gama azul"
|
||||
MathOptions = "Matemática"
|
||||
SymbolMultiplication = "Sinal de multiplicação"
|
||||
SymbolMultiplicationCross = "crómio"
|
||||
SymbolMultiplicationMiddleDot = "ponto médio"
|
||||
SymbolMultiplicationStar = "estrela"
|
||||
SymbolMultiplicationAutoSymbol = "automático"
|
||||
SymbolMultiplication = "Multiplicação"
|
||||
SymbolMultiplicationCross = "crómio "
|
||||
SymbolMultiplicationMiddleDot = "ponto médio "
|
||||
SymbolMultiplicationStar = "estrela "
|
||||
SymbolMultiplicationAutoSymbol = "automático "
|
||||
Reference in New Issue
Block a user