Resolved conflicts

This commit is contained in:
Quentin Guidée
2019-12-24 01:07:22 +01:00
62 changed files with 478 additions and 290 deletions

View File

@@ -2,6 +2,9 @@ ActivateDeactivate = "Aktivieren/Deaktivieren"
ActiveExamModeMessage1 = "Alle Ihre Daten werden "
ActiveExamModeMessage2 = "gelöscht, wenn Sie den "
ActiveExamModeMessage3 = "Testmodus einschalten."
ActiveDutchExamModeMessage1 = "All your data will be deleted when"
ActiveDutchExamModeMessage2 = "you activate the exam mode. Python"
ActiveDutchExamModeMessage3 = "application will be unavailable."
Axis = "Achsen"
Cancel = "Abbrechen"
ClearColumn = "Spalte löschen"