From 36c81afb83e3c062dd2c0a54b2f8d40463d7b173 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Sat, 11 Jan 2020 18:42:07 +0100
Subject: [PATCH] no-jira: wording

---
 .../olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties | 4 ----
 .../olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
index c30404cecd7..81902b3608e 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
@@ -97,15 +97,11 @@ error.editor.atLeastOne=Sie m\u00FCssen mindestens einen Editortyp w\u00E4hlen.
 error.file.exists=$org.olat.core.commons.modules.bc\:cfile.already.exists
 error.file.invalid=$org.olat.core.commons.modules.bc\:cfile.name.notvalid
 error.file.empty=Datei ist leer
-<<<<<<< HEAD
 error.fully.assessed.passed=$org.olat.course.learningpath.ui:\error.fully.assessed.passed
 error.fully.assessed.score=$org.olat.course.learningpath.ui:\error.fully.assessed.score
-error.max.documents=Sie d\u00FCrfen nicht mehr als <b>{0}</b> Dokument(e) abgeben. Aber sie k\u00F6nnen noch ein Dokument austauschen oder editieren.
-=======
 error.max.documents=Sie d\u00FCrfen nicht mehr als <strong>{0}</strong> Dokument(e) abgeben. Aber sie k\u00F6nnen noch ein Dokument austauschen oder editieren.
 error.max.smaller.than.min.documents=Max. Anzahl von Dokumenten muss gr\u00F6sser sein als min. Anzahl Dokumenten.
 error.min.documents=Sie m\u00FCssen mindestens <strong>{0}</strong> Dokument(e) abgeben.
->>>>>>> refs/heads/master
 error.missing.file=Es fehlt die Datei einer Aufgabe
 error.missing.group=Sie haben noch keine Gruppe gew\u00E4hlt
 error.missing.score.config=Fehlende Bewertungskonfiguration
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
index 8ca43802343..0c1f64b2a47 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
@@ -97,15 +97,11 @@ error.editor.atLeastOne=You must choose at least one kind of editor.
 error.file.empty=File is empty
 error.file.exists=$org.olat.core.commons.modules.bc\:cfile.already.exists
 error.file.invalid=$org.olat.core.commons.modules.bc\:cfile.name.notvalid
-<<<<<<< HEAD
 error.fully.assessed.passed=$org.olat.course.learningpath.ui:\error.fully.assessed.passed
 error.fully.assessed.score=$org.olat.course.learningpath.ui:\error.fully.assessed.score
-error.max.documents=You are not allowed to submit more than <b>{0}</b> Documents. You may edit or change a document.
-=======
 error.max.documents=You are not allowed to submit more than <strong>{0}</strong> Document(s). You may edit or change a document.
 error.max.smaller.than.min.documents=Max. number of documents must be bigger than min. number of documents.
 error.min.documents=You must submit at least <strong>{0}</strong> Document(s).
->>>>>>> refs/heads/master
 error.missing.file=The file of a task is missing
 error.missing.group=You have not selected a group yet
 error.missing.score.config=Missing score configuration
-- 
GitLab