UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-29 12:36:33 +01:00
parent d71916c077
commit d589107e01
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/code/catalog.de.i18n
View File

@@ -28,20 +28,11 @@ PythonComplex = "a+ib zurückgeben"
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 = "Exponentialfunktion"

6
apps/settings/base.de.i18n
View File

@@ -7,13 +7,7 @@ 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."