From d589107e01a6e9c5e7413f1fb2442767a105dcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Sat, 29 Feb 2020 12:36:33 +0100 Subject: [PATCH] Fix conflicts --- apps/code/catalog.de.i18n | 9 --------- apps/settings/base.de.i18n | 6 ------ 2 files changed, 15 deletions(-) diff --git a/apps/code/catalog.de.i18n b/apps/code/catalog.de.i18n index 554eb3c6c..f8a651596 100644 --- a/apps/code/catalog.de.i18n +++ b/apps/code/catalog.de.i18n @@ -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" diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index 2e0c48b25..bc10bd120 100644 --- a/apps/settings/base.de.i18n +++ b/apps/settings/base.de.i18n @@ -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."