diff --git a/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java b/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java
index 3c9aa299ca52457fe0695e547c781a28cd138565..edfe59d174db5e44c79244d59481f7ed82bc6078 100644
--- a/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java
+++ b/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java
@@ -532,7 +532,11 @@ class GTANotifications {
 				};
 				
 				if(score != null && status != null) {
-					appendSubscriptionItem("notifications.assessment.score.passed", params, assessedIdentity, graduationDate, coach);
+					if(assessment.getPassed().booleanValue()) {
+						appendSubscriptionItem("notifications.assessment.score.passed", params, assessedIdentity, graduationDate, coach);
+					} else {
+						appendSubscriptionItem("notifications.assessment.score.notpassed", params, assessedIdentity, graduationDate, coach);
+					}
 				} else if(score != null) {
 					appendSubscriptionItem("notifications.assessment.score", params, assessedIdentity, graduationDate, coach);
 				} else if(status != null) {
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAAvailableTaskController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAAvailableTaskController.java
index 29df800a19f614e07499ec71648947dd1f4ebfcb..184d4557ae5eb86a40d1b189ed2b220a507c6339 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAAvailableTaskController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAAvailableTaskController.java
@@ -60,6 +60,7 @@ import org.olat.course.nodes.GTACourseNode;
 import org.olat.course.nodes.gta.AssignmentResponse;
 import org.olat.course.nodes.gta.GTAManager;
 import org.olat.course.nodes.gta.GTAType;
+import org.olat.course.nodes.gta.Task;
 import org.olat.course.nodes.gta.TaskList;
 import org.olat.course.nodes.gta.model.TaskDefinition;
 import org.olat.course.nodes.gta.ui.component.DescriptionWithTooltipCellRenderer;
@@ -270,11 +271,11 @@ public class GTAAvailableTaskController extends FormBasicController {
 			showInfo("task.successfully.assigned");
 			fireEvent(ureq, Event.DONE_EVENT);
 			gtaManager.log("Assignment", "task assigned", response.getTask(), getIdentity(), assessedIdentity, assessedGroup, courseEnv, gtaNode);
-			doSendConfirmationEmail();
+			doSendConfirmationEmail(response.getTask());
 		}
 	}
 	
-	private void doSendConfirmationEmail() {
+	private void doSendConfirmationEmail(Task assignedTask) {
 		MailContext context = new MailContextImpl(getWindowControl().getBusinessControl().getAsString());
 		
 		MailBundle bundle = new MailBundle();
@@ -288,9 +289,15 @@ public class GTAAvailableTaskController extends FormBasicController {
 			contacts.add(assessedIdentity);
 		}
 		bundle.setContactList(contacts);
-
-		String subject = translate("mail.confirm.assignment.subject");
-		String body = translate("mail.confirm.assignment.body");
+		
+		String[] args = new String[] {
+			getIdentity().getUser().getFirstName(),	//0 first name
+			getIdentity().getUser().getLastName(),	//1 last name
+			courseEnv.getCourseTitle(),				//2 course name
+			assignedTask.getTaskName()				//3 task
+		};
+		String subject = translate("mail.confirm.assignment.subject", args);
+		String body = translate("mail.confirm.assignment.body", args);
 		bundle.setContent(subject, body);
 
 		mailManager.sendMessage(bundle);
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/NewSolutionController.java b/src/main/java/org/olat/course/nodes/gta/ui/NewSolutionController.java
index 45283e387679b08c9616e35a9e48efa6275f78a7..c56951e1eed43e7b2ce08fff74015b77877e073f 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/NewSolutionController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/NewSolutionController.java
@@ -67,6 +67,12 @@ public class NewSolutionController extends FormBasicController {
 		formLayout.add(formButtons);
 		uifactory.addFormSubmitButton("submit", "create", formButtons);
 		uifactory.addFormCancelButton("cancel", formButtons, ureq, getWindowControl());
+		
+		String jsPage = velocity_root + "/new_task_js.html";
+		FormLayoutContainer jsCont = FormLayoutContainer.createCustomFormLayout("js", getTranslator(), jsPage);
+		jsCont.contextPut("titleId", titleEl.getFormDispatchId());
+		jsCont.contextPut("filenameId", filenameEl.getFormDispatchId());
+		formLayout.add(jsCont);
 	}
 	
 	@Override
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 bbc8ec7fb29afee177195f1b484ff014be6d19d1..c76903ec7b39fc23e8d5b86bfea078a88f7833ed 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
@@ -121,7 +121,7 @@ highscore.forminfo=Die HighScore Funktionalit\u00E4t bezieht sich auf die einzel
 info.title=$org.olat.course.nodes.ms\:info.title
 lastmodified=am {0}
 log.title=\u00C4nderungsverlauf
-mail.confirm.assignment.body=Zuweisung war erfolgreich
+mail.confirm.assignment.body=Liebe(r) {0} {1}\n\nSie haben im Kurs "{2}" die Aufgabe "{3}" ausgewählt. Die Zuweisung war erfolgreich.
 mail.confirm.assignment.subject=Zuweisung
 mailto.group=E-Mail an Gruppe 
 mailto.user=E-Mail an Benutzer 
@@ -134,9 +134,10 @@ notifications.assessment.passed.false=nicht bestanden
 notifications.assessment.passed.true=bestanden
 notifications.assessment.score=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" haben Sie eine Bewertung erhalten. Ihre Punktzahl betr\u00E4gt {2} Punkte.
 notifications.assessment.score.passed=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" haben Sie eine Bewertung erhalten. Ihre Punktzahl betr\u00E4gt {2} Punkte und Sie haben {3}.
+notifications.assessment.score.notpassed=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" haben Sie eine Bewertung erhalten. Ihre Punktzahl betr\u00E4gt {2} Punkte und Sie haben {3}.
 notifications.correction=F\u00FCr Ihre Aufgabe "{0}" im Kurs "{1}" wurde eine \u00DCberarbeitung angefordert.
 notifications.correction.doc=Sie haben ein Feedback f\u00FCr die Aufgabe "{0}" im Kurs "{1}" von {3} erhalten\: "{2}".
-notifications.correction.duedate=$\:notifications.correction Die \u00DCberarbeitungsfrist wurde auf den {3} gesetzt.
+notifications.correction.duedate=$\:notifications.correction Die \u00DCberarbeitungsfrist wurde auf den {2} gesetzt.
 notifications.group.header=Gruppenaufgabe in Kurs "{0}"
 notifications.group.header.task=Gruppenaufgabe "{0}" in Kurs "{1}"
 notifications.individual.header=Aufgabe in Kurs "{0}"
@@ -148,9 +149,9 @@ notifications.revision.individual.doc=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" w
 notifications.solution=Im Kurs "{0}" steht die folgende Musterl\u00F6sung zum Download bereit\: "{1}".
 notifications.solution.task=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" steht die folgende Musterl\u00F6sung zum Download bereit\: "{2}".
 notifications.submission.group=Die Aufgabe "{0}" im Kurs "{1}" wurde f\u00FCr Gruppe "{2}" abgegeben.
-notifications.submission.group.doc=\=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" wurde eine neue Dokument "{2}" von "{3}" f\u00FCr Gruppe "{4}" hochgeladen.
+notifications.submission.group.doc=\=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" wurde ein neues Dokument "{2}" von "{3}" f\u00FCr Gruppe "{4}" hochgeladen.
 notifications.submission.individual=Die Aufgabe "{0}" im Kurs "{1}" wurde von "{2}" abgegeben.
-notifications.submission.individual.doc=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" wurde eine neue Dokument "{2}" von "{3}" hochgeladen.
+notifications.submission.individual.doc=F\u00FCr die Aufgabe "{0}" im Kurs "{1}" wurde ein neues Dokument "{2}" von "{3}" hochgeladen.
 open.group=Gruppe \u00F6ffnen
 pane.tab.accessibility=Zugang
 pane.tab.assignment=Aufgabenstellung
@@ -162,7 +163,7 @@ pane.tab.submission=Abgabe
 pane.tab.workflow=Workflow
 participant.confirm.reset.task.nok=Nein, ich behalte meine Aufgabe
 participant.confirm.reset.task.ok=Ja, Aufgabe zur\u00FCcksetzen
-participant.confirm.reset.task.text=Sie w\u00FCrden von {0} erlaubt Ihre Aufgabe "{1}" zur\u00FCckzusetzen. Alle dokumenten dass Sie schon hochgeladet haben werden gel\u00F6scht.
+participant.confirm.reset.task.text=Ihnen w\u00FCrde von {0} erlaubt, Ihre Aufgabe "{1}" zur\u00FCckzusetzen. Alle dokumente, welche Sie bereits hochgeladen haben, werden unwiderruflich gel\u00F6scht.
 participant.confirm.reset.task.title=Aufgabe zur\u00FCcksetzen
 participant.reset.button=Daten zur\u00FCcksetzen
 passed.false=$org.olat.course.assessment\:passed.false
@@ -185,7 +186,7 @@ process.review.explanation=Der Betreuer begutachtet die abgegebene L\u00F6sung.
 process.revision=\u00DCberarbeitung
 process.revision.explanation=Der Benutzer \u00FCberarbeitet die Aufgabe.
 process.solution=L\u00F6sung
-process.solution.explanation=Der Benutzer hat die Musterl\u00F6sung erhalten. Bei verf\u00FCgbarer Bewertung kann der Betreuer nun die Aufgabe bewerten. 
+process.solution.explanation=Der Benutzer hat die Musterl\u00F6sung erhalten order wird sie am vordefinierten Datum erhalten. Bei verf\u00FCgbarer Bewertung kann der Betreuer nun die Aufgabe bewerten. 
 process.submission=Abgabe
 process.submission.explanation=Der Benutzer bearbeitet gerade die Aufgabe.
 relative.dates=Relatives Datum
@@ -250,10 +251,10 @@ sampling.reuse=Aufgabe wird mehreren Benutzern / Gruppe zugewiesen
 sampling.unique=Aufgabe wird genau einem Benutzer / Gruppe zugewiesen
 save.done=Speichern als vervollst\u00E4ndigt
 selected.group=Die Gruppe f\u00FCr diese Aufgabe ist\: <i class\="o_icon o_icon_group"> </i> "{0}"
-solution.duedate=Musterl\u00F6sungen bis...
+solution.duedate=Musterl\u00F6sung ab...
 solution.file=Datei
 solution.list.description=W\u00E4hlen Sie "$\:add.solution" oder "$\:create.solution" um eine Musterl\u00F6sung hinzuzuf\u00FCgen, oder "$\:replace" oder "$org.olat.core\:edit" um eine bestehende Musterl\u00F6sung zu bearbeiten. Bitte beachten Sie dass Musterl\u00F6sungen keiner spezifischen Aufgabe zugewiesen werden.
-solution.list.title=Musterl\u00F6sungen hochladen
+solution.list.title=Musterl\u00F6sung
 solution.title=Titel
 submission=Abgabe
 submission.add.title=Dokument hinzuf\u00FCgen
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 d9adaee7b5d0cc79be25a4ea6838b2fa53c59851..28585b8dede96d6ae9bec71e9e652ca05fca6a2d 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
@@ -1,6 +1,6 @@
 #Thu Aug 10 14:29:45 CEST 2017
-add.solution=Add solution
-add.task=Add task
+add.solution=Upload solution
+add.task=Upload assignment
 assessment.group.tool=Grade group
 assignment.config.title=Task assignment configuration
 assignment.deadline=Assignment deadline
@@ -11,7 +11,7 @@ bulk.review=Download review
 bulk.revisions=Download revised documents
 bulk.solutions=Download solutions
 bulk.submitted.documents=Download submitted documents
-bulk.submitted.revisions=Download submitted corrections
+bulk.submitted.revisions=Download corrections
 change.group=Change active group
 change.group.description=You are participating in multiple groups.
 choose.areas=Select areas
@@ -19,11 +19,11 @@ choose.groups=Select groups
 choosed.areas=Areas
 choosed.groups=Groups
 coach.assessment=Grade
-coach.back.to.submission=Re-open submission
+coach.back.to.submission=Reopen 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.back.to.submission.confirm.title=Reopen submission
+coach.back.to.submission.desc=This action allows you to reset the submission status if a participant has submitted by accident.
+coach.close.revision.button=Accept revision
 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".
 coach.collect.confirm.title=Collect document(s)
@@ -36,16 +36,16 @@ coach.corrections.description=You have returned the following documents.
 coach.corrections.rejected=The submission has been rejected for revision.
 coach.corrections.waiting=The submission is waiting to be reviewed
 coach.document=Documents
-coach.document.open.editor=Open editor
+coach.document.open.editor=Create document
 coach.documents.successfully.reviewed=Reviewed\!
-coach.feedback.documents.desc=Uploaded documents are visible to the participants as soon as you have either accepted the submission as is, or requested a revision
+coach.feedback.documents.desc=Uploaded documents are visible to the participants as soon as you have either accepted the submission or requested a revision.
 coach.feedback.documents.title=Prepare feedback documents
 coach.need.revision.button=Needs revision
 coach.reopen=Reopen
 coach.reset.button=Reset data of task
 coach.reset.task.confirm.text=Do you want to allow "{0}" to reset its task?
 coach.reset.task.confirm.title=Reset data of task
-coach.reviewed.button=Submission accepted
+coach.reviewed.button=Accept submission
 coach.reviewed.confirm.text=Please confirm your acceptance of the submitted documents. The task is now closed for the user, and there is no revision option available.
 coach.reviewed.confirm.title=Confirm acceptance of submitted documents
 coach.revisions.confirm.text=Please confirm the request for a revision. The user is now allowed to submit more documents.
@@ -54,10 +54,10 @@ coach.revisions.confirm.title=Revision needed
 coach.revisions.description=You have received the following revised documents
 coach.revisions.nofiles=The revision was submitted without documents
 coach.submit.corrections.to.revision.button=$\:coach.need.revision.button
-coach.submitted.documents.description=These documents have been submitted
+coach.submitted.documents.description=These documents have been submitted\:
 coach.submitted.nofiles=The submission was done without documents
 coach.task.assigned.description=The following task has been assigned
-coach.verdict.desc=Submitted documents can be either accepted or rejected for revision. Once the submitted documents are accepted, the submission process is closed.
+coach.verdict.desc=Submitted documents can either be accepted or rejected. Once the submitted documents are accepted, the submission process is closed.
 coach.verdict.title=Give feedback
 coach.waiting.assignment=Waiting for assignment
 coach.waiting.assignment.description=The task has not been assigned yet. The submission and reviewing process can only be started when the task has been assigned first. 
@@ -72,7 +72,7 @@ create=Create
 create.areas=Create learning area
 create.groups=Create group
 create.solution=Create solution
-create.task=Create task
+create.task=Create assignment
 days.after=days after
 details=Details
 document=Submitted documents
@@ -81,8 +81,8 @@ document.open.editor=Open editor
 download.task=Download task
 download.task.infos={0} ({1} MB)
 duedate.standard=Standard date\: {0}
-duedates=Prolongate
-duedates.user=Prolongate for "{0}"
+duedates=Extend
+duedates.user=Extend for "{0}"
 edit.task=Edit task
 editor.revisions.title=Revision configuration
 editor.title=Submission configuration
@@ -121,21 +121,22 @@ highscore.forminfo=The high-score feature refers to the members of a group. A co
 info.title=$org.olat.course.nodes.ms\:info.title
 lastmodified=at {0}
 log.title=Change log
-mail.confirm.assignment.body=Assignment was successful
+mail.confirm.assignment.body=Dear {0} {1}\n\nYou have choosed the following assignment "{3}" in course "{2}". The assignment was successful.
 mail.confirm.assignment.subject=Assignment
 mailto.group=Mail to group 
 mailto.user=Mail to user
 max.documents=Max. number of documents
 no.submission=No submission
 notifications.accepted=Your task "{0}" in the course "{1}" has been accepted.
-notifications.assessment.doc=You have got a grading document for the task "{0}" in the course "{1}"\: "{2}".
-notifications.assessment.passed=You have got a grading for the task "{0}" in the course "{1}". You have {3}.
+notifications.assessment.doc=You received a grading document for the task "{0}" in the course "{1}"\: "{2}".
+notifications.assessment.passed=You received a grade for the task "{0}" in the course "{1}". You have {3}.
 notifications.assessment.passed.false=failed
 notifications.assessment.passed.true=passed
-notifications.assessment.score=You have got a grading for the task "{0}" in the course "{1}". Your score ist {2}.
-notifications.assessment.score.passed=You have got a grading for the task "{0}" in the course "{1}". Your score ist {2} and you have {3}.
-notifications.correction=You have received a feedback for the task "{0}" in the course "{1}".
-notifications.correction.doc=You have received a feedback for the task "{0}" in the course "{1}" by {3}\: "{2}".
+notifications.assessment.score=You received a grade for the task "{0}" in the course "{1}". Your score is {2}.
+notifications.assessment.score.passed=You received a grade for the task "{0}" in the course "{1}". You have passed with a score of {2}.
+notifications.assessment.score.notpassed=You received a grade for the task "{0}" in the course "{1}". You haven't passed with a score of {2}.
+notifications.correction=You have received feedback for the task "{0}" in the course "{1}".
+notifications.correction.doc=You have received feedback for the task "{0}" in the course "{1}" by {3}\: "{2}".
 notifications.correction.duedate=$\:notifications.correction The deadline for the revision is set to the {2}.
 notifications.group.header=Group task in course "{0}"
 notifications.group.header.task=Group task "{0}" in course "{1}"
@@ -172,12 +173,12 @@ preview.disabled=$org.olat.course.nodes.ta\:form.task.without.preview
 preview.enabled=$org.olat.course.nodes.ta\:form.task.with.preview
 process.action.explanation=Action needed
 process.assignment=Assignment
-process.assignment.explanation=The user is selecting a task
+process.assignment.explanation=The user is selecting a task.
 process.correction=Correction
 process.correction.explanation=The coach is reviewing the revised documents.
 process.graded=Graded
 process.grading=Grading
-process.grading.explanation=The coach is grading the task.
+process.grading.explanation=The coach is grading.
 process.no=Assignment
 process.no.explanation=The user choose now a task.
 process.review=Review
@@ -185,7 +186,7 @@ process.review.explanation=The coach is reviewing the submitted documents.
 process.revision=Revision
 process.revision.explanation=The user is revising his solution.
 process.solution=Solution
-process.solution.explanation=The user has now access to the sample solution. The coach is able to grade the task, if available.
+process.solution.explanation=The user now has access to the sample solution or will get at the predefined date. The coach can now grade the submission (if enabled).
 process.submission=Submission
 process.submission.explanation=The user is working on the assigned task.
 relative.dates=Relative dates
@@ -199,38 +200,38 @@ replace.document=Replace document
 review.and.correction=Return and feedback
 review.enabled=Enable return box for reviews and feedback
 revision.enabled=Enable drop box for revisions by participants, can be set by coach
-revision.period=Revision phase
+revision.period=Revision
 revisions.duedate=Revision until...
-run.assignment.due.date=Due date\: {0}
+run.assignment.due.date=Deadline\: {0}
 run.assignment.title=Task assignment
-run.coach=Correct
+run.coach=Submissions
 run.coach.corrections.description=You have set the following correction request.
 run.corrections.description=Your coach attached the following files for you\:
-run.corrections.rejected=$\:coach.corrections.rejected
+run.corrections.rejected=Your submission has been rejected.
 run.documents.successfully.submitted=Your document(s) have been successfully submitted.
 run.grading=Grading
-run.manage.coach=Manage
+run.manage.coach=Edit tasks and sample solutions
 run.pick.task.description=Please select a task from the list below.
 run.review=Return and feedback
 run.review.closed=Your coach has accepted the submitted work for grading.
 run.review.description=Your coach is now reviewing your submitted documents. You will get notified when a reviewed or corrected version is available.
 run.review.waiting=Your coach is now reviewing the submitted work. You will get notified when a reviewed or corrected version is available.
-run.revised.description=The following revised documents have been submitted by you\:
+run.revised.description=You have submitted the following revised documents\:
 run.revised.nofiles=The revision was submitted without documents
-run.revision=Revision phase
+run.revision=Revision
 run.revision.due.date=Revision deadline\: {0}
-run.revision.period.description=$\:run.corrections.rejected Create or upload a revised document.
+run.revision.period.description=$\:run.corrections.rejected Please create or upload a revised document.
 run.run=Task
 run.solution=Sample solution
 run.solution.available.date={0}
 run.solutions.description=The following sample solutions are available for download\:
-run.submit=Submit
+run.submit=Task submission
 run.submit.button=Final task submission
 run.submit.confirm=Please confirm the submission for this task. The submission of the task is final and can not be undone. 
 run.submit.confirm.group=$\:run.submit.confirm<br/>This is a group task\! The submitted document is valid for all members of the group "{0}"\!
 run.submit.confirm.warning=You have not yet uploaded / created a document. Do you still wish to submit? The submission of the task is final and can not be undone. <br/> The drop box is closed. You will not be able to upload any documents.
 run.submit.confirm.warning.group=$\:run.submit.confirm.warning<br/>This is a group task\! The submitted document is valid for all members of the group "{0}"\!
-run.submit.due.date=Due date\: {0}
+run.submit.due.date=Deadline\: {0}
 run.submit.individual.description.all=Submit your solution by either uploading a document you created on your computer or use the editor to write your solution right here.
 run.submit.individual.description.editor=Submit your solution by using the editor to write your solution right here.
 run.submit.individual.description.upload=Submit your solution by uploading a document you created on your computer.
@@ -253,7 +254,7 @@ selected.group=The group for this task is\: <i class\="o_icon o_icon_group"> </i
 solution.duedate=Solution until...
 solution.file=File
 solution.list.description=Select "$\:add.solution" or "$\:create.solution" to add a solution or "$\:replace" or "$org.olat.core\:edit" to modify an existing solution. Please note that solutions are not assigned to a particular task.
-solution.list.title=Upload sample solutions
+solution.list.title=Sample solutions
 solution.title=Title
 submission=Submission
 submission.add.title=Add document
@@ -265,9 +266,9 @@ submission.mail.subject=OpenOLAT-confirmation-E-Mail
 submission.nofile=No file uploaded
 submission.text=Text after handing in
 submit.deadline=Submission deadline
-submit.documents.desc=Before submitting a task, documents must be either created or uploaded. These documents are not yet submitted and therefore not visible for the coach.
+submit.documents.desc=Please create or upload the documents with your solutions to the task. These documents are not yet submitted and therefore not visible to the coach.
 submit.documents.title=Step 1\: Prepare documents
-submit.submit.desc=In order to submit documents and thus make them visible for coaches, you need to confirm the submission by clicking the button below.
+submit.submit.desc=To make your solutions visible for coaches, you need to confirm the submission by clicking the button below.
 submit.submit.title=Step 2\: Submit documents
 table.header.author=Author
 table.header.comment=Comment
@@ -295,8 +296,8 @@ task.execution=Task execution
 task.execution.group=as a group
 task.execution.individual=individual
 task.file=File
-task.list.description=Select "$\:add.task" to add a new task, "$\:create.task" to create a new task using the HTML editor or "$org.olat.core\:edit" or "$\:replace" to modify an existing task. If all users work on the same task, create a single task.
-task.list.title=Tasks
+task.list.description=Select "$\:add.task" to add a new assignment, "$\:create.task" to create a new assignment using the HTML editor or "$org.olat.core\:edit" or "$\:replace" to modify an existing assignment. If all users work on the same assignment, create a single assignment.
+task.list.title=Assignment
 task.steps.description=Select which elements in the task workflow are enabled and set optional due dates for the workflow management.
 task.steps.title=Workflow steps
 task.successfully.assigned=The task was successfully assigned to you.
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
index 679c000eaa5855d0017b4e725abc7c882111945e..e5f96f8cd541b9402c517da7560a9be2b0b6087d 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
@@ -114,7 +114,7 @@ highscore.forminfo=La fonction HighScore se r\u00E9f\u00E8re aux membres d'un gr
 info.title=$org.olat.course.nodes.ms\:info.title
 lastmodified=le {0}
 log.title=Historique des modifications
-mail.confirm.assignment.body=Affectation du devoir est r\u00E9ussi.
+mail.confirm.assignment.body=Cher, chère {0} {1}\n\nVous avez choisi le devoir "{3}" du cours "{2}". Die Zuweisung war erfolgreich. L'affectation du devoir est r\u00E9ussi.
 mail.confirm.assignment.subject=Affectation
 mailto.group=Courriel au groupe
 mailto.user=Courriel au utilisateur
@@ -147,7 +147,7 @@ process.review.explanation=Le coach corrige un document
 process.revision=Remaniements
 process.revision.explanation=L'utilisateur r\u00E9vise un document.
 process.solution=Solution
-process.solution.explanation=L'utilisateur a acc\u00E8s \u00E0 la solution. Le coach peut d\u00E9sormais \u00E9valuer les devoirs si activ\u00E9.
+process.solution.explanation=L'utilisateur a acc\u00E8s \u00E0 la solution ou y aura acc\u00E8s à la date pr\u00E9d\u00E9finie. Le coach peut d\u00E9sormais \u00E9valuer les devoirs si activ\u00E9.
 process.submission=D\u00E9p\u00F4t
 process.submission.explanation=L'utilisateur travaille au devoir.
 relative.dates=Dates relatives