OO-2045 fix wrong display of collect text, add title and text for collect and back-to-submission

src/main/java/org/olat/course/nodes/gta/ui/_content/coach.html

@@ -60,14 +60,18 @@
 			<br />
 			$r.translate("coach.waiting.submitted.documents.description")
 		#end
-		#if(($r.available("coach.collect.task") && $r.visible("coach.collect.task")) || ($r.available("coach.back.to.submission") && $r.visible("coach.back.to.submission")))
+		#if($r.available("coach.collect.task") && $r.visible("coach.collect.task"))
+			<h5>$r.translate("coach.collect.confirm.title")</h5>
+			<p>$r.translate("coach.collect.confirm.desc")</p>
 			<div class="o_button_group">
-			#if($r.available("coach.collect.task") && $r.visible("coach.collect.task"))
 				$r.render("coach.collect.task")
-			#end
-			#if($r.available("coach.back.to.submission") && $r.visible("coach.back.to.submission"))
+			</div>
+		#end
+		#if($r.available("coach.back.to.submission") && $r.visible("coach.back.to.submission"))
+			<h5>$r.translate("coach.back.to.submission.confirm.title")</h5>
+			<p>$r.translate("coach.back.to.submission.desc")</p>
+			<div class="o_button_group">
 				$r.render("coach.back.to.submission")
-			#end
 			</div>
 		#end
 		</div>

src/main/java/org/olat/course/nodes/gta/ui/_content/coach_revisions.html

@@ -24,11 +24,11 @@
 	#end
 	</div>
 #else
-	<h5>$r.translate("coach.collect.confirm.title")</h5>
-	<p>$r.translate("coach.collect.confirm.desc")</p>
-	<div class="o_button_group">
 	#if($r.available("coach.collect.revisions"))
-		$r.render("coach.collect.revisions")
+		<h5>$r.translate("coach.collect.confirm.title")</h5>
+		<p>$r.translate("coach.collect.confirm.desc")</p>
+		<div class="o_button_group">
+			$r.render("coach.collect.revisions")
+		</div>
 	#end
-	</div>
 #end
\ No newline at end of file

src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties

-#Wed Jun 01 16:58:31 CEST 2016
+#Thu Jun 02 15:11:08 CEST 2016
 add.solution=Musterl\u00F6sung hochladen
 add.task=Aufgabe hinzuf\u00FCgen
 assessment.group.tool=Gruppe bewerten
@@ -21,6 +21,7 @@ coach.assessment=Bewerten
 coach.back.to.submission=Abgabe erneut \u00F6ffnen
 coach.back.to.submission.confirm.text=Sind Sie sicher dass Sie die Abgabe f\u00FCr "{0}" nochmals \u00F6ffnen m\u00F6chten?
 coach.back.to.submission.confirm.title=Abgabe erneut \u00F6ffnen
+coach.back.to.submission.desc=Hat der Teilnehmer versehentlich die endg\u00FCltige Abgabe ausgel\u00F6st, so kann mit dieser Aktion der Status auf "nicht abgegeben" zur\u00FCckgesetzt werden.
 coach.close.revision.button=Revision akzeptieren
 coach.collect.confirm.desc=Sie k\u00F6nnen Dokumente des Teilnehmers aktiv einziehen f\u00FCr den Fall, dass ein Teilnehmner vergessen hat die endg\u00FCltige Abgabe durchzuf\u00FCren.
 coach.collect.confirm.text=Sie sind gerade dabei den Abgabeprozess f\u00FCr "{0}" zu beenden. Bitte klicken Sie nur dann auf "OK", wenn Sie sicher sind dass bereits alle ben\u00F6tigten Dokumente abgegeben wurden.

src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties

-#Wed Jun 01 17:01:10 CEST 2016
+#Thu Jun 02 15:29:28 CEST 2016
 add.solution=Add solution
 add.task=Add task
 assessment.group.tool=Grade group
@@ -21,6 +21,7 @@ coach.assessment=Grade
 coach.back.to.submission=Re-open submission
 coach.back.to.submission.confirm.text=Are you sure you wish to re-open the task submission for "{0}"?
 coach.back.to.submission.confirm.title=Re-open submission
+coach.back.to.submission.desc=This action allows you to reset the submission status if a participant accidentally closed the submission step.
 coach.close.revision.button=Revision accepted
 coach.collect.confirm.desc=In case a participant forgot to finalize the submission process, coaches can manually collect documents of a participant.
 coach.collect.confirm.text=You are about to close the submission for "{0}". Please make sure all required documents were submitted before clicking "OK".

src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties

-#Thu Apr 21 15:22:05 CEST 2016
+#Thu Jun 02 15:11:46 CEST 2016
 add.track=Add Subtitle
 admin.config.enable=Enable video resource
 admin.config.title=Video configuration
@@ -6,25 +6,42 @@ admin.config.transcoding=Enable video transcoding
 admin.config.videoNode=Enable video course element
 admin.menu.title=Video
 admin.menu.title.alt=Configuration of the Video-Resource
-poster.help=Image of type JPG. Make sure the poster has the exact same dimension as the original video (same height and width in pixel).
+listing.viewing.counter={0} viewings
 poster.error.filetype=For poster images only images of type JPG are supported.
+poster.help=Image of type JPG. Make sure the poster has the exact same dimension as the original video (same height and width in pixel).
 poster.select=Select poster frame
+quality.master=Master video
+quality.resolution.1080=1080p Full-HD
+quality.resolution.2160=2160p 4K
+quality.resolution.240=240p
+quality.resolution.360=360p
+quality.resolution.480=480p
+quality.resolution.720=720p HD
+quality.table.header.dimension=Dimension
+quality.table.header.format=Format
+quality.table.header.resolution=Resolution
+quality.table.header.size=Size
+quality.table.header.view=Preview
+quality.view=preview
 tab.video.metaDataConfig=Metadata
 tab.video.posterConfig=Replace poster
+tab.video.qualityConfig=Video quality
 tab.video.settings=Video settings
 tab.video.trackConfig=Subtitle configuration
-tab.video.qualityConfig=Video quality
 topnav.video=LearnTube
 topnav.video.alt=Library with freely available learning videos
+track.delete=Delete
+track.langs=Language
+track.notrack=There are no subtitles for this video available yet. Select the button "$\:add.track" to add a subtitle file.
 track.table.header.delete=Delete
 track.table.header.file=File
 track.table.header.language=Language
 track.table.label=Subtitles
-track.delete=Delete
-track.langs=Language
-track.notrack=There are no subtitles for this video available yet. Select the button "$\:add.track" to add a subtitle file.
 track.upload=Upload
+track.upload.error.nofile=Please select a file.
 track.upload.error.nolang=Please select a language form the list
+transcoding.processing=Processing
+transcoding.waiting=Queuing
 video.config.creationDate=Creation Date
 video.config.description=Description
 video.config.fileSize=Size of videofile
@@ -42,19 +59,3 @@ video.config.tracks.table.add=add
 video.config.tracks.table.delete=delete
 video.config.tracks.table.lang=language
 video.config.width=Width
-quality.master=Master video
-quality.resolution.2160=2160p 4K
-quality.resolution.1080=1080p Full-HD
-quality.resolution.720=720p HD
-quality.resolution.480=480p
-quality.resolution.360=360p
-quality.resolution.240=240p
-quality.table.header.dimension=Dimension
-quality.table.header.format=Format
-quality.table.header.size=Size
-quality.table.header.resolution=Resolution
-quality.table.header.view=Preview
-quality.view=preview
-transcoding.waiting=Queuing
-transcoding.processing=Processing
-listing.viewing.counter={0} viewings
\ No newline at end of file