diff --git a/src/main/java/de/bps/course/nodes/den/DENManager.java b/src/main/java/de/bps/course/nodes/den/DENManager.java
index 2a0ff5df83a1fd460b5efeb2e3d54252ff89184b..14d610236da5600a0d942ff2a0c477ca8e1757de 100644
--- a/src/main/java/de/bps/course/nodes/den/DENManager.java
+++ b/src/main/java/de/bps/course/nodes/den/DENManager.java
@@ -796,8 +796,7 @@ public class DENManager {
 					identity.getUser().getProperty(UserConstants.FIRSTNAME, ureq.getLocale()),
 					identity.getUser().getProperty(UserConstants.LASTNAME, ureq.getLocale()),
 					identity.getUser().getProperty(UserConstants.EMAIL, ureq.getLocale()),
-					identity.getName(),
-					subjectStr
+					"", subjectStr
 				};
 		
 		String subject = translator.translate("mail.participants.add.subject", bodyArgs);
@@ -806,10 +805,7 @@ public class DENManager {
 		MailTemplate mailTempl = new MailTemplate(subject, body, null) {
 			@Override
 			public void putVariablesInMailContext(VelocityContext context, Identity identity) {
-//				User user = identity.getUser();
-//				context.put("firstname", user.getProperty(UserConstants.FIRSTNAME, ureq.getLocale()));
-//				context.put("lastname", user.getProperty(UserConstants.LASTNAME, ureq.getLocale()));
-//				context.put("login", identity.getName());
+				//
 			}
 		};
 		
@@ -830,23 +826,17 @@ public class DENManager {
 				identity.getUser().getProperty(UserConstants.FIRSTNAME, ureq.getLocale()),
 				identity.getUser().getProperty(UserConstants.LASTNAME, ureq.getLocale()),
 				identity.getUser().getProperty(UserConstants.EMAIL, ureq.getLocale()),
-					identity.getName(), //TODO username
-					subjectStr
+					"", subjectStr
 				};
 		
 		String subject = trans.translate("mail.participants.remove.subject", bodyArgs);
 		String body = trans.translate("mail.participants.remove.body", bodyArgs);
-		
 		MailTemplate mailTempl = new MailTemplate(subject, body, null) {
 			@Override
 			public void putVariablesInMailContext(VelocityContext context, Identity identity) {
-//				User user = identity.getUser();
-//				context.put("firstname", user.getFirstName());
-//				context.put("lastname", user.getLastName());
-//				context.put("login", identity.getName());
+				//
 			}
 		};
-		
 		return mailTempl;
 	}
 	
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_ar.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_ar.properties
index ac8ffd6718c5f0c8bcc27a8c69543a223f424cce..83be75c7456fa46b8f116b6acb7350613cf5f296 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_ar.properties
@@ -92,9 +92,9 @@ form.error.notempty=\u064A\u0631\u062C\u0649 \u0627\u0644\u0643\u062A\u0627\u062
 guestnoaccess.message=\u0644\u0627 \u064A\u0645\u0643\u0646 \u0644\u0644\u0632\u0627\u0626\u0631\u064A\u0646 \u0627\u0644\u0648\u0635\u0648\u0644 \u0644\u0647\u0630\u0627 \u0627\u0644\u062C\u0632\u0621 \u0645\u0646 \u0627\u0644\u0645\u0642\u0631\u0631\r\n\u0645\u0646 \u0623\u062C\u0644 \u0625\u062A\u0627\u062D\u0629 \u0627\u0644\u0648\u0635\u0648\u0644 \u0644\u0647\u0630\u0627 \u0627\u0644\u062C\u0632\u0621 \u064A\u062C\u0628 \u0627\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u062A\u0631\u062E\u064A\u0635 \u0639\u0646 \u0637\u0631\u064A\u0642 \u062C\u0627\u0645\u0639\u062A\u0643 \u0623\u0648 \u0645\u0646 \u062E\u0644\u0627\u0644 \u0627\u0644\u062A\u0633\u062C\u064A\u0644 \u0641\u0649 \u0623\u0648\u0644\u0627\u062A. <p>
 guestnoaccess.title=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062F\u062E\u0648\u0644 \u0627\u0644\u0632\u0627\u0626\u0631\u064A\u0646
 help.hover.den=\u0645\u0633\u0627\u0639\u062F\u0629 \u0641\u0649 \u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062F\u062E\u0648\u0644
-mail.participants.add.body=***  ***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u064A\u0631\u062C\u0649 \u0639\u062F\u0645 \u0627\u0644\u0631\u062F\r\n\r\n \u0644\u0642\u062F \u0642\u0645\u062A \u0628\u0627\u0644\u062A\u0633\u062C\u064A\u0644 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({3})\:\r\n\r\n{4}  \:\u0627\u0644\u062A\u0627\u0631\u064A\u062E
+mail.participants.add.body=***  ***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u064A\u0631\u062C\u0649 \u0639\u062F\u0645 \u0627\u0644\u0631\u062F\r\n\r\n \u0644\u0642\u062F \u0642\u0645\u062A \u0628\u0627\u0644\u062A\u0633\u062C\u064A\u0644 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({2})\:\r\n\r\n{4}  \:\u0627\u0644\u062A\u0627\u0631\u064A\u062E
 mail.participants.add.subject=\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0645\u0647\u0645\u0629\: (4) \u0644\u0642\u062F \u0642\u0645\u062A \u0628\u0627\u0644\u062A\u0633\u062C\u064A\u0644.
-mail.participants.remove.body=***  ***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u064A\u0631\u062C\u0649 \u0639\u062F\u0645 \u0627\u0644\u0631\u062F\r\n\r\n \u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({3})\:\r\n\r\n\u0627\u0644\u062A\u0627\u0631\u064A\u062E\: {4}\r\n\r\n{0} {1} ({2}) \u0627\u0630\u0627 \u0643\u0627\u0646 \u0644\u062F\u064A\u0643 \u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0631\u062C\u0649 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0627\u0644\u062C\u0647\u0627\u062A
+mail.participants.remove.body=***  ***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u064A\u0631\u062C\u0649 \u0639\u062F\u0645 \u0627\u0644\u0631\u062F\r\n\r\n \u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({2})\:\r\n\r\n\u0627\u0644\u062A\u0627\u0631\u064A\u062E\: {4}\r\n\r\n{0} {1} ({2}) \u0627\u0630\u0627 \u0643\u0627\u0646 \u0644\u062F\u064A\u0643 \u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0631\u062C\u0649 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0627\u0644\u062C\u0647\u0627\u062A
 mail.participants.remove.subject=\u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0645\u0647\u0645\u0629\: (4) \u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C.
 notifications.entry="{0}" \u0627\u0644\u062A\u0639\u062F\u064A\u0644\u0627\u062A \u0641\u0649
 notifications.header="{0}" \u062A\u0627\u0631\u064A\u062E \u0627\u0644\u0645\u0647\u0645\u0629 \u0641\u0649 \u0627\u0644\u0645\u0642\u0631\u0631
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_bg.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_bg.properties
index b3d4732972540a5ff972e79c6e866b3f9785abbf..f47a019de81b07c8870c1fd157a5ae1bb73da521 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_bg.properties
@@ -92,9 +92,9 @@ form.error.notempty=\u041C\u043E\u043B\u044F, \u043F\u043E\u043F\u044A\u043B\u04
 guestnoaccess.message=\u0422\u0430\u0437\u0438 \u0447\u0430\u0441\u0442 \u043E\u0442 \u043A\u0443\u0440\u0441\u0430 \u043D\u0435 \u0435 \u0434\u043E\u0441\u0442\u044A\u043F\u043D\u0430 \u0437\u0430 \u0433\u043E\u0441\u0442\u0438. <p>\u0417\u0430 \u0434\u0430 \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u0435 \u0434\u043E\u0441\u0442\u044A\u043F, \u0432\u0438\u0435 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0441\u0435 \u0430\u0432\u0442\u0435\u043D\u0442\u0438\u043A\u0438\u0440\u0430\u0442\u0435 \u0447\u0440\u0435\u0437 \u0432\u0430\u0448\u0430\u0442\u0430 \u0438\u043D\u0441\u0442\u0438\u0442\u0443\u0446\u0438\u044F \u0438\u043B\u0438 \u0434\u0430 \u0441\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0430\u0442\u0435 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430.
 guestnoaccess.title=\u041D\u044F\u043C\u0430 \u0434\u043E\u0441\u0442\u044A\u043F \u0437\u0430 \u0433\u043E\u0441\u0442\u0438
 help.hover.den=\u041F\u043E\u043C\u043E\u0449 \u0437\u0430 \u0437\u0430\u043F\u0438\u0441\u0432\u0430\u043D\u0435 \u0437\u0430 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0430 \u0434\u0430\u0442\u0430
-mail.participants.add.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435. *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043F\u0440\u0438\u0431\u0430\u0432\u0435\u043D\u0438 \u043E\u0442 {0} {1} ({3}) \u043A\u044A\u043C \u0437\u0430\u043F\u0438\u0441\u0432\u0430\u043D\u0435\u0442\u043E \u0437\u0430 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0430 \u0434\u0430\u0442\u0430\: \r\n\r\n\u0414\u0430\u0442\u0430\: {4}
+mail.participants.add.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435. *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043F\u0440\u0438\u0431\u0430\u0432\u0435\u043D\u0438 \u043E\u0442 {0} {1} ({2}) \u043A\u044A\u043C \u0437\u0430\u043F\u0438\u0441\u0432\u0430\u043D\u0435\u0442\u043E \u0437\u0430 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0430 \u0434\u0430\u0442\u0430\: \r\n\r\n\u0414\u0430\u0442\u0430\: {4}
 mail.participants.add.subject=\u0414\u0430\u0442\u0430 \u0437\u0430 \u0437\u0430\u043F\u0438\u0441\u0432\u0430\u043D\u0435\: {4}. \u0412\u0438\u0435 \u0441\u0442\u0435 \u043F\u0440\u0438\u0431\u0430\u0432\u0435\u043D\u0438.
-mail.participants.remove.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435. *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u0438\u0437\u0442\u0440\u0438\u0442\u0438 {0} {1} ({3}) \u043E\u0442 \u0434\u0430\u0442\u0430\u0442\u0430 \u0437\u0430 \u0437\u0430\u043F\u0438\u0441\u0432\u0430\u043D\u0435\: \r\n\r\n\u0414\u0430\u0442\u0430\: {4}\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F, \u043F\u043E\u043F\u0438\u0442\u0430\u0439\u0442\u0435 {0} {1} ({2}).
+mail.participants.remove.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435. *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u0438\u0437\u0442\u0440\u0438\u0442\u0438 {0} {1} ({2}) \u043E\u0442 \u0434\u0430\u0442\u0430\u0442\u0430 \u0437\u0430 \u0437\u0430\u043F\u0438\u0441\u0432\u0430\u043D\u0435\: \r\n\r\n\u0414\u0430\u0442\u0430\: {4}\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F, \u043F\u043E\u043F\u0438\u0442\u0430\u0439\u0442\u0435 {0} {1} ({2}).
 mail.participants.remove.subject=\u0414\u0430\u0442\u0430 \u0437\u0430 \u0437\u0430\u043F\u0438\u0441\u0432\u0430\u043D\u0435\: {4}. \u0412\u0438\u0435 \u0441\u0442\u0435 \u0438\u0437\u0442\u0440\u0438\u0442\u0438.
 notifications.entry=\u041F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u0430 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B \u043D\u0430 {0}
 notifications.header=\u0418\u043C\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u0438 \u043E\u0442\u043D\u043E\u0441\u043D\u043E \u0430\u043D\u0433\u0430\u0436\u0438\u043C\u0435\u043D\u0442\u0438 \u0432 \u0435\u0434\u0438\u043D \u043E\u0442 \u0432\u0430\u0448\u0438\u0442\u0435 \u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0438, \u0437\u0430 \u043A\u043E\u0439\u0442\u043E \u0441\u0442\u0435 \u0430\u0431\u043E\u043D\u0438\u0440\u0430\u043D\u0438\:
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_cs.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_cs.properties
index 84c524a5b1df14cbce894ee9f07bf67b6447157d..3ecb1e24c92b2d1b634660a9bcca1611a1142ba6 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_cs.properties
@@ -70,9 +70,9 @@ form.enableCancelEnroll=Umo\u017Enit zru\u0161en\u00ED z\u00E1pisu
 form.error.format=Chybn\u00FD vstup
 form.error.notempty=Pros\u00EDm vypl\u0148te
 help.hover.den=Help for date enrollment
-mail.participants.add.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte. *** \n\nByl proveden V\u00E1\u0161 z\u00E1pis {0} {1} ({3}) do term\u00EDnu\: \n\nDatum\: {4}
+mail.participants.add.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte. *** \n\nByl proveden V\u00E1\u0161 z\u00E1pis {0} {1} ({2}) do term\u00EDnu\: \n\nDatum\: {4}
 mail.participants.add.subject=Datum z\u00E1pisu\: {4}. Z\u00E1pis byl proveden.
-mail.participants.remove.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte. *** \n\nV\u00E1\u0161 z\u00E1pis byl zru\u0161en {0} {1} ({3}) z n\u00E1sleduj\u00EDc\u00EDho term\u00EDnu\: \n\nDatum\: {4}\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}).
+mail.participants.remove.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte. *** \n\nV\u00E1\u0161 z\u00E1pis byl zru\u0161en {0} {1} ({2}) z n\u00E1sleduj\u00EDc\u00EDho term\u00EDnu\: \n\nDatum\: {4}\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}).
 mail.participants.remove.subject=Datum z\u00E1pisu\: {4}. Z\u00E1pis byl zru\u0161en.
 pane.tab.accessibility=P\u0159\u00EDstup
 pane.tab.denconfig=Nastaven\u00ED
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_de.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_de.properties
index 4dd0a5a2d590e406f3804867b0f5fbe8972e4101..6efd4222e00e424dfc7d3cde823b11cddb4e4050 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_de.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_de.properties
@@ -115,9 +115,9 @@ participants.message=E-Mail an alle Teilnehmer
 participants.message.to=Gew\u00E4hlte Teilnehmer
 participants.message.empty = Bitte treffen Sie eine Auswahl.
 
-mail.participants.add.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) f\u00FCr einen Termin eingetragen\: \n\nTerminname\: {4}
+mail.participants.add.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) f\u00FCr einen Termin eingetragen\: \n\nTerminname\: {4}
 mail.participants.add.subject=Terminvergabe\: {4}. Sie wurden eingetragen.
-mail.participants.remove.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) aus dem Termin ausgetragen\: \n\nTerminname\: {4}\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
+mail.participants.remove.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) aus dem Termin ausgetragen\: \n\nTerminname\: {4}\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
 mail.participants.remove.subject=Terminvergabe\: {4}. Sie wurden ausgetragen.
 
 guestnoaccess.message=Dieser Teil des Kurses ist f\u00FCr G\u00E4ste nicht zug\u00E4nglich. <p>Um Zugang zu diesem Teil zu erhalten, m\u00FCssen Sie sich \u00FCber eine Hochschule authentifizieren oder bei OLAT registrieren.
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_el.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_el.properties
index 9db0acd5a09c15124eb13a75f13735ebd148cd63..550cd7dc87c4eb5273adbeebbbc857e6977da246 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_el.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_el.properties
@@ -92,9 +92,9 @@ form.error.notempty=\u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03C3\u03C
 guestnoaccess.message=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03BC\u03AC\u03B8\u03B7\u03BC\u03B1 \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B9\u03BC\u03BF \u03B1\u03C0\u03CC \u03B5\u03C0\u03B9\u03C3\u03BA\u03AD\u03C0\u03C4\u03B5\u03C2.<p>\u0393\u03B9\u03B1 \u03BD\u03B1 \u03B1\u03C0\u03BF\u03BA\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7 \u03B8\u03B1 \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C0\u03B9\u03C3\u03C4\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03B5\u03C4\u03B5 \u03C4\u03B7\u03BD \u03C4\u03B1\u03C5\u03C4\u03CC\u03C4\u03B7\u03C4\u03AC \u03C3\u03B1\u03C2 \u03BC\u03AD\u03C3\u03C9 \u03C4\u03BF\u03C5 \u03C0\u03B1\u03BD\u03B5\u03C0\u03B9\u03C3\u03C4\u03B7\u03BC\u03AF\u03BF\u03C5 \u03C3\u03B1\u03C2 \u03AE \u03BD\u03B1 \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03B5\u03AF\u03C4\u03B5 \u03C3\u03C4\u03BF OLAT.
 guestnoaccess.title=\u039C\u03B7 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B9\u03BC\u03BF \u03C3\u03B5 \u03B5\u03C0\u03B9\u03C3\u03BA\u03AD\u03C0\u03C4\u03B5\u03C2
 help.hover.den=\u0392\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1 \u03B3\u03B9\u03B1 \u03C4\u03B7\u03BD \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1 \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2
-mail.participants.add.body=*** \u0391\u03C5\u03C4\u03BF\u03BC\u03B1\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AC\u03C4\u03B5. *** \n\n\u03A0\u03C1\u03BF\u03C3\u03C4\u03B5\u03B8\u03AE\u03BA\u03B1\u03C4\u03B5 \u03B1\u03C0\u03CC {0} {1} ({3}) \u03C3\u03C4\u03B7\u03BD \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1 \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2\: \n\n\u0397\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\: {4}
+mail.participants.add.body=*** \u0391\u03C5\u03C4\u03BF\u03BC\u03B1\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AC\u03C4\u03B5. *** \n\n\u03A0\u03C1\u03BF\u03C3\u03C4\u03B5\u03B8\u03AE\u03BA\u03B1\u03C4\u03B5 \u03B1\u03C0\u03CC {0} {1} ({2}) \u03C3\u03C4\u03B7\u03BD \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1 \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2\: \n\n\u0397\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\: {4}
 mail.participants.add.subject=\u039F\u03C1\u03B9\u03C3\u03BC\u03CC\u03C2 \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\u03C2\: {4}. \u03A0\u03C1\u03BF\u03C3\u03C4\u03B5\u03B8\u03AE\u03BA\u03B1\u03C4\u03B5.
-mail.participants.remove.body=*** \u0391\u03C5\u03C4\u03BF\u03BC\u03B1\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AC\u03C4\u03B5. *** \n\n\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03BA\u03B1\u03C4\u03B5 \u03B1\u03C0\u03CC {0} {1} ({3}) \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1 \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2\: \n\n\u0397\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\: {4}\n\n\u0391\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C1\u03AF\u03B5\u03C2, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03C1\u03C9\u03C4\u03AE\u03C3\u03C4\u03B5 {0} {1} ({2}).
+mail.participants.remove.body=*** \u0391\u03C5\u03C4\u03BF\u03BC\u03B1\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AC\u03C4\u03B5. *** \n\n\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03BA\u03B1\u03C4\u03B5 \u03B1\u03C0\u03CC {0} {1} ({2}) \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1 \u03B5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2\: \n\n\u0397\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\: {4}\n\n\u0391\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C1\u03AF\u03B5\u03C2, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03C1\u03C9\u03C4\u03AE\u03C3\u03C4\u03B5 {0} {1} ({2}).
 mail.participants.remove.subject=\u039F\u03C1\u03B9\u03C3\u03BC\u03CC\u03C2 \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\u03C2\: {4}. \u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03BA\u03B1\u03C4\u03B5.
 notifications.entry=\u03A4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03B5\u03B9\u03C2 \u03C4\u03BF\u03C5 "{0}"
 notifications.header=\u039F\u03C1\u03B9\u03C3\u03BC\u03CC\u03C2 \u03B7\u03BC\u03B5\u03C1\u03BF\u03BC\u03B7\u03BD\u03AF\u03B1\u03C2 \u03C3\u03C4\u03BF \u03BC\u03AC\u03B8\u03B7\u03BC\u03B1 "{0}"
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_en.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_en.properties
index 83a311266981c317111c7c11ebbf50243a852b13..5c4ed7cd8e1d96123b7e8164f55739e501257de3 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_en.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_en.properties
@@ -93,9 +93,9 @@ form.error.notempty=Please fill in
 guestnoaccess.message=This course part is not accessible for guests. <p>In order to get access you have to authenticate via your university or register in OLAT.
 guestnoaccess.title=No guest access
 help.hover.den=Help to sign in
-mail.participants.add.body=*** This is an automated message. Please do not reply. *** \r\n\r\nYou were signed up by {0} {1} ({3})\: \r\n\r\nDate\: {4}
+mail.participants.add.body=*** This is an automated message. Please do not reply. *** \r\n\r\nYou were signed up by {0} {1} ({2})\: \r\n\r\nDate\: {4}
 mail.participants.add.subject=Date assignment\: {4}. You were signed up.
-mail.participants.remove.body=*** This is an automated message. Please do not reply. *** \r\n\r\nYou were signed out by {0} {1} ({3})\: \r\n\r\nDate\: {4}\r\n\r\nIf you have any questions please contact {0} {1} ({2}).
+mail.participants.remove.body=*** This is an automated message. Please do not reply. *** \r\n\r\nYou were signed out by {0} {1} ({2})\: \r\n\r\nDate\: {4}\r\n\r\nIf you have any questions please contact {0} {1} ({2}).
 mail.participants.remove.subject=Date assignment\: {4}. Your were signed out.
 notifications.entry=Modifications of "{0}"
 notifications.header=Date assignment in course "{0}"
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_es.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_es.properties
index d5b82e6bc5c1465bdae672e3aaaa08c09fcf8a17..a3a5f79df5007896828ffafb04ae9919aca7e596 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_es.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_es.properties
@@ -91,9 +91,9 @@ form.error.notempty=Por favor, rellene lo que est\u00E9 vac\u00EDo
 guestnoaccess.message=Esta parte del curso no es accesible para los usuarios invitados. <p>Para tener acceso debe autenticarse a trav\u00E9s de su universidad o registrarse en OLAT.
 guestnoaccess.title=Acceso denegado para invitados
 help.hover.den=Ayuda para inscripci\u00F3n de fecha
-mail.participants.add.body=*** Este es un mensaje generado autom\u00E1ticamente, no responder. *** \r\n\r\nUsted ha sido agregado por {0} {1} ({3}) para la inscripci\u00F3n de fecha\: \r\n\r\nFecha\: {4}
+mail.participants.add.body=*** Este es un mensaje generado autom\u00E1ticamente, no responder. *** \r\n\r\nUsted ha sido agregado por {0} {1} ({2}) para la inscripci\u00F3n de fecha\: \r\n\r\nFecha\: {4}
 mail.participants.add.subject=Inscripci\u00F3n de fecha\: {4}. Ha sido agregada.
-mail.participants.remove.body=*** Este es un mensaje generado autom\u00E1ticamente, no responder. *** \r\n\r\nUsted ha sido agregado por {0} {1} ({3}) para la inscripci\u00F3n de fecha\: \r\n\r\nFecha\: {4}\r\n\r\nPara cualquier pregunta no dude en contactar {0} {1} ({2}).
+mail.participants.remove.body=*** Este es un mensaje generado autom\u00E1ticamente, no responder. *** \r\n\r\nUsted ha sido agregado por {0} {1} ({2}) para la inscripci\u00F3n de fecha\: \r\n\r\nFecha\: {4}\r\n\r\nPara cualquier pregunta no dude en contactar {0} {1} ({2}).
 mail.participants.remove.subject=Inscripci\u00F3n de fecha\: {4}. Ha sido eliminada.
 pane.tab.accessibility=Acceso
 pane.tab.denconfig=Configuraci\u00F3n
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_fr.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_fr.properties
index 8462728c2abebb92b57c124792d5d5a2669da83d..e21d4aae63a9ffdbced593f605f44cb9f15c9c18 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_fr.properties
@@ -93,9 +93,9 @@ form.error.notempty=Veuillez remplir
 guestnoaccess.message=Cette partie du cours n'est pas accessible pour les invit\u00E9s. <p> Pour aqu\u00E9rir un acc\u00E8s vers cette partie, vous devez vous identifier via une universit\u00E9 ou vous enregistrer dans OLAT.
 guestnoaccess.title=Pas d'acc\u00E8s pour les invit\u00E9s
 help.hover.den=Aide \u00E0 l'inscription aux rendez-vous
-mail.participants.add.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 automatiquement. Veuillez ne pas y r\u00E9pondre. *** \n\nVous avez \u00E9t\u00E9 inscrit par {0} {1} ({3}) \u00E0 un rendez-vous \: \n\nNomDuRendezVous\: {4}
+mail.participants.add.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 automatiquement. Veuillez ne pas y r\u00E9pondre. *** \n\nVous avez \u00E9t\u00E9 inscrit par {0} {1} ({2}) \u00E0 un rendez-vous \: \n\nNomDuRendezVous\: {4}
 mail.participants.add.subject=distribution de rendez-vous\: {4}. vous avez \u00E9t\u00E9 inscrit(e).
-mail.participants.remove.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 automatiquement. Veuillez ne pas y r\u00E9pondre. *** \n\nVous avez \u00E9t\u00E9 d\u00E9sinscrit par {0} {1} ({3}) \u00E0 un rendez-vous \: \n\nNomDuRendezVous\: {4}\n\nEn cas de questions, veuillez contacter s.v.p. {0} {1} ({2}).
+mail.participants.remove.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 automatiquement. Veuillez ne pas y r\u00E9pondre. *** \n\nVous avez \u00E9t\u00E9 d\u00E9sinscrit par {0} {1} ({2}) \u00E0 un rendez-vous \: \n\nNomDuRendezVous\: {4}\n\nEn cas de questions, veuillez contacter s.v.p. {0} {1} ({2}).
 mail.participants.remove.subject=distribution de rendez-vous\: {4}. vous avez \u00E9t\u00E9 d\u00E9sinscrit(e).
 notifications.entry=Modification d'utilisateur le {0}
 notifications.header=Attribution de la date dans le cours "{0}"
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_it.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_it.properties
index 498c59b0caedd8e8149b881716c4bdcd664a65a3..61296aaadc767d462e5075c704f69c41a0c19a45 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_it.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_it.properties
@@ -93,9 +93,9 @@ form.error.notempty=Completare, p.f.
 guestnoaccess.message=Questa parte del corso non \u00E8 accessibile agli ospiti. <p>Per ottenere l'accesso a questa parte Lei deve autenticarsi presso un'universit\u00E0 o registrarsi in OLAT.
 guestnoaccess.title=Accesso negato agli ospiti
 help.hover.den=Aiuto per l'iscrizione concernente gli impegni
-mail.participants.add.body=*** Questo \u00E8 un messaggio automatico. Non risponda a questo messaggio, p.f. *** \n\nLei \u00E8 stata/o iscritta/o davon {0} {1} ({3}) per un impegno\: \n\nNome impegno\: {4}
+mail.participants.add.body=*** Questo \u00E8 un messaggio automatico. Non risponda a questo messaggio, p.f. *** \n\nLei \u00E8 stata/o iscritta/o davon {0} {1} ({2}) per un impegno\: \n\nNome impegno\: {4}
 mail.participants.add.subject=Attribuzione impegno\: {4}. \u00C8 stata/o iscritta/o.
-mail.participants.remove.body=*** Questo \u00E8 un messaggio automatico. Non risponda a questo messaggio, p.f. *** \r\n\r\nLei \u00E8 stata/o disiscritta/o da {0} {1} ({3}) per l'impegno\: \r\n\r\nNome impegno\: {4}
+mail.participants.remove.body=*** Questo \u00E8 un messaggio automatico. Non risponda a questo messaggio, p.f. *** \r\n\r\nLei \u00E8 stata/o disiscritta/o da {0} {1} ({2}) per l'impegno\: \r\n\r\nNome impegno\: {4}
 mail.participants.remove.subject=Attribuzione impegno\: {4}. \u00C8 stata/o disiscritta/o
 notifications.entry=Modificazioni di {0}
 notifications.header=Assegnazione data nel corso "{0}"
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_nl_NL.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_nl_NL.properties
index 14f6f7c50ce1a507237bfd26ada49c25dd5c292e..5e5f48c7c49f3b2fbef60a800c230dd3d1fa7595 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_nl_NL.properties
@@ -93,9 +93,9 @@ form.error.notempty=Gelieve in te vullen
 guestnoaccess.message=Dit cursusdeel is niet toegankelijk voor gasten. <p>Om toegang te krijgen moet u zich certificeren via uw universiteit of registreren in OLAT.
 guestnoaccess.title=Geen gastentoegang
 help.hover.den=Hulp bij het inschrijven
-mail.participants.add.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd ingeschreven door {0} {1} ({3})\: \r\n\r\nDatum\: {4}
+mail.participants.add.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd ingeschreven door {0} {1} ({2})\: \r\n\r\nDatum\: {4}
 mail.participants.add.subject=Datum toewijzing\: {4}. U werd ingeschreven.
-mail.participants.remove.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd uitgeschreven door {0} {1} ({3})\: \r\n\r\nDatum\: {4}\r\n\r\nAls u nog vragen heeft, gelieve {0} {1} ({2}) te contacteren.
+mail.participants.remove.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd uitgeschreven door {0} {1} ({2})\: \r\n\r\nDatum\: {4}\r\n\r\nAls u nog vragen heeft, gelieve {0} {1} ({2}) te contacteren.
 mail.participants.remove.subject=Datum toewijzing\: {4}. U werd uitgeschreven.
 notifications.entry=Aanpassingen van "{0}"
 notifications.header=Datum toewijzing in cursus "{0}"
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pl.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pl.properties
index 352fa29ce5a9a808477a598219670ba4d3d55b76..87e809731f20b8e5e1e4a7c6fac070e5fb32034c 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pl.properties
@@ -89,9 +89,9 @@ enrollment.warning.manual=Nie mo\u017Cna doda\u0107 jednego lub wi\u0119cej u\u0
 form.enableCancelEnroll=W\u0142\u0105cz anulowanie zapisywania si\u0119
 form.error.format=Niew\u0142a\u015Bciwe dane
 form.error.notempty=Wype\u0142nij
-mail.participants.add.body=*** To jest automatycznie wygenerowana wiadomo\u015B\u0107 - nie odpowiadaj na ni\u0105. *** \r\n\r\nZosta\u0142e\u015B dodany przez {0} {1} ({3}) do listy uczestnik\u00F3w\: \r\n\r\nTermin\: {4}
+mail.participants.add.body=*** To jest automatycznie wygenerowana wiadomo\u015B\u0107 - nie odpowiadaj na ni\u0105. *** \r\n\r\nZosta\u0142e\u015B dodany przez {0} {1} ({2}) do listy uczestnik\u00F3w\: \r\n\r\nTermin\: {4}
 mail.participants.add.subject=Termin\: (4). Zosta\u0142e\u015B dodany.
-mail.participants.remove.body=*** To jest automatycznie generowana wiadomo\u015B\u0107 - nie odpowiadaj na ni\u0105. *** \r\n\r\nZosta\u0142e\u015B usuni\u0119ty przez {0} {1} ({3}) z listy uczestnik\u00F3w\: \r\n\r\nTermin\: {4}\r\n\r\nJe\u015Bli masz pytania skontaktuj si\u0119 z {0} {1} ({2}).
+mail.participants.remove.body=*** To jest automatycznie generowana wiadomo\u015B\u0107 - nie odpowiadaj na ni\u0105. *** \r\n\r\nZosta\u0142e\u015B usuni\u0119ty przez {0} {1} ({2}) z listy uczestnik\u00F3w\: \r\n\r\nTermin\: {4}\r\n\r\nJe\u015Bli masz pytania skontaktuj si\u0119 z {0} {1} ({2}).
 mail.participants.remove.subject=Termin\: {4}. Zosta\u0142e\u015B usuni\u0119ty.
 pane.tab.accessibility=Dost\u0119p
 pane.tab.denconfig=Konfiguracja
diff --git a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pt_BR.properties b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pt_BR.properties
index 410b1570505fa846a5210972b00ea6525f1bbe0a..48f7e9dd392ac8d26b549988a945d3c250322e65 100644
--- a/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/de/bps/course/nodes/den/_i18n/LocalStrings_pt_BR.properties
@@ -93,9 +93,9 @@ form.error.notempty=Favor preencha
 guestnoaccess.message=Esta parte do curso n\u00E3o est\u00E1 acess\u00EDvel aos clientes. <p>A fim de obter acesso que voc\u00EA tem que autenticar atrav\u00E9s de sua universidade ou registre-se no OLAT.
 guestnoaccess.title=Sem acesso para visitantes
 help.hover.den=Ajuda para agendamento de matr\u00EDcula
-mail.participants.add.body=*** Essa \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responda. *** \n\nVoc\u00EA foi adicionado por {0} {1} ({3}) para o agendamento de matr\u00EDcula\: \n\nAgendamento\: {4}
+mail.participants.add.body=*** Essa \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responda. *** \n\nVoc\u00EA foi adicionado por {0} {1} ({2}) para o agendamento de matr\u00EDcula\: \n\nAgendamento\: {4}
 mail.participants.add.subject=Agendamento de matr\u00EDcula\: {4}. Voc\u00EA foi adicionado.
-mail.participants.remove.body=*** Essa \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responda. *** \n\nVoc\u00EA foi removido por {0} {1} ({3}) do agendamento da matr\u00EDcula\: \n\nAgendamento\: {4}\n\nSe voc\u00EA tem quest\u00F5es, favor pergunte {0} {1} ({2}).
+mail.participants.remove.body=*** Essa \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responda. *** \n\nVoc\u00EA foi removido por {0} {1} ({2}) do agendamento da matr\u00EDcula\: \n\nAgendamento\: {4}\n\nSe voc\u00EA tem quest\u00F5es, favor pergunte {0} {1} ({2}).
 mail.participants.remove.subject=Agendamento de matr\u00EDcula\: {4}. Voc\u00EA foi removido.
 notifications.entry=Modifica\u00E7\u00F5es de um usu\u00E1rio em {0}
 notifications.header=Houve altera\u00E7\u00F5es em um de seus elementos inscritos sobre as nomea\u00E7\u00F5es\:
diff --git a/src/main/java/org/olat/admin/privacy/PrivacyAdminController.java b/src/main/java/org/olat/admin/privacy/PrivacyAdminController.java
index 7817c14bf6d445c1de46780882a6cdca5ab26a2c..0791b466482e0dd4c6fcc85e4e38aa4ee870d44f 100644
--- a/src/main/java/org/olat/admin/privacy/PrivacyAdminController.java
+++ b/src/main/java/org/olat/admin/privacy/PrivacyAdminController.java
@@ -29,6 +29,7 @@ import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormEvent;
+import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
 
@@ -40,24 +41,29 @@ public class PrivacyAdminController extends FormBasicController {
 	
 	private MultipleSelectionElement adminPropsEl;
 	private MultipleSelectionElement lastloginEl;
+	private MultipleSelectionElement tunnelEl;
 
 	private final BaseSecurityModule module;
 	
 	private String[] adminPropKeys = new String[]{
 			"users","authors", "usermanagers", "groupmanagers", "administrators"
 	};
+	private String[] onKeys = new String[]{ "on" };
 	
 	public PrivacyAdminController(UserRequest ureq, WindowControl wControl) {
-		super(ureq, wControl);
+		super(ureq, wControl, LAYOUT_VERTICAL);
 		module = CoreSpringFactory.getImpl(BaseSecurityModule.class);
 		initForm(ureq);
 	}
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormTitle("admin.menu.title");
-		setFormDescription("admin.props.desc");
 
+		FormLayoutContainer propsCont = FormLayoutContainer.createDefaultFormLayout("props", getTranslator());
+		formLayout.add(propsCont);
+		propsCont.setFormTitle(translate("admin.menu.title"));
+		propsCont.setFormDescription(translate("admin.props.desc"));
+		
 		String[] adminPropValues = new String[]{
 				translate("admin.props.users"),
 				translate("admin.props.authors"),
@@ -65,21 +71,32 @@ public class PrivacyAdminController extends FormBasicController {
 				translate("admin.props.groupmanagers"),
 				translate("admin.props.administrators")
 		};
-		adminPropsEl = uifactory.addCheckboxesVertical("admin.props", formLayout, adminPropKeys, adminPropValues, null, 1);
+		adminPropsEl = uifactory.addCheckboxesVertical("admin.props", propsCont, adminPropKeys, adminPropValues, null, 1);
 		adminPropsEl.select("users", "enabled".equals(module.getUserSearchAdminPropsForUsers()));
 		adminPropsEl.select("authors", "enabled".equals(module.getUserSearchAdminPropsForAuthors()));
 		adminPropsEl.select("usermanagers", "enabled".equals(module.getUserSearchAdminPropsForUsermanagers()));
 		adminPropsEl.select("groupmanagers", "enabled".equals(module.getUserSearchAdminPropsForGroupmanagers()));
 		adminPropsEl.select("administrators", "enabled".equals(module.getUserSearchAdminPropsForAdministrators()));
 		adminPropsEl.addActionListener(this, FormEvent.ONCHANGE);
+		
+		uifactory.addSpacerElement("admin.space.1", propsCont, true);
 
-		lastloginEl = uifactory.addCheckboxesVertical("last.login", formLayout, adminPropKeys, adminPropValues, null, 1);
+		lastloginEl = uifactory.addCheckboxesVertical("last.login", propsCont, adminPropKeys, adminPropValues, null, 1);
 		lastloginEl.select("users", "enabled".equals(module.getUserLastLoginVisibleForUsers()));
 		lastloginEl.select("authors", "enabled".equals(module.getUserLastLoginVisibleForAuthors()));
 		lastloginEl.select("usermanagers", "enabled".equals(module.getUserLastLoginVisibleForUsermanagers()));
 		lastloginEl.select("groupmanagers", "enabled".equals(module.getUserLastLoginVisibleForGroupmanagers()));
 		lastloginEl.select("administrators", "enabled".equals(module.getUserLastLoginVisibleForAdministrators()));
 		lastloginEl.addActionListener(this, FormEvent.ONCHANGE);
+		
+		FormLayoutContainer tuCont = FormLayoutContainer.createDefaultFormLayout("tu", getTranslator());
+		formLayout.add(tuCont);
+		tuCont.setFormTitle(translate("tunnel.title"));
+		tuCont.setFormDescription(translate("tunnel.desc"));
+		
+		tunnelEl = uifactory.addCheckboxesHorizontal("tunnel.cbb", tuCont, onKeys, new String[]{""}, null);
+		tunnelEl.select("on", "enabled".equals(module.getUserInfosTunnelCourseBuildingBlock()));
+		tunnelEl.addActionListener(this, FormEvent.ONCHANGE);
 	}
 	
 	@Override
@@ -103,6 +120,9 @@ public class PrivacyAdminController extends FormBasicController {
 			module.setUserLastLoginVisibleForUsermanagers(selectedKeys.contains("usermanagers") ? "enabled" : "disabled");
 			module.setUserLastLoginVisibleForGroupmanagers(selectedKeys.contains("groupmanagers") ? "enabled" : "disabled");
 			module.setUserLastLoginVisibleForAdministrators(selectedKeys.contains("administrators") ? "enabled" : "disabled");
+		} else if (source == tunnelEl) {
+			Set<String> selectedKeys = tunnelEl.getSelectedKeys();
+			module.setUserInfosTunnelCourseBuildingBlock(selectedKeys.contains("on") ? "enabled" : "disabled");
 		}
 	}
 
diff --git a/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_de.properties
index 6e3e789105b6654e88e8c4431b971741eab15a63..97a10eb7ad630f9af80e691f1730dff246346cc7 100644
--- a/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_de.properties
@@ -8,4 +8,7 @@ admin.props.administrators=Systemadministratoren
 admin.props.authors=Kursautoren
 admin.props.groupmanagers=Gruppenverwalter
 admin.props.usermanagers=Benutzerverwalter
-admin.props.users=Lernende
\ No newline at end of file
+admin.props.users=Lernende
+tunnel.cbb=Erlaubt weiter geben
+tunnel.desc=Ist die Kursbaustein "Extern Seite" erlaubt Benutzer Informationen weiter zu geben
+tunnel.title=Extern Seite
\ No newline at end of file
diff --git a/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_en.properties
index 9a9ac7942507e398fb611346d2c3544a433020c4..9e7f53d205b3fbdaddb366d4d32330a11a8f1210 100644
--- a/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/privacy/_i18n/LocalStrings_en.properties
@@ -5,4 +5,7 @@ admin.props.administrators=System administrators
 admin.props.authors=Course authors
 admin.props.groupmanagers=Group administrators
 admin.props.usermanagers=User managers
-admin.props.users=Learner
\ No newline at end of file
+admin.props.users=Learner
+tunnel.cbb=Allow to share
+tunnel.desc=Is the cours element "External page" allowed to share user informations
+tunnel.title=External page
\ No newline at end of file
diff --git a/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_de.properties
index 8a6915534ea150c5a16d999ea6bec69c84058040..b2d31a8522466613c4458e1f8bebe352c1b7e6c2 100644
--- a/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_de.properties
@@ -17,5 +17,6 @@ table.header.waitinglist.move=Aktion
 table.subject.action=Aktion
 table.subject.addeddate=Wann hinzugef\u00FCgt 
 table.user.login=Benutzername
+table.user.url=URL
 table.header.online=$org.olat.group.ui.main\:table.header.online
 help.hover.meta.info.owner=$org.olat.repository\:help.hover.meta.info.owner
diff --git a/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_en.properties
index a2a16a2c90241e368228a1c327e07b306b3d456e..cadbf47383a9fa81db62db9081243401a4d5d242 100644
--- a/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_en.properties
@@ -18,3 +18,4 @@ table.header.waitinglist.move=Action
 table.subject.action=Action
 table.subject.addeddate=Date added
 table.user.login=User name
+table.user.url=URL
diff --git a/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_fr.properties
index 47fc1ef4949a51fff03d74b28103d31ce44c5bdf..b90bf464c239b67e4a8b0cd59cdbd05cc6664ade 100644
--- a/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/admin/securitygroup/gui/_i18n/LocalStrings_fr.properties
@@ -18,3 +18,4 @@ table.header.waitinglist.move=Action
 table.subject.action=Action
 table.subject.addeddate=Ajout\u00E9 quand\:
 table.user.login=Nom d'utilisateur
+table.user.url=Lien
diff --git a/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java b/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java
index 671463cf3d4adf919264f9dd8c5b28bf5c2acafd..a93b7918f53a05e9c5f86d82f80becbe0abaf914 100644
--- a/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java
+++ b/src/main/java/org/olat/admin/user/bulkChange/UserBulkChangeStep02.java
@@ -186,7 +186,7 @@ class UserBulkChangeStep02 extends BasicStep {
 				List<String> userDataArray = new ArrayList<String>();
 
 				// add column for login
-				userDataArray.add(identity.getName());//TODO username
+				userDataArray.add(identity.getName());
 				// add columns for password
 				if (attributeChangeMap.containsKey(UserBulkChangeManager.PWD_IDENTIFYER)) {
 					userDataArray.add(attributeChangeMap.get(UserBulkChangeManager.PWD_IDENTIFYER));
diff --git a/src/main/java/org/olat/admin/user/imp/Model.java b/src/main/java/org/olat/admin/user/imp/Model.java
index 925016a05b5a888c43e6d8dff6e1829def187240..bbd7c4f1af2ecc8cd3d3ededfe55348368d0f165 100644
--- a/src/main/java/org/olat/admin/user/imp/Model.java
+++ b/src/main/java/org/olat/admin/user/imp/Model.java
@@ -70,7 +70,6 @@ public class Model extends DefaultTableDataModel<Object> {
 		if (col == 0) { // existing
 			return (userExists ? Boolean.FALSE : Boolean.TRUE);
 		}
-		//TODO username
 		if (col == 1) { return (userExists ? ident.getName() : userArray.get(col)); }
 
 		if (col == 2) {// pwd
diff --git a/src/main/java/org/olat/basesecurity/BaseSecurityModule.java b/src/main/java/org/olat/basesecurity/BaseSecurityModule.java
index 90244aa75e856a8bc2fb840f9c1f337444504bbc..ae24edd79328307421f670ff7b22b045847db6cb 100644
--- a/src/main/java/org/olat/basesecurity/BaseSecurityModule.java
+++ b/src/main/java/org/olat/basesecurity/BaseSecurityModule.java
@@ -78,6 +78,9 @@ public class BaseSecurityModule extends AbstractOLATModule {
 	private static final String USERSEARCHAUTOCOMPLETE_ADMINISTRATORS = "userSearchAutocompleteForAdministrators";
 	private static final String USERSEARCH_MAXRESULTS = "userSearchMaxResults";
 	
+
+	private static final String USERINFOS_TUNNEL_CBB = "userInfosTunnelCourseBuildingBlock";
+	
 	
 	/**
 	 * default values
@@ -119,6 +122,8 @@ public class BaseSecurityModule extends AbstractOLATModule {
 	private String userSearchAutocompleteForUsermanagers;
 	private String userSearchAutocompleteForGroupmanagers;
 	private String userSearchAutocompleteForAdministrators;
+	
+	private String userInfosTunnelCourseBuildingBlock;
 
 
 	private BaseSecurityModule(String defaultAuthProviderIdentifier) {
@@ -182,6 +187,8 @@ public class BaseSecurityModule extends AbstractOLATModule {
 		userSearchAutocompleteForGroupmanagers = getStringConfigParameter(USERSEARCHAUTOCOMPLETE_GROUPMANAGERS, "enabled", true);
 		userSearchAutocompleteForAdministrators = getStringConfigParameter(USERSEARCHAUTOCOMPLETE_ADMINISTRATORS, "enabled", true);
 		userSearchMaxResults = getStringConfigParameter(USERSEARCH_MAXRESULTS, "-1", true);
+
+		userInfosTunnelCourseBuildingBlock = getStringConfigParameter(USERINFOS_TUNNEL_CBB, "disabled", true);
 	}
 
 	@Override
@@ -257,6 +264,11 @@ public class BaseSecurityModule extends AbstractOLATModule {
 		if(StringHelper.containsNonWhitespace(maxResults)) {
 			userSearchMaxResults = maxResults;
 		}
+		
+		enabled = getStringPropertyValue(USERINFOS_TUNNEL_CBB, true);
+		if(StringHelper.containsNonWhitespace(enabled)) {
+			userInfosTunnelCourseBuildingBlock = enabled;
+		}
 	}
 
 	@Override
@@ -462,4 +474,14 @@ public class BaseSecurityModule extends AbstractOLATModule {
 	public void setUserSearchMaxResults(String maxResults) {
 		setStringProperty(USERSEARCH_MAXRESULTS, maxResults, true);
 	}
+
+	public String getUserInfosTunnelCourseBuildingBlock() {
+		return userInfosTunnelCourseBuildingBlock;
+	}
+
+	public void setUserInfosTunnelCourseBuildingBlock(String enable) {
+		setStringProperty(USERINFOS_TUNNEL_CBB, enable, true);
+	}
+	
+	
 }
\ No newline at end of file
diff --git a/src/main/java/org/olat/basesecurity/_spring/baseSecurityContext.xml b/src/main/java/org/olat/basesecurity/_spring/baseSecurityContext.xml
index 693e5b3eeb232610af961d1707e904348bbf023e..b42d746bec150d859b5843fddb7a59eb07ac059a 100644
--- a/src/main/java/org/olat/basesecurity/_spring/baseSecurityContext.xml
+++ b/src/main/java/org/olat/basesecurity/_spring/baseSecurityContext.xml
@@ -50,6 +50,8 @@
 						userSearchAutocompleteForGroupmanagers=${usersearch.autocomplete.groupmanagers}
 						userSearchAutocompleteForAdministrators=${usersearch.autocomplete.administrators}
 						userSearchMaxResults=${usersearch.maxResults}
+						
+						userInfosTunnelCourseBuildingBlock=${userinfos.tunnelcoursebuildingblock}
             
 						sysGroupUsermanager.canCreateUser=true
 						sysGroupUsermanager.canDeleteUser=false
diff --git a/src/main/java/org/olat/core/commons/modules/glossary/Author.java b/src/main/java/org/olat/core/commons/modules/glossary/Author.java
index 17051bf3a12d58511c67b58722ce235a694d2e89..7f283cda722eb436d80dbb78d638ae7eab985bc2 100644
--- a/src/main/java/org/olat/core/commons/modules/glossary/Author.java
+++ b/src/main/java/org/olat/core/commons/modules/glossary/Author.java
@@ -46,7 +46,7 @@ public class Author {
 	public Author(Identity identity) {
 		firstname = identity.getUser().getProperty(UserConstants.FIRSTNAME, null);
 		surname = identity.getUser().getProperty(UserConstants.LASTNAME, null);
-		link = "[Identity:" + identity.getKey() + "][Username:" + identity.getName() + "]";//TODO username
+		link = "[Identity:" + identity.getKey() + "][Username:" + identity.getName() + "]";
 	}
 	
 	public Long extractKey() {
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java
index b627e7c3af127548235e95d1aed162c1dc481461..da058ec1859c509a92cc7c0b83303141a3faeddf 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java
@@ -403,10 +403,22 @@ public class FormLayoutContainer extends FormItemImpl implements FormItemContain
 		return formLayoutContainer.getComponent(name);
 	}
 	
+	/**
+	 * Set the translated title
+	 * @param title
+	 */
 	public void setFormTitle(String title) {
 		formLayoutContainer.contextPut("off_title", title);
 	}
 	
+	/**
+	 * Set the translated description
+	 * @param description
+	 */
+	public void setFormDescription(String description) {
+		formLayoutContainer.contextPut("off_desc", description);
+	}	
+	
 
 	/**
 	 * 
diff --git a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
index d86580a0a5bd7ed9b4bd3b2dad4d8d8343d5f97d..1d652a8a439c454edba1d946ae7a7aa7b4561c6d 100644
--- a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
+++ b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
@@ -26,6 +26,7 @@
 package org.olat.course.archiver;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -39,6 +40,8 @@ import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
 import org.olat.core.id.IdentityEnvironment;
 import org.olat.core.id.OLATResourceable;
+import org.olat.core.id.context.BusinessControlFactory;
+import org.olat.core.id.context.ContextEntry;
 import org.olat.core.util.Formatter;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
@@ -87,7 +90,7 @@ public class ScoreAccountingHelper {
 		StringBuilder table = new StringBuilder();
 
 		String sequentialNumber = t.translate("column.header.seqnum");
-		String login = t.translate("column.header.login");
+		String login = t.translate("column.header.businesspath");
 		// user properties are dynamic
 		String sc = t.translate("column.header.score");
 		String pa = t.translate("column.header.passed");
@@ -136,7 +139,8 @@ public class ScoreAccountingHelper {
 		Formatter formatter = Formatter.getInstance(locale);
 
 		for (Identity identity:identities) {
-			String uname = identity.getName();//TODO username
+			ContextEntry ce = BusinessControlFactory.getInstance().createContextEntry(identity);
+			String uname = BusinessControlFactory.getInstance().getAsURIString(Collections.singletonList(ce), false);
 
 			tableContent.append(rowNumber);
 			tableContent.append("\t");
diff --git a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_de.properties
index 34e6b2966d6f90341a9e236a39e6e64a0f47ecd2..a350b5a0833bb7f598808ac139562a2b5500774f 100644
--- a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_de.properties
@@ -55,7 +55,7 @@ column.field.yes=ja
 column.header.attempts=Versuche
 column.header.coachcomment=Kommentar f\u00FCr Betreuer
 column.header.comment=Kommentar f\u00FCr Benutzer
-column.header.login=Benutzername
+column.header.businesspath=URL
 column.header.passed=Bestanden
 column.header.score=Punkte
 column.header.seqnum=Nr.
diff --git a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties
index 1ab9a8fa6324c4f4bcf7dbf5a7586b8bb18e527e..12f57fc385e479308a177fa41aef6a035c44c60d 100644
--- a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties
@@ -55,7 +55,7 @@ column.field.yes=Yes
 column.header.attempts=Attempts
 column.header.coachcomment=Comment regarding coach
 column.header.comment=Comment regarding user
-column.header.login=User name
+column.header.businesspath=URL
 column.header.passed=Passed
 column.header.score=Score
 column.header.seqnum=No.
diff --git a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_fr.properties
index f0fe3b9883b61f48ea05c11a147e72e25306eab1..79a361cf438855cb46a00d4dd5ca9903239f5fd9 100644
--- a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_fr.properties
@@ -56,7 +56,7 @@ column.header.attempts=Essais
 column.header.coachcomment=Commentaire pour le tuteur
 column.header.comment=Commentaire pour l'utilisateur
 column.header.initialLaunchDate=D\u00E9but du cours
-column.header.login=Nom d'utilisateur
+column.header.businesspath=Lien
 column.header.passed=R\u00E9ussi
 column.header.score=Points
 column.header.scoreLastModified=Derni\u00E8re mise-\u00E0-jour
diff --git a/src/main/java/org/olat/course/nodes/ta/TACourseNodeEditController.java b/src/main/java/org/olat/course/nodes/ta/TACourseNodeEditController.java
index cf233f22dca5d72adc101e1b187e7bda5a38c5f2..1f90b5370658c874e54741fd1eadbfe2c663c809 100644
--- a/src/main/java/org/olat/course/nodes/ta/TACourseNodeEditController.java
+++ b/src/main/java/org/olat/course/nodes/ta/TACourseNodeEditController.java
@@ -55,6 +55,7 @@ import org.olat.core.gui.translator.Translator;
 import org.olat.core.helpers.Settings;
 import org.olat.core.id.Identity;
 import org.olat.core.id.UserConstants;
+import org.olat.core.id.context.BusinessControlFactory;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
 import org.olat.core.util.Util;
@@ -510,7 +511,6 @@ public class TACourseNodeEditController extends ActivateableTabbableDefaultContr
 				
 		Context c = new VelocityContext();
 		Identity identity = ureq.getIdentity();
-		c.put("login", identity.getName());//TODO username
 		c.put("first", identity.getUser().getProperty(UserConstants.FIRSTNAME, getLocale()));
 		c.put("last", identity.getUser().getProperty(UserConstants.LASTNAME, getLocale()));
 		c.put("email", identity.getUser().getProperty(UserConstants.EMAIL, getLocale()));
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties
index 79a286d2f6669ab101b85b947338d1437902ee84..bb5d1b585f9376c2f260e1cf0a84962d96d7469a 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties
@@ -32,7 +32,7 @@ conf.continue=\u0627\u0644\u0631\u062C\u0648\u0639 \u0625\u0644\u0649 \u0646\u06
 conf.mail.error=\u0647\u0630\u0627 \u0627\u0644\u062A\u0623\u0643\u064A\u062F \u0643\u0627\u0646 \u0645\u0646 \u0627\u0644\u0645\u0632\u0645\u0639 \u0625\u0631\u0633\u0627\u0644\u0647 \u0639\u0628\u0631 \u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0625\u0644\u0643\u062A\u0631\u0648\u0646\u064A\u060C \u0648\u0644\u0643\u0646 \u0641\u0634\u0644 \u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0625\u0644\u0643\u062A\u0631\u0648\u0646\u0649\u060C \u0648\u0645\u0646 \u0627\u0644\u0645\u0633\u062A\u062D\u0633\u0646 \u0623\u0646 \u062A\u0642\u0648\u0645 \u0628\u0637\u0628\u0627\u0639\u0629 \u0647\u0630\u0627 \u0627\u0644\u062A\u0623\u0643\u064A\u062F \u0644\u062A\u0633\u062C\u0644\u0627\u062A\u0643 \u0627\u0644\u062E\u0627\u0635\u0629.
 conf.mail.sent=.{0} \u0647\u0630\u0627 \u0627\u0644\u062A\u0623\u0643\u064A\u062F \u062A\u0645 \u0625\u0631\u0633\u0627\u0644\u0647 \u0639\u0628\u0631 \u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0625\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0625\u0644\u0649 \u0627\u0644\u0639\u0646\u0648\u0627\u0646
 conf.mail.subject=\u0627\u0644\u0628\u0631\u064A\u062F \u0627\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u0649 \u0644\u062A\u0623\u0643\u064A\u062F \u0623\u0648\u0644\u0627\u062A
-conf.stdtext=.$time \u0627\u0644\u0633\u0627\u0639\u0629 $date \u0641\u0649 \u062A\u0627\u0631\u064A\u062E "$filename" \u0646\u0642\u0644 \u0627\u0644\u0645\u0644\u0641 ($login) $first $last \u0647\u0630\u0627 \u062A\u0623\u0643\u064A\u062F \u0628\u0623\u0646
+conf.stdtext=.$time \u0627\u0644\u0633\u0627\u0639\u0629 $date \u0641\u0649 \u062A\u0627\u0631\u064A\u062E "$filename" \u0646\u0642\u0644 \u0627\u0644\u0645\u0644\u0641 $first $last ($email) \u0647\u0630\u0627 \u062A\u0623\u0643\u064A\u062F \u0628\u0623\u0646
 conf.title=\u062A\u0623\u0643\u064A\u062F
 dropbox.condition.title=\u0645\u0631\u0628\u0639 \u0627\u0644\u0625\u0641\u0644\u0627\u062A
 dropbox.files=.{0} \u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u062D\u0645\u064A\u0644 \u0645\u0644\u0641/\u0645\u0644\u0641\u0627\u062A
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties
index 0c4bba3b05a2a019fc7f6c060abc980c49103e69..f11dd56ae9c3380b43f87826a59da769c7c93570 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties
@@ -32,7 +32,7 @@ conf.continue=\u041D\u0430\u0437\u0430\u0434 \u043A\u044A\u043C \u043F\u0440\u04
 conf.mail.error=\u0422\u043E\u0432\u0430 \u043F\u043E\u0442\u0432\u044A\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043F\u0440\u0430\u0442\u0438 \u043A\u0430\u0442\u043E \u0438-\u043C\u0435\u0439\u043B. \u041E\u0431\u0430\u0447\u0435, \u0438\u0437\u043F\u0440\u0430\u0449\u0430\u043D\u0435\u0442\u043E \u043D\u0430 \u0438-\u043C\u0435\u0439\u043B \u043D\u0435 \u0441\u0435 \u043E\u0441\u044A\u0449\u0435\u0441\u0442\u0432\u0438. \u0421\u044A\u0432\u0435\u0442\u0432\u0430\u043C\u0435 \u0432\u0438 \u0434\u0430 \u043F\u0440\u0438\u043D\u0442\u0438\u0440\u0430\u0442\u0435 \u0442\u043E\u0432\u0430 \u043F\u043E\u0442\u0432\u044A\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0437\u0430 \u0432\u0430\u0448\u0435 \u0441\u0432\u0435\u0434\u0435\u043D\u0438\u0435.
 conf.mail.sent=\u0422\u043E\u0432\u0430 \u043F\u043E\u0442\u0432\u044A\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0431\u0435\u0448\u0435 \u0438\u0437\u043F\u0440\u0430\u0442\u0435\u043D\u043E \u043A\u0430\u0442\u043E \u0438-\u043C\u0435\u0439\u043B \u043D\u0430 \u0430\u0434\u0440\u0435\u0441 {0}.
 conf.mail.subject=\u0421\u0438\u0441\u0442\u0435\u043C\u043D\u043E \u0438-\u043C\u0435\u0439\u043B \u043F\u043E\u0442\u0432\u044A\u0440\u0436\u0434\u0435\u043D\u0438\u0435
-conf.stdtext=\u0422\u043E\u0432\u0430 \u0443\u0434\u043E\u0441\u0442\u043E\u0432\u0435\u0440\u044F\u0432\u0430, \u0447\u0435 $first $last ($login) \u0442\u0440\u0430\u043D\u0441\u0444\u0435\u0440\u0438\u0440\u0430 \u0444\u0430\u0439\u043B\u0430 "$filename" \u043D\u0430 $date \u0432 $time.
+conf.stdtext=\u0422\u043E\u0432\u0430 \u0443\u0434\u043E\u0441\u0442\u043E\u0432\u0435\u0440\u044F\u0432\u0430, \u0447\u0435 $first $last ($email) \u0442\u0440\u0430\u043D\u0441\u0444\u0435\u0440\u0438\u0440\u0430 \u0444\u0430\u0439\u043B\u0430 "$filename" \u043D\u0430 $date \u0432 $time.
 conf.title=\u041F\u043E\u0442\u0432\u044A\u0440\u0436\u0434\u0435\u043D\u0438\u0435
 dropbox.condition.title=\u041A\u0443\u0442\u0438\u044F \u0437\u0430 \u043E\u0441\u0442\u0430\u0432\u044F\u043D\u0435
 dropbox.files=\u0414\u043E\u0441\u0435\u0433\u0430 \u0432\u0438\u0435 \u0441\u0442\u0435 \u043A\u0430\u0447\u0438\u043B\u0438 {0} \u0444\u0430\u0439\u043B\u0430.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties
index 75b4231f9887fdb209e5adf4aed581ed62b729a6..0ee037351f12bbeb957a1ecc8a59009a00691fc3 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties
@@ -32,7 +32,7 @@ conf.continue=Zp\u011Bt na p\u0159ehled
 conf.mail.error=Potvrzen\u00ED m\u011Blo b\u00FDt posl\u00E1no jako e-mai, ale p\u0159i zasl\u00E1n\u00ED nastala chyba. Velice doporu\u010Dujeme, aby jste si toto potvrzen\u00ED vytiskli a schovali.
 conf.mail.sent=Potvrzen\u00ED bylo odesl\u00E1no jako e-mail na adresu {0}.
 conf.mail.subject=Potvrzovac\u00ED e-mail OLATu
-conf.stdtext=Potvrzen\u00ED, \u017Ee $first $last ($login) p\u0159enesl soubor "$souborname" dne $date v $time.
+conf.stdtext=Potvrzen\u00ED, \u017Ee $first $last ($email) p\u0159enesl soubor "$souborname" dne $date v $time.
 conf.title=Potvrzen\u00ED
 dropbox.condition.title=Vstupn\u00ED slo\u017Eka
 dropbox.files=Dosud jste nahr\u00E1l {0} soubor\u016F.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties
index 2a6b03db7d3418bb4801e4051e9033c780d172a7..53898ac56d7322127b0a83246055235eec2f7f31 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties
@@ -32,8 +32,8 @@ conf.continue=Zur\u00FCck zur \u00DCbersicht
 conf.mail.error=Diese Best\u00E4tigung sollte per E-Mail verschickt werden. Dabei ist jedoch ein Fehler aufgetreten. Wir empfehlen Ihnen daher, diese Best\u00E4tigung auszudrucken.
 conf.mail.sent=Diese Best\u00E4tigung wurde als E-Mail an die Adresse {0} verschickt.
 conf.mail.subject=OLAT-Best\u00E4tigungs-E-Mail
-conf.stdtext=Hiermit wird best\u00E4tigt, dass $first $last ($login) die Datei "$filename" am $date um $time hochgeladen hat.
-conf.stdtext.example=Beispiel: Hiermit wird best\u00E4tigt, dass $first $last ($login) die Datei "$filename" am $date um $time hochgeladen hat.
+conf.stdtext=Hiermit wird best\u00E4tigt, dass $first $last ($email) die Datei "$filename" am $date um $time hochgeladen hat.
+conf.stdtext.example=Beispiel: Hiermit wird best\u00E4tigt, dass $first $last ($email) die Datei "$filename" am $date um $time hochgeladen hat.
 conf.title=Best\u00E4tigung
 dropbox.condition.title=Abgabeordner
 dropbox.files=Sie haben bereits {0} Datei(en) hochgeladen.
@@ -139,6 +139,6 @@ taskfolder.overwriting.confirm=Es wurden bereits {0} Aufgaben gezogen. Soll die
 warn.nodedelete=Achtung\: Alle bisher angefallenen Daten dieses Kursbausteines werden gel\u00F6scht. Dies beinhaltet auch den gesamten Inhalt des Aufgabenordners dieses Bausteines.
 error.nomailbody=Sie müssen einen Text eingeben, damit eine E-Mail verschickt werden kann.
 task.deleted.subject= Ihre Aufgabe wurde zurückgezogen
-task.deleted.body = *** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Die Aufgabe "$filename" wurde von $first $last ($login) zurückgezogen.\n\n Bitte öffnen Sie $coursename ($courselink) für die Zuweisung einer neuen Aufgabe. \n\n Bei Fragen kontaktieren Sie bitte $first $last ($email).
+task.deleted.body = *** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Die Aufgabe "$filename" wurde von $first $last zurückgezogen.\n\n Bitte öffnen Sie $coursename ($courselink) für die Zuweisung einer neuen Aufgabe. \n\n Bei Fragen kontaktieren Sie bitte $first $last ($email).
 task.cancel=Aufgabe zurücknehmen
 task.cancel.reassign = Wenn Sie die Aufgabe zurücknehmen, muss dem Benutzer eine neue Aufgabe zugewiesen werden. Wollen Sie fortfahren?
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties
index ec355aa2ee4616fea57e3a909e6d5b7e0560537c..813fd3cc35aac08590893345882e730f475f07f4 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties
@@ -32,8 +32,8 @@ conf.continue=\u0395\u03C0\u03B9\u03C3\u03C4\u03C1\u03BF\u03C6\u03AE \u03C3\u03C
 conf.mail.error=\u0397 \u03B5\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03AF\u03C9\u03C3\u03B7 \u03B5\u03AF\u03C7\u03B5 \u03C0\u03C1\u03BF\u03BF\u03C1\u03B9\u03C3\u03C4\u03B5\u03AF \u03BD\u03B1 \u03C3\u03C4\u03B1\u03BB\u03B5\u03AF \u03C9\u03C2 e-mail. \u03A0\u03B1\u03C1\u03CC\u03BB\u03B1 \u03B1\u03C5\u03C4\u03AC, \u03B7 \u03B1\u03C0\u03BF\u03C3\u03C4\u03BF\u03BB\u03AE \u03C4\u03BF\u03C5 e-mail \u03B1\u03C0\u03AD\u03C4\u03C5\u03C7\u03B5. \u03A3\u03B1\u03C2 \u03C3\u03C5\u03BD\u03B9\u03C3\u03C4\u03BF\u03CD\u03BC\u03B5 \u03BD\u03B1 \u03B5\u03BA\u03C4\u03C5\u03C0\u03CE\u03C3\u03B5\u03C4\u03B5 \u03C4\u03B7\u03BD \u03B5\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03AF\u03C9\u03C3\u03B7 \u03B3\u03B9\u03B1 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF \u03C3\u03B1\u03C2.
 conf.mail.sent=\u0397 \u03B5\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03AF\u03C9\u03C3\u03B7 \u03AD\u03C7\u03B5\u03B9 \u03C3\u03C4\u03B1\u03BB\u03B5\u03AF \u03BC\u03B5 e-mail \u03C3\u03C4\u03B7 \u03B4\u03B9\u03B5\u03CD\u03B8\u03C5\u03BD\u03C3\u03B7 {0}.
 conf.mail.subject=OLAT e-mail \u03B5\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03AF\u03C9\u03C3\u03B7\u03C2
-conf.stdtext=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1 \u03AD\u03C7\u03B5\u03B9 \u03C9\u03C2 \u03C3\u03BA\u03BF\u03C0\u03CC \u03BD\u03B1 \u03B2\u03B5\u03B2\u03B1\u03B9\u03CE\u03C3\u03B5\u03B9 \u03CC\u03C4\u03B9 \u03BF/\u03B7 $first $last ($login) \u03BC\u03B5\u03C4\u03AD\u03C6\u03B5\u03C1\u03B5 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF "$filename" \u03C3\u03C4\u03B9\u03C2 $date \u03BA\u03B1\u03B9 \u03CE\u03C1\u03B1 $time.
-conf.stdtext.example=\u03A0\u03B1\u03C1\u03AC\u03B4\u03B5\u03B9\u03B3\u03BC\u03B1\: \u03A4\u03BF \u03C0\u03B1\u03C1\u03CC\u03BD \u03B5\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03B9\u03CE\u03BD\u03B5\u03B9 \u03C0\u03C9\u03C2 \u03BF/\u03B7 $first $last ($login) \u03B1\u03BD\u03AD\u03B2\u03B1\u03C3\u03B5 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF "$filename" \u03C4\u03B7\u03BD $date \u03C3\u03C4\u03B9\u03C2 $time
+conf.stdtext=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1 \u03AD\u03C7\u03B5\u03B9 \u03C9\u03C2 \u03C3\u03BA\u03BF\u03C0\u03CC \u03BD\u03B1 \u03B2\u03B5\u03B2\u03B1\u03B9\u03CE\u03C3\u03B5\u03B9 \u03CC\u03C4\u03B9 \u03BF/\u03B7 $first $last ($email) \u03BC\u03B5\u03C4\u03AD\u03C6\u03B5\u03C1\u03B5 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF "$filename" \u03C3\u03C4\u03B9\u03C2 $date \u03BA\u03B1\u03B9 \u03CE\u03C1\u03B1 $time.
+conf.stdtext.example=\u03A0\u03B1\u03C1\u03AC\u03B4\u03B5\u03B9\u03B3\u03BC\u03B1\: \u03A4\u03BF \u03C0\u03B1\u03C1\u03CC\u03BD \u03B5\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03B9\u03CE\u03BD\u03B5\u03B9 \u03C0\u03C9\u03C2 \u03BF/\u03B7 $first $last ($email) \u03B1\u03BD\u03AD\u03B2\u03B1\u03C3\u03B5 \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF "$filename" \u03C4\u03B7\u03BD $date \u03C3\u03C4\u03B9\u03C2 $time
 conf.title=\u0395\u03C0\u03B9\u03B2\u03B5\u03B2\u03B1\u03AF\u03C9\u03C3\u03B7
 dropbox.condition.title=\u0398\u03C5\u03C1\u03AF\u03B4\u03B1 \u03C0\u03B1\u03C1\u03AC\u03B4\u03BF\u03C3\u03B7\u03C2
 dropbox.files=\u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03BD\u03B5\u03B2\u03AC\u03C3\u03B5\u03B9 {0} \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 \u03BC\u03AD\u03C7\u03C1\u03B9 \u03C3\u03C4\u03B9\u03B3\u03BC\u03AE\u03C2.
@@ -126,7 +126,7 @@ task.cancel.reassign=\u038C\u03C4\u03B1\u03BD \u03B1\u03BA\u03C5\u03C1\u03CE\u03
 task.choose=\u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03BC\u03B9\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03B1\u03C0\u03BF \u03C4\u03B7\u03BD \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03BB\u03AF\u03C3\u03C4\u03B1.
 task.chosen=\u0397 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03C0\u03BF\u03C5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B1\u03C4\u03B5 \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C0\u03B9\u03B1 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B7. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03BE\u03B1\u03BD\u03AC.
 task.condition.title=\u0391\u03BD\u03AC\u03B8\u03B5\u03C3\u03B7
-task.deleted.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03BF\u03BC\u03B1\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \r\n\r\n \u0397 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 "$filename" \u03AD\u03C7\u03B5\u03B9 \u03B1\u03C0\u03BF\u03C3\u03C5\u03C1\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03C4\u03BF\u03BD/\u03C4\u03B7\u03BD $first $last ($login). \r\n\r\n \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B1\u03BD\u03BF\u03AF\u03BE\u03C4\u03B5 \u03C4\u03BF $coursename ($courselink) \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03C3\u03B1\u03C2 \u03B1\u03BD\u03B1\u03C4\u03B5\u03B8\u03B5\u03AF \u03BD\u03AD\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1. \r\n\r\n \u0386\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C1\u03AF\u03B5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 \u03C4\u03BF\u03BD/\u03C4\u03B7\u03BD $first $last ($email).
+task.deleted.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03BF\u03BC\u03B1\u03C4\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \r\n\r\n \u0397 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 "$filename" \u03AD\u03C7\u03B5\u03B9 \u03B1\u03C0\u03BF\u03C3\u03C5\u03C1\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03C4\u03BF\u03BD/\u03C4\u03B7\u03BD $first $last. \r\n\r\n \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B1\u03BD\u03BF\u03AF\u03BE\u03C4\u03B5 \u03C4\u03BF $coursename ($courselink) \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03C3\u03B1\u03C2 \u03B1\u03BD\u03B1\u03C4\u03B5\u03B8\u03B5\u03AF \u03BD\u03AD\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1. \r\n\r\n \u0386\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C1\u03AF\u03B5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 \u03C4\u03BF\u03BD/\u03C4\u03B7\u03BD $first $last ($email).
 task.deleted.subject=\u0397 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03C3\u03B1\u03C2 \u03AD\u03C7\u03B5\u03B9 \u03B1\u03C0\u03BF\u03C3\u03C5\u03C1\u03B8\u03B5\u03AF
 task.launch=\u03A0\u03C1\u03BF\u03B2\u03BF\u03BB\u03AE \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2
 task.nomoretasks=\u0394\u03B5\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03BF\u03C5\u03BD \u03B5\u03C0\u03B9\u03C0\u03BB\u03AD\u03BF\u03BD \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B5\u03C2 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B5\u03C2 \u03B3\u03B9\u03B1 \u03B5\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 \u03C4\u03BF\u03BD \u03B4\u03B9\u03B1\u03C7\u03B5\u03B9\u03C1\u03B9\u03C3\u03C4\u03AE \u03C4\u03BF\u03C5 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties
index 4877d8901bab56ebfe99a39bba6e8589249ad5be..b695150969e614e20f5af7603c9beba814cfafc0 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties
@@ -32,8 +32,8 @@ conf.continue=Back to overview
 conf.mail.error=This confirmation was intended to be sent as e-mail. However, sending of e-mail failed. It is strongly recommended that you print this confirmation for your records.
 conf.mail.sent=This confirmation has been sent as e-mail to the address {0}.
 conf.mail.subject=OLAT confirmation e-mail
-conf.stdtext=This is to certify that $first $last ($login) transferred the file "$filename" on $date at $time
-conf.stdtext.example=Example\: This is to confirm that $first $last ($login) has uploaded the file "$filename" on $date at $time
+conf.stdtext=This is to certify that $first $last ($email) transferred the file "$filename" on $date at $time
+conf.stdtext.example=Example\: This is to confirm that $first $last ($email) has uploaded the file "$filename" on $date at $time
 conf.title=Confirmation
 dropbox.condition.title=Drop box
 dropbox.files=You have uploaded {0} file(s) so far.
@@ -126,7 +126,7 @@ task.cancel.reassign=When withdrawing a task you have to assign a new one to tha
 task.choose=Please select a task from the list below.
 task.chosen=The task you selected is not available anymore. Please select again.
 task.condition.title=Assignment 
-task.deleted.body=*** This is an automated message. Please do not respond *** \r\n\r\n The task "$filename" has been withdrawn by $first $last ($login). \r\n\r\n Please open $coursename ($courselink) to have a new task assigned. \r\n\r\n Should there be any questions please contact $first $last ($email).
+task.deleted.body=*** This is an automated message. Please do not respond *** \r\n\r\n The task "$filename" has been withdrawn by $first $last. \r\n\r\n Please open $coursename ($courselink) to have a new task assigned. \r\n\r\n Should there be any questions please contact $first $last ($email).
 task.deleted.subject=Your task has been withdrawn
 task.launch=View task
 task.nomoretasks=There are no more tasks available for selection. Please contact your course administrator.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties
index 476e49e8c257edfe2a5168f568787b6acf8dbfa5..179c74af93a83dcabf359492011c67c3307791a5 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties
@@ -32,7 +32,7 @@ conf.continue=Volver a vista r\u00E1pida
 conf.mail.error=Se ha intentado enviar la confirmaci\u00F3n por e-mail. Sin embargo, el env\u00EDo del e-mail fall\u00F3. Es muy recomendable que imprimas esta confirmaci\u00F3n.
 conf.mail.sent=Esta confirmaci\u00F3n ha sido enviada como e-mail a la direcci\u00F3n {0}.
 conf.mail.subject=Confirmaci\u00F3n de e-mail de OLAT
-conf.stdtext=Esto es para certificar que $first $last ($login) transfiri\u00F3 el archivo "$filename" el $date a las $time.
+conf.stdtext=Esto es para certificar que $first $last ($email) transfiri\u00F3 el archivo "$filename" el $date a las $time.
 conf.title=Confirmaci\u00F3n
 dropbox.condition.title=Carpeta de entrega
 dropbox.files=Hasta ahora has transferido {0} archivo(s)
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties
index 1d8d3a63b98a713ba3bc55e0529bb1c42ef39301..4b65c8a9cb7845ee4e2547ce2e6e9a9995229efe 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties
@@ -18,7 +18,7 @@ conf.continue=\u0628\u0631\u06AF\u0634\u062A \u0628\u0647 \u0646\u0645\u0627\u06
 conf.mail.error=This confirmation was intended to be sent as e-mail. However, sending of the e-mail failed. It is strongly recommended that you print this confirmation for your records.
 conf.mail.sent=This confirmation has been sent as e-mail to the address {0}.
 conf.mail.subject=\u062A\u0627\u06CC\u06CC\u062F e-mail
-conf.stdtext=This is to certify that $first $last ($login) transferred the file "$filename" on $date at $time.
+conf.stdtext=This is to certify that $first $last ($email) transferred the file "$filename" on $date at $time.
 conf.title=\u062A\u0627\u06CC\u06CC\u062F
 dropbox.condition.title=Drop box
 dropbox.files=You have uploaded {0} file(s) so far.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties
index 96ac9013aab635ef94c4057bd988a56755bb4452..5b8da02847f22c5c8f569b55d01d7287b564da68 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties
@@ -32,8 +32,8 @@ conf.continue=Retour \u00E0 l'aper\u00E7u
 conf.mail.error=Cette confirmation aurait du \u00EAtre envoy\u00E9e par e-mail. Cependant une erreur s'est produite. Nous vous conseillons donc d'imprimer cette confirmation. 
 conf.mail.sent=Cette confirmation a \u00E9t\u00E9 envoy\u00E9e par e-mail \u00E0 l'adresse {0}.
 conf.mail.subject=E-mail de confirmation OLAT
-conf.stdtext=Confirmation que $first $last ($login) a transmis le fichier "$filename" le $date \u00E0 $time.
-conf.stdtext.example=Exemple\: on confirme que $first $last ($login) a t\u00E9l\u00E9charg\u00E9 le fichier "$filename" le $date alle $time.
+conf.stdtext=Confirmation que $first $last ($email) a transmis le fichier "$filename" le $date \u00E0 $time.
+conf.stdtext.example=Exemple\: on confirme que $first $last ($email) a t\u00E9l\u00E9charg\u00E9 le fichier "$filename" le $date alle $time.
 conf.title=Confirmation
 dropbox.condition.title=Dossier de remise
 dropbox.files=Vous avez d\u00E9j\u00E0 transmis {0} Fichier(s). 
@@ -126,7 +126,7 @@ task.cancel.reassign=Si l'on retire le devoir, il faut affecter un nouveau devoi
 task.choose=Choisissez un devoir dans la liste ci-dessous SVP. 
 task.chosen=Le devoir que vous avez tir\u00E9e a \u00E9t\u00E9 entre-temps, tir\u00E9e  par un autre utilisateur. Tirez SVP \u00E0 nouveau un devoir. 
 task.condition.title=Affectation
-task.deleted.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 automatiquement. Ne r\u00E9pondez pas \u00E0 ce message, svp. *** \r\n\r\n Le devoir "$filename" a \u00E9t\u00E9 retir\u00E9 par $first $last ($login). \r\n\r\n Ouvrez svp $coursename ($courselink) pour obtenir un nouveau devoir. \r\n\r\n Pour de plus d'informations, contactez $first $last ($email), svp.
+task.deleted.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 automatiquement. Ne r\u00E9pondez pas \u00E0 ce message, svp. *** \r\n\r\n Le devoir "$filename" a \u00E9t\u00E9 retir\u00E9 par $first $last.\r\n\r\n Ouvrez svp $coursename ($courselink) pour obtenir un nouveau devoir. \r\n\r\n Pour de plus d'informations, contactez $first $last ($email), svp.
 task.deleted.subject=Votre devoir a \u00E9t\u00E9 retir\u00E9
 task.launch=Regarder devoir
 task.nomoretasks=Pas d'autres devoirs \u00E0 choisir. Contactez votre tuteur ou tutrice SVP.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties
index 56292bc5c44ff793ed6a472de178d54c9e367eef..428208eb171aadf693ee720238db162f5a455cb8 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties
@@ -32,8 +32,8 @@ conf.continue=Ritorna alla visione d'insieme
 conf.mail.error=Questa conferma avrebbe dovuto essere inviata via e-mail. S\u00EC \u00E8 per\u00F2 verificato un errore. Le consigliamo pertanto di stamparla.
 conf.mail.sent=Questa conferma \u00E8 stata inviata via e-mail all'indirizzo {0}.
 conf.mail.subject=E-mail di conferma OLAT
-conf.stdtext=Si conferma che $first $last ($login) ha caricato il file "$filename" il $date alle ore $time
-conf.stdtext.example=Esempio\: si conferma che $first $last ($login) ha caricato il file "$filename" il $date alle $time
+conf.stdtext=Si conferma che $first $last ($email) ha caricato il file "$filename" il $date alle ore $time
+conf.stdtext.example=Esempio\: si conferma che $first $last ($email) ha caricato il file "$filename" il $date alle $time
 conf.title=Conferma
 dropbox.condition.title=Cartella di consegna
 dropbox.files=Ha gi\u00E0 caricato {0} file.
@@ -126,7 +126,7 @@ task.cancel.reassign=Se ritira il compito occorre assegnare all'utente un nuovo
 task.choose=Scelga un compito dalla lista sottostante, p.f.
 task.chosen=Nel frattempo il compito da Lei estratto \u00E8 stato estratto da un altro utente. Ne estragga un altro, p.f.
 task.condition.title=Assegnazione
-task.deleted.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda a questo messaggio, p.f. *** \r\n\r\n Il compito "$filename" \u00E8 stato ritirato da $first $last ($login). \r\n\r\n Apra p.f. $coursename ($courselink) per ottenere un nuovo compito. \r\n\r\n Per ulteriori chiarimenti contatti $first $last ($email), p.f.
+task.deleted.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda a questo messaggio, p.f. *** \r\n\r\n Il compito "$filename" \u00E8 stato ritirato da $first $last. \r\n\r\n Apra p.f. $coursename ($courselink) per ottenere un nuovo compito. \r\n\r\n Per ulteriori chiarimenti contatti $first $last ($email), p.f.
 task.deleted.subject=Il Suo compito \u00E8 stato ritirato
 task.launch=Visionare il compito
 task.nomoretasks=Non sono disponibili altri compiti. Contatti la sua tutrice o il suo tutore di corso.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties
index ec8d11384e6b0c74cf6bfd23ab9e09df0251922b..86a5442ae555d6282ac2c8b00f7def6cbd3604d8 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties
@@ -29,7 +29,7 @@ conf.continue=Gr\u012F\u017Eti \u012F per\u017Ei\u016Br\u0105
 conf.mail.error=\u0160is patvirtinimas tur\u0117jo b\u016Bti nusi\u0173stas el. pa\u0161tu. Ta\u010Diau siun\u010Diant el. lai\u0161k\u0105 \u012Fvyko klaida. Grie\u017Etai rekomenduojama atsispausdinti \u0161\u012F patvirtinim\u0105 savo u\u017Era\u0161ams.
 conf.mail.sent=\u0160is patvirtinimas bus nusi\u0173stas \u0161iuo el. pa\u0161to adresu {0}.
 conf.mail.subject=OLAT patvirtinimo el. lai\u0161ka
-conf.stdtext=Tai yra patvirtinimui, kad $first $last ($login) perk\u0117l\u0117 rinkmen\u0105 "$filename"   $date $time.
+conf.stdtext=Tai yra patvirtinimui, kad $first $last ($email) perk\u0117l\u0117 rinkmen\u0105 "$filename"   $date $time.
 conf.title=Patvirtinimas
 dropbox.condition.title=I\u0161skleid\u017Eiamasis langelis
 dropbox.files=J\u016Bs \u012Fk\u0117l\u0117te {0} rinkmen\u0173 
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties
index 094ea353178538aab2fd99fc3856c2c5e1d540ca..a7492547968448ea0dc95fde8822872289608334 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties
@@ -32,8 +32,8 @@ conf.continue=Terug naar overzicht
 conf.mail.error=Deze bevestiging moest als e-mail verstuurd worden. Hoewel, het verzenden van deze e-mail is mislukt. Het wordt sterk aanbevolen dat u deze bevestiging afprint voor uw dossier.
 conf.mail.sent=Deze bevestiging werd verstuurd als een e-mail naar het adres {0}.
 conf.mail.subject=OLAT bevestigingse-mail
-conf.stdtext=Dit is om te verklaren dat $first $last ($login) het bestand "$filename" getransfereerd heeft op $date at $time
-conf.stdtext.example=Voorbeeld\: Dit is om te bevestigen dat $first $last ($login) het bestand "$filename" ge\u00FCpload heeft op $date at $time
+conf.stdtext=Dit is om te verklaren dat $first $last ($email) het bestand "$filename" getransfereerd heeft op $date at $time
+conf.stdtext.example=Voorbeeld\: Dit is om te bevestigen dat $first $last ($email) het bestand "$filename" ge\u00FCpload heeft op $date at $time
 conf.title=Bevestiging
 dropbox.condition.title=Drop box
 dropbox.files=U hebt tot nu toe {0} bestand(en) ge\u00FCpload.
@@ -126,7 +126,7 @@ task.cancel.reassign=Wanneer u een taak terugtrekt, moet u een nieuwe taak toewi
 task.choose=Gelieve een taak te selecteren uit de onderstaande lijst.
 task.chosen=De geselecteerde taak is niet meer beschikbaar. Gelieve een andere te selecteren.
 task.condition.title=Opdracht
-task.deleted.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nDe taak "$filename" werd teruggetrokken door $first $last ($login). \r\n\r\nGelieve $coursename ($courselink) te openen om een nieuwe taak toegewezen te krijgen.\r\n\r\nAls u vragen heeft, gelieve $first $last ($email) te contacteren.
+task.deleted.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nDe taak "$filename" werd teruggetrokken door $first $last. \r\n\r\nGelieve $coursename ($courselink) te openen om een nieuwe taak toegewezen te krijgen.\r\n\r\nAls u vragen heeft, gelieve $first $last ($email) te contacteren.
 task.deleted.subject=Uw taak werd teruggetrokken
 task.launch=Bekijk taak
 task.nomoretasks=Er zijn geen taken meer beschikbaar voor selectie. Gelieve uw cursusadministrator te contacteren.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties
index e6911c69845b00994477e689f87272ff657b116f..2b8bcb8244323eb7e8197a98ef3d8d803a24b519 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties
@@ -32,8 +32,8 @@ conf.continue=Cofnij do podsumowania
 conf.mail.error=To potwierdzenie mia\u0142o by\u0107 wys\u0142ane poczt\u0105 elektroniczn\u0105. Niestety, wysy\u0142anie nie powiod\u0142o si\u0119. Zaleca si\u0119 wydrukowanie tego potwierdzenia.
 conf.mail.sent=Potwierdzenie zosta\u0142o wys\u0142ane e-mailem {0}.
 conf.mail.subject=[OLAT - przekazanie pliku] - Potwierdzenie
-conf.stdtext=Wiadomo\u015B\u0107 ma na celu potwierdzenie, \u017Ce u\u017Cytkownik\: $first $last ($login) przekaza\u0142 plik o nazwie\: "$filename"  dnia\: $date o godzinie\: $time.
-conf.stdtext.example=Przyk\u0142ad\: To jest potwierdzenie za\u0142adowania pliku "$filename" przez $first $last ($login), dnia $date o godzinie $time.
+conf.stdtext=Wiadomo\u015B\u0107 ma na celu potwierdzenie, \u017Ce u\u017Cytkownik\: $first $last ($email) przekaza\u0142 plik o nazwie\: "$filename"  dnia\: $date o godzinie\: $time.
+conf.stdtext.example=Przyk\u0142ad\: To jest potwierdzenie za\u0142adowania pliku "$filename" przez $first $last ($email), dnia $date o godzinie $time.
 conf.title=Potwierdzenie
 dropbox.condition.title=Folder danych wej\u015Bciowych
 dropbox.files=Dotychczas przekaza\u0142e\u015B {0} plik\u00F3w.
@@ -126,7 +126,7 @@ task.cancel.reassign=Je\u017Celi wycofasz zadanie, to b\u0119dziesz musia\u0142
 task.choose=Wybierz zadanie z poni\u017Cszej listy.
 task.chosen=Zadanie, kt\u00F3re wybra\u0142e\u015B jest niedost\u0119pne. Wybierz ponownie.
 task.condition.title=Zadanie
-task.deleted.body=*** Ta wiadomo\u015B\u0107 zosta\u0142a wygenerowana automatycznie. Nie odpowiadaj na ni\u0105 ***\r\n\r\nZadanie "$filename" zosta\u0142o wycofane przez $first $last ($login).\r\n\r\nPrzejd\u017A do kursu $coursename ($courselink), \u017Ceby otrzyma\u0107 nowe zadanie.\r\n\r\nW razie w\u0105tpliwo\u015Bci, skontaktuj si\u0119 z $first $last ($email).
+task.deleted.body=*** Ta wiadomo\u015B\u0107 zosta\u0142a wygenerowana automatycznie. Nie odpowiadaj na ni\u0105 ***\r\n\r\nZadanie "$filename" zosta\u0142o wycofane przez $first $last.\r\n\r\nPrzejd\u017A do kursu $coursename ($courselink), \u017Ceby otrzyma\u0107 nowe zadanie.\r\n\r\nW razie w\u0105tpliwo\u015Bci, skontaktuj si\u0119 z $first $last ($email).
 task.deleted.subject=Twoje zadanie zosta\u0142o wycofane
 task.launch=Zobacz zadanie
 task.nomoretasks=Nie ma wi\u0119cej zada\u0144 do wybrania. Skontaktuj si\u0119 z administratorem kursu.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties
index 05eea0ce6e9b3be3b151da72e22d2c4f97c69052..a60ce4e3fbf52787e780f22ed855c2255b8448f2 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties
@@ -32,8 +32,8 @@ conf.continue=Voltar
 conf.mail.error=Esta confirma\u00E7\u00E3o deveria ter sido enviada como e-mail. Entretanto, o envio do e-mail falhou. \u00C9 recomend\u00E1vel que voc\u00EA imprima esta confirma\u00E7\u00E3o para seus registros.
 conf.mail.sent=Esta confirma\u00E7\u00E3o foi enviada como e-mail para o endere\u00E7o {0}.
 conf.mail.subject=E-mail de confirma\u00E7\u00E3o do OLAT
-conf.stdtext=Este aviso certifica que $first $last ($login) entregou o arquivo de resolu\u00E7\u00E3o "$filename" na $date no $time.
-conf.stdtext.example=Exemplo\: Isto \u00E9 para confirmar que $first $last ($login) submeteu o arquivo "$filename" na $date \u00E0s $time
+conf.stdtext=Este aviso certifica que $first $last ($email) entregou o arquivo de resolu\u00E7\u00E3o "$filename" na $date no $time.
+conf.stdtext.example=Exemplo\: Isto \u00E9 para confirmar que $first $last ($email) submeteu o arquivo "$filename" na $date \u00E0s $time
 conf.title=Confirma\u00E7\u00E3o
 dropbox.condition.title=Resolu\u00E7\u00E3o da tarefa
 dropbox.files=Voc\u00EA carregou {0} arquivo(s) at\u00E9 agora.
@@ -126,7 +126,7 @@ task.cancel.reassign=Ao retirar uma tarefa voc\u00EA tem que atribuir um novo no
 task.choose=Favor selecionar uma tarefa da lista abaixo.
 task.chosen=A tarefa que voc\u00EA selecionou n\u00E3o est\u00E1 mais dispon\u00EDvel. Favor selecionar novamente.
 task.condition.title=Tarefa
-task.deleted.body=*** Esta \u00E9 uma mensagem autom\u00E1tica. Por favor, n\u00E3o responda *** \r\n\r\n A tarefa "$filename" foi retirada por $first $last ($login). \r\n\r\n Por favor abra $coursename ($courselink) para ter uma nova tarefa atribu\u00EDda. \r\n\r\n Caso haja alguma d\u00FAvida entre em contato $first $last ($email).
+task.deleted.body=*** Esta \u00E9 uma mensagem autom\u00E1tica. Por favor, n\u00E3o responda *** \r\n\r\n A tarefa "$filename" foi retirada por $first $last. \r\n\r\n Por favor abra $coursename ($courselink) para ter uma nova tarefa atribu\u00EDda. \r\n\r\n Caso haja alguma d\u00FAvida entre em contato $first $last ($email).
 task.deleted.subject=Sua tarefa foi retirada
 task.launch=Visualizar tarefa
 task.nomoretasks=N\u00E3o h\u00E1 mais tarefas dispon\u00EDveis para sele\u00E7\u00E3o. Favor contactar o administrador do curso.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties
index dd6b9615c46ffe7ffcd0251e517faa737db207e5..12e67c0e541d4c23d30a50b00521b9faebc987be 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties
@@ -32,7 +32,7 @@ conf.continue=Voltar
 conf.mail.error=Esta confirma\u00E7\u00E3o deveria ter sido enviada como e-mail. Entretanto, o envio do e-mail falhou. \u00C9 recomend\u00E1vel que voc\u00EA imprima esta confirma\u00E7\u00E3o para seus registros.
 conf.mail.sent=Esta confirma\u00E7\u00E3o foi enviada como e-mail para o endere\u00E7o {0}.
 conf.mail.subject=E-mail de confirma\u00E7\u00E3o do OLAT
-conf.stdtext=Este aviso certifica que $first $last ($login) entregou o arquivo de resolu\u00E7\u00E3o "$filename" na $date no $time.
+conf.stdtext=Este aviso certifica que $first $last ($email) entregou o arquivo de resolu\u00E7\u00E3o "$filename" na $date no $time.
 conf.title=Confirma\u00E7\u00E3o
 dropbox.condition.title=Resolu\u00E7\u00E3o da tarefa
 dropbox.files=Voc\u00EA carregou {0} arquivo(s) at\u00E9 agora.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties
index e08f747a9b17dcf6eeb4492150512bcac83e914c..b9cd5db0ece99d88486ccf3f53f1bdc6a0a7ed8d 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties
@@ -18,7 +18,7 @@ conf.continue=\u041D\u0430\u0437\u0430\u0434 \u043A \u043E\u0431\u0437\u043E\u04
 conf.mail.error=\u042D\u0442\u043E \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u043B\u043E \u0431\u044B\u0442\u044C \u0432\u044B\u0441\u043B\u0430\u043D\u043E \u043F\u043E e-mail, \u043D\u043E \u043F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430. \u041C\u044B \u0441\u043E\u0432\u0435\u0442\u0443\u0435\u043C \u0412\u0430\u043C, \u0440\u0430\u0441\u043F\u0435\u0447\u0430\u0442\u0430\u0442\u044C \u0434\u0430\u043D\u043D\u043E\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435. 
 conf.mail.sent=\u042D\u0442\u043E \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435 \u0431\u044B\u043B\u043E \u0432\u044B\u0441\u043B\u0430\u043D\u043E \u043F\u043E e-mail \u043D\u0430 \u0430\u0434\u0440\u0435\u0441 {0}.
 conf.mail.subject=OLAT e-mail-\u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435 
-conf.stdtext=\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u043C \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0430\u0435\u0442\u0441\u044F, \u0447\u0442\u043E $first $last ($login) \u043E\u0442\u043E\u0441\u043B\u0430\u043B(\u0430) \u0444\u0430\u0439\u043B "$filename" $date \u0432 $time .
+conf.stdtext=\u041D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u043C \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0430\u0435\u0442\u0441\u044F, \u0447\u0442\u043E $first $last ($email) \u043E\u0442\u043E\u0441\u043B\u0430\u043B(\u0430) \u0444\u0430\u0439\u043B "$filename" $date \u0432 $time .
 conf.title=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435
 dropbox.condition.title=\u041F\u0430\u043F\u043A\u0430 \u0441\u0434\u0430\u0447\u0438
 dropbox.files=\u0412\u044B \u0443\u0436\u0435 \u043F\u0435\u0440\u0435\u0441\u043B\u0430\u043B\u0438 {0} \u0444\u0430\u0439\u043B(\u0430/\u043E\u0432).
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties
index 0b32135c6df4e9a4e5240ec13edffa3d5ab37643..37861eea418ea410c0f88691f32c22741292d53e 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties
@@ -32,7 +32,7 @@ conf.continue=Kthehu te mbishikimi
 conf.mail.error=Ky miratim ka pasur t\u00EB d\u00EBrgohet si e-post\u00EB. Sidoqoft\u00EB d\u00EBrgimi i e-post\u00EBs ka d\u00EBshtuar. \u00CBsht\u00EB e rekomanduar shum\u00EB q\u00EB t\u00EB shtypni k\u00EBt\u00EB miratim p\u00EBr sh\u00EBnimet tuaja.
 conf.mail.sent=Ky miratim \u00EBsht\u00EB d\u00EBrguar si e-post\u00EB tek adresa {0}.
 conf.mail.subject=OLAT e-posta e miratimit
-conf.stdtext=Kjo \u00EBsht\u00EB p\u00EBr t\u00EB certifikuar q\u00EB $first $last ($login) kan\u00EB transferuar skedarin "$filename" m\u00EB $date n\u00EB $time.
+conf.stdtext=Kjo \u00EBsht\u00EB p\u00EBr t\u00EB certifikuar q\u00EB $first $last ($email) kan\u00EB transferuar skedarin "$filename" m\u00EB $date n\u00EB $time.
 conf.title=Miratimi
 dropbox.condition.title=Dosja e pranimit
 dropbox.files=Ju keni transferuar {0} skedar() gjer m\u00EB tani.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties
index b7c7ab62a5a8543417c1f81885ee93e5103b5836..d5d58e00093f418db8366444badebf7f73875179 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties
@@ -32,7 +32,7 @@ conf.continue=\u8FD4\u56DE
 conf.mail.error=\u8BE5\u786E\u8BA4\u90AE\u4EF6\u53D1\u9001\u5931\u8D25. \u5F3A\u70C8\u5EFA\u8BAE\u6253\u5370\u8BE5\u786E\u8BA4\u4FE1\u606F.
 conf.mail.sent=\u8BE5\u786E\u8BA4\u4FE1\u606F\u5DF2\u7ECF\u53D1\u9001\u5230{0}.
 conf.mail.subject=OLAT \u786E\u8BA4\u90AE\u4EF6
-conf.stdtext=\u7528\u6237 $last $first ($login) \u5728$date $time \u53D1\u9001\u4E86\u6587\u4EF6 "$filename".
+conf.stdtext=\u7528\u6237 $last $first ($email) \u5728$date $time \u53D1\u9001\u4E86\u6587\u4EF6 "$filename".
 conf.title=\u786E\u8BA4
 dropbox.condition.title=\u63D0\u4EA4\u7BB1
 dropbox.files=\u5230\u76EE\u524D\u4E3A\u6B62\u4F60\u5DF2\u7ECF\u4E0A\u4F20\u4E86{0}\u4E2A\u6587\u4EF6.
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties
index 6f2ed065690350cc0db6829354230e1205e0000a..d758cd4f1b049e3cc1022fd625d54d2e4e0cfbe9 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties
@@ -3,7 +3,7 @@ conf.continue=\u56DE\u5230\u6982\u89C0
 conf.mail.error=\u9019\u500B\u78BA\u8A8D\u6253\u7B97\u8981\u767C\u9001\u96FB\u5B50\u90F5\u4EF6\u3002\u7136\u800C\uFF0C\u767C\u9001\u96FB\u5B50\u90F5\u4EF6\u5931\u6557\u3002\u5F37\u70C8\u5EFA\u8B70\u60A8\u5217\u5370\u9019\u500B\u78BA\u8A8D\u756B\u9762\u4F5C\u70BA\u60A8\u7684\u7D00\u9304\u3002
 conf.mail.sent=\u9019\u500B\u78BA\u8A8D\u5DF2\u7528\u96FB\u5B50\u90F5\u4EF6\u767C\u9001\u5230\u5730\u5740 {0}\u3002
 conf.mail.subject=OLAT\u78BA\u8A8D\u90F5\u4EF6
-conf.stdtext=\u9019\u662F\u7528\u4F86\u8A8D\u8B49 $first $last ($login) \u50B3\u9001\u6A94\u6848 "$filename" \u5728 $date \u7684 $time\u3002
+conf.stdtext=\u9019\u662F\u7528\u4F86\u8A8D\u8B49 $first $last ($email) \u50B3\u9001\u6A94\u6848 "$filename" \u5728 $date \u7684 $time\u3002
 conf.title=\u78BA\u8A8D
 dropbox.condition.title=\u7E73\u4EA4\u7BB1
 dropbox.files=\u60A8\u5DF2\u4E0A\u50B3\u4E86{0}\u500B\u6A94\u6848\u3002
diff --git a/src/main/java/org/olat/group/BusinessGroupService.java b/src/main/java/org/olat/group/BusinessGroupService.java
index 3fcd479956f68b2fc41e267d4f19605013cc4f2d..0c5b8df0b5d84dabc83ed4d383713542e58bf328 100644
--- a/src/main/java/org/olat/group/BusinessGroupService.java
+++ b/src/main/java/org/olat/group/BusinessGroupService.java
@@ -547,7 +547,4 @@ public interface BusinessGroupService {
 	
 	public void archiveGroups(List<BusinessGroup> groups, File exportFile);
 
-	public File archiveGroupMembers(OLATResource resource, List<String> columnList, List<BusinessGroup> groupList, String archiveType,
-			Locale locale, String charset);
-
 }
diff --git a/src/main/java/org/olat/group/area/BGAreaManager.java b/src/main/java/org/olat/group/area/BGAreaManager.java
index 51203bbc4e0d242d2f6bb1e10f677258a65728e1..e9f88b5592d6b3a636b69fe5fbbf96940b681a06 100644
--- a/src/main/java/org/olat/group/area/BGAreaManager.java
+++ b/src/main/java/org/olat/group/area/BGAreaManager.java
@@ -25,9 +25,7 @@
 
 package org.olat.group.area;
 
-import java.io.File;
 import java.util.List;
-import java.util.Locale;
 
 import org.olat.core.id.Identity;
 import org.olat.group.BusinessGroup;
@@ -230,17 +228,4 @@ public interface BGAreaManager {
 	 * @return
 	 */
 	public List<Long> toAreaKeys(String areaNames, OLATResource resource);
-	
-	/**
-	 * 
-	 * @param resource
-	 * @param columnList
-	 * @param areaList
-	 * @param archiveType
-	 * @param locale
-	 * @param charset
-	 * @return
-	 */
-	public File archiveAreaMembers(OLATResource resource, List<String> columnList, List<BGArea> areaList,
-			String archiveType, Locale locale, String charset);
 }
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/area/BGAreaManagerImpl.java b/src/main/java/org/olat/group/area/BGAreaManagerImpl.java
index 154fc5bf637a7b15b6a397810392adc2592a8a01..b3e45c9149ec8d5eee45450762114e2ed6cf1a41 100644
--- a/src/main/java/org/olat/group/area/BGAreaManagerImpl.java
+++ b/src/main/java/org/olat/group/area/BGAreaManagerImpl.java
@@ -25,11 +25,9 @@
 
 package org.olat.group.area;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 import javax.persistence.TypedQuery;
 
@@ -44,7 +42,6 @@ import org.olat.core.util.coordinate.SyncerCallback;
 import org.olat.core.util.coordinate.SyncerExecutor;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupImpl;
-import org.olat.group.manager.BusinessGroupArchiver;
 import org.olat.resource.OLATResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,9 +57,6 @@ public class BGAreaManagerImpl extends BasicManager implements BGAreaManager {
 	
 	@Autowired
 	private DB dbInstance;
-	@Autowired
-	private BusinessGroupArchiver businessGroupArchiver;
-
 	
 	@Override
 	public BGArea loadArea(Long key) {
@@ -458,9 +452,4 @@ public class BGAreaManagerImpl extends BasicManager implements BGAreaManager {
 			.setParameter("areaKey", area.getKey())
 			.executeUpdate();
 	}
-	
-	@Override
-	public File archiveAreaMembers(OLATResource resource, List<String> columnList, List<BGArea> areaList, String archiveType, Locale locale, String charset) {
-		return businessGroupArchiver.archiveAreaMembers(resource, columnList, areaList, archiveType, locale, charset);
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/manager/BusinessGroupArchiver.java b/src/main/java/org/olat/group/manager/BusinessGroupArchiver.java
index b6a3800edf40a886d706cc5d7cb6fd8be9fd44f1..0a1a6589132e7b80211221975227d5027d0f9c71 100644
--- a/src/main/java/org/olat/group/manager/BusinessGroupArchiver.java
+++ b/src/main/java/org/olat/group/manager/BusinessGroupArchiver.java
@@ -21,37 +21,28 @@
 package org.olat.group.manager;
 
 import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 
 import org.olat.admin.securitygroup.gui.GroupController;
 import org.olat.basesecurity.BaseSecurity;
 import org.olat.basesecurity.SecurityGroup;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
-import org.olat.core.id.User;
-import org.olat.core.logging.OLATRuntimeException;
+import org.olat.core.id.context.BusinessControlFactory;
+import org.olat.core.id.context.ContextEntry;
 import org.olat.core.util.FileUtils;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
-import org.olat.core.util.ZipUtil;
 import org.olat.core.util.filter.FilterFactory;
 import org.olat.core.util.i18n.I18nModule;
-import org.olat.course.CourseFactory;
-import org.olat.course.ICourse;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupService;
-import org.olat.group.area.BGArea;
 import org.olat.group.area.BGAreaManager;
 import org.olat.group.ui.BGControllerFactory;
-import org.olat.resource.OLATResource;
 import org.olat.user.UserManager;
 import org.olat.user.propertyhandlers.UserPropertyHandler;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,16 +56,6 @@ public class BusinessGroupArchiver {
 
 	private static final String DELIMITER = "\t";
 	private static final String EOL = "\n";
-	private final static String ALL_IN_ONE_FILE_NAME_PREFIX = "members";
-	private final static String ZIP_WITH_FILE_PER_GROUP_NAME_PREFIX = "members";
-
-
-	private static final String FILE_PER_GROUP_OR_AREA_INCL_GROUP_MEMBERSHIP = "memberlistwizard.archive.type.filePerGroupOrAreaInclGroupMembership"; //used as well as translation key
-	private static final String FILE_PER_GROUP_OR_AREA = "memberlistwizard.archive.type.filePerGroupOrArea"; //used as well as translation key
-	private static final String ALL_IN_ONE = "memberlistwizard.archive.type.allInOne";
-	private static String OWNER = "owner";
-	private static String PARTICIPANT = "participant";
-	private static String WAITING = "waiting";
 	
 	@Autowired
 	private BGAreaManager areaManager;
@@ -96,21 +77,18 @@ public class BusinessGroupArchiver {
 		Translator fallBacktranslator2 = Util.createPackageTranslator(BGControllerFactory.class, locale, fallBacktranslator1);
 		Translator translator = userManager.getPropertyHandlerTranslator(fallBacktranslator2);
 		return translator;
-
 	}
 	
 	//get user property handlers used in this group archiver
 	private List<UserPropertyHandler> getUserPropertyHandlers() {
 		return userManager.getUserPropertyHandlersFor("org.olat.group.BusinessGroupArchiver", true);
 	}
-
-	public void archiveGroup(BusinessGroup businessGroup, File archiveFile) {
-		Translator translator = getPackageTranslator(I18nModule.getDefaultLocale());
-		FileUtils.save(archiveFile, toXls(businessGroup, translator), "utf-8");
+	
+	public void archiveGroups(List<BusinessGroup> groups, File archiveFile) {
+		FileUtils.save(archiveFile, toXls(groups), "utf-8");		
 	}
 
 	private String toXls(BusinessGroup businessGroup, Translator translator) {
-		
 		StringBuffer buf = new StringBuffer();
 		// Export Header
 		buf.append(translator.translate("archive.group.name"));
@@ -157,7 +135,10 @@ public class BusinessGroupArchiver {
 	private void appendIdentity(StringBuffer buf, Identity owner, Date addedTo, Translator translator) {
 		Locale loc = translator.getLocale();
 		// add the identities user name
-		buf.append(owner.getName());
+
+		ContextEntry ce = BusinessControlFactory.getInstance().createContextEntry(owner);
+		String uname = BusinessControlFactory.getInstance().getAsURIString(Collections.singletonList(ce), false);
+		buf.append(uname);
 		buf.append(DELIMITER);
 		// add all user properties
 		for (UserPropertyHandler propertyHandler : getUserPropertyHandlers()) {
@@ -174,7 +155,7 @@ public class BusinessGroupArchiver {
 
 	private void appendIdentityTableHeader(StringBuffer buf, Translator translator) {
 		// first the identites name
-		buf.append( translator.translate("table.user.login") );
+		buf.append( translator.translate("table.user.url") );
 		buf.append(DELIMITER);
 		// second the users properties
 		for (UserPropertyHandler propertyHandler : getUserPropertyHandlers()) {
@@ -186,10 +167,6 @@ public class BusinessGroupArchiver {
 		buf.append( translator.translate("table.subject.addeddate") );
 		buf.append(EOL);
 	}
-	
-	public void archiveGroups(List<BusinessGroup> groups, File archiveFile) {
-		FileUtils.save(archiveFile, toXls(groups), "utf-8");		
-	}
 
 	private String toXls(List<BusinessGroup> groups) {
 		Translator translator = getPackageTranslator(I18nModule.getDefaultLocale());
@@ -215,702 +192,4 @@ public class BusinessGroupArchiver {
 		}
 		return buf.toString();
 	}
-
-	/**
-	 * Creates an temp CSV (comma separated) file containing the members info
-	 * (namely with the columns specified in "columnList"), the area info (for
-	 * the filtered "areaList"), and separated in role sections: owners,
-	 * participants and waiting.
-	 * @param context
-	 * @param columnList
-	 * @param areaList
-	 * @param archiveType
-	 * @param userLocale
-	 * @return the output file which could be an CSV or a zip file depending on the input archiveType.
-	 * @see BGArea
-	 */
-	public File archiveAreaMembers(OLATResource resource, List<String> columnList, List<BGArea> areaList, String archiveType, Locale locale, String charset) {
-
-		List<Member> owners = new ArrayList<Member>();
-		List<Member> participants = new ArrayList<Member>();
-		List<Member> waitings = new ArrayList<Member>();
-
-		List<BGArea> areas = areaManager.findBGAreasInContext(resource);
-		for (BGArea area :areas) {
-			if (areaList.contains(area)) { //rely on the equals() method of the BGArea impl
- 				List<BusinessGroup> areaBusinessGroupList = areaManager.findBusinessGroupsOfArea(area);
-				for (BusinessGroup group : areaBusinessGroupList) {
-					if(group.getOwnerGroup()!=null) {
-					  Iterator<Object[]> ownerIterator = securityManager.getIdentitiesAndDateOfSecurityGroup(group.getOwnerGroup()).iterator();
-					  addMembers(area.getKey(), ownerIterator, owners, OWNER);
-					}
-					if(group.getPartipiciantGroup()!=null) {
-					  Iterator<Object[]> participantsIterator = securityManager.getIdentitiesAndDateOfSecurityGroup(group.getPartipiciantGroup()).iterator();
-					  addMembers(area.getKey(), participantsIterator, participants, PARTICIPANT);
-					}
-					if(group.getWaitingGroup()!=null) {
-					  Iterator<Object[]> waitingIterator = securityManager.getIdentitiesAndDateOfSecurityGroup(group.getWaitingGroup()).iterator();
-					  addMembers(area.getKey(), waitingIterator, waitings, WAITING);
-					}
-				}
-			}
-		}
-
-		Translator trans = getPackageTranslator(locale);
-		List<OrganisationalEntity> organisationalEntityList = getOrganisationalEntityListFromAreas(areaList);
-		return generateArchiveFile(resource, owners, participants, waitings, columnList, organisationalEntityList, 
-				trans.translate("archive.areas"), archiveType, locale, charset);
-	}
-	
-	
-	/**
-	 * Creates an temp CSV (comma separated) file containing the members info
-	 * (namely with the columns specified in "columnList"), the groups info (for
-	 * the filtered "groupList"), and separated in role sections: owners,
-	 * participants and waiting.
-	 * @param context
-	 * @param columnList
-	 * @param groupList
-	 * @param archiveType
-	 * @param userLocale
-	 * @return the output file which could be an CSV or a zip file depending on the input archiveType.
-	 */
-	public File archiveGroupMembers(OLATResource resource, List<String> columnList, List<BusinessGroup> groupList, String archiveType, Locale locale, String charset) {
-    
-		List<Member> owners = new ArrayList<Member>();
-		List<Member> participants = new ArrayList<Member>();
-		List<Member> waitings = new ArrayList<Member>();
-				
-		List<BusinessGroup> groups = businessGroupService.findBusinessGroups(null, resource, 0, -1);
-		for (BusinessGroup group: groups) {
-			if (groupList.contains(group)) { //rely on the equals() method of the BusinessGroup impl			
-				if(group.getOwnerGroup()!=null) {
-					Iterator<Object[]> ownerIterator = securityManager.getIdentitiesAndDateOfSecurityGroup(group.getOwnerGroup()).iterator();
-				  addMembers(group.getKey(), ownerIterator, owners, OWNER);
-				}
-				if(group.getPartipiciantGroup()!=null) {
-				  Iterator<Object[]> participantsIterator = securityManager.getIdentitiesAndDateOfSecurityGroup(group.getPartipiciantGroup()).iterator();
-				  addMembers(group.getKey(), participantsIterator, participants, PARTICIPANT);
-				}
-				if(group.getWaitingGroup()!=null) {
-				  Iterator<Object[]> waitingIterator = securityManager.getIdentitiesAndDateOfSecurityGroup(group.getWaitingGroup()).iterator();
-				  addMembers(group.getKey(), waitingIterator, waitings, WAITING);
-				}
-			}
-		}
-
-		Translator trans = getPackageTranslator(locale);
-		List<OrganisationalEntity> organisationalEntityList = getOrganisationalEntityListFromGroups(groupList);
-		return generateArchiveFile(resource, owners, participants, waitings, columnList, organisationalEntityList, 
-				trans.translate("archive.groups"), archiveType, locale, charset);
-	}
-
-	/**
-	 * 
-	 * @param context
-	 * @return a List with the course titles associated with the input BGContext.
-	 */
-	private List<String> getCourseTitles(OLATResource resource) {
-		List<String> courseTitles = new ArrayList<String>();
-		ICourse course = CourseFactory.loadCourse(resource);
-		courseTitles.add(course.getCourseTitle());
-		return courseTitles;
-	}
-
-	private File generateArchiveFile(OLATResource resource, List<Member> owners, List<Member> participants, List<Member> waitings,
-			List<String> columnList, List<OrganisationalEntity> organisationalEntityList, String orgEntityTitle, String archiveType,
-			Locale userLocale, String charset) {
-		//TODO: sort member lists
-		File outFile = null;
-		Translator trans = getPackageTranslator(userLocale);		
-		String archiveTitle = trans.translate("archive.title") + ":resource";
-		try {
-		if (ALL_IN_ONE.equals(archiveType)) {
-			//File tempDir = getTempDir();
-			outFile = archiveAllInOne(resource, owners, participants, waitings, archiveTitle, columnList, organisationalEntityList,
-					orgEntityTitle, userLocale, ALL_IN_ONE_FILE_NAME_PREFIX, null, charset);
-		} else if (FILE_PER_GROUP_OR_AREA_INCL_GROUP_MEMBERSHIP.equals(archiveType)) {
-			outFile = archiveFilePerGroupInclGroupmembership(resource, owners, participants, waitings, archiveTitle, columnList,
-					organisationalEntityList, orgEntityTitle, userLocale, charset);
-		} else if (FILE_PER_GROUP_OR_AREA.equals(archiveType)) {
-			outFile = archiveFilePerGroup(resource, owners, participants, waitings, columnList, organisationalEntityList,
-					userLocale, charset);
-		}
-		} catch (IOException e) {
-			throw new OLATRuntimeException(BusinessGroupArchiver.class, "could not create temp file", e);
-		}				
-		return outFile;
-	}
-	
-	/**
-	 * Generates a single file for all groups. <br>
-	 * It is the responsability of the caller to delete the returned file after
-	 * download.
-	 * 
-	 * @param owners
-	 * @param participants
-	 * @param waitings
-	 * @param columnList
-	 * @param groupList
-	 * @param userLocale
-	 * @return the generated file located into the temp dir.
-	 */
-	private File archiveAllInOne(OLATResource resource,List<Member> owners, List<Member> participants, List<Member> waitings, String contextName,
-			List<String> columnList, List<OrganisationalEntity> organisationalEntityList, String orgEntityTitle, Locale userLocale,
-			String fileNamePrefix, File tempDir, String charset) throws IOException {
-		File outFile = null;
-		StringBuffer stringBuffer = new StringBuffer();
-
-		Translator trans = getPackageTranslator(userLocale);		
-		Translator propertyHandlerTranslator = UserManager.getInstance().getPropertyHandlerTranslator(trans);
-		appendContextInfo(stringBuffer, resource, userLocale);
-		if (owners.size() > 0) {
-			appendSection(stringBuffer, trans.translate("archive.header.owners"), owners, columnList, organisationalEntityList, orgEntityTitle,
-					propertyHandlerTranslator, OWNER);
-		}
-		if (participants.size() > 0) {
-			appendSection(stringBuffer, trans.translate("archive.header.partipiciant"), participants, columnList, organisationalEntityList,
-					orgEntityTitle, propertyHandlerTranslator, PARTICIPANT);
-		}
-		if (waitings.size() > 0) {
-			appendSection(stringBuffer, trans.translate("archive.header.waitinggroup"), waitings, columnList, organisationalEntityList,
-					orgEntityTitle, propertyHandlerTranslator, WAITING);
-		}		
-		appendInternInfo(stringBuffer, contextName, userLocale);	
-		//prefix must be at least 3 chars
-		//add two of _ more if this is not the case
-		fileNamePrefix = fileNamePrefix + "_";
-		fileNamePrefix = fileNamePrefix.length() >= 3 ? fileNamePrefix : fileNamePrefix +"__"; 
-		fileNamePrefix = FileUtils.normalizeFilename(fileNamePrefix);
-		outFile = File.createTempFile(fileNamePrefix, ".xls", tempDir);
-		FileUtils.save(outFile, stringBuffer.toString(), charset);
-		//FileUtils.saveString(outFile, stringBuffer.toString());
-		String outFileName = outFile.getName();
-		outFileName = outFileName.substring(0, outFileName.lastIndexOf("_"));
-		outFileName += ".xls";
-		File renamedFile = new File(outFile.getParentFile(), outFileName);
-		boolean succesfullyRenamed = outFile.renameTo(renamedFile);
-		if (succesfullyRenamed) {
-			outFile = renamedFile;
-		}
-
-		return outFile;
-	}
-	
-	private void appendInternInfo(StringBuffer buf, String title, Locale userLocale) {
-		Translator trans = getPackageTranslator(userLocale);	
-		buf.append(EOL);
-		buf.append(trans.translate("archive.interninfo"));
-		buf.append(EOL);
-		buf.append(title);
-		buf.append(EOL);
-	}
-	
-	/**
-	 * 
-	 * @return a temporary dir in the default temporary-file directory.
-	 * @throws IOException
-	 */
-	private File getTempDir() throws IOException{
-		//prefix must be at least 3 chars
-		File tempDir = File.createTempFile("temp","archive");
-		if(tempDir.delete()) {
-			tempDir.mkdir();
-		}
-		return tempDir;
-	}
-
-	/**
-	 * Generates a CSV file per group and then creates a zip with them.
-	 * 
-	 * @param owners
-	 * @param participants
-	 * @param waitings
-	 * @param contextName
-	 * @param columnList
-	 * @param groupList
-	 * @param userLocale
-	 * @return the output zip file located into the temp dir.
-	 */
-	private File archiveFilePerGroupInclGroupmembership(OLATResource resource, List<Member> owners, List<Member> participants,
-			List<Member> waitings, String contextName, List<String> columnList, List<OrganisationalEntity> groupList, String orgEntityTitle,
-			Locale userLocale, String charset) {
-		Set<String> outFiles = new HashSet<String>();
-		File root = null;
-		File tempDir = null;
-		try {
-			tempDir = getTempDir();
-			Iterator<OrganisationalEntity> groupIterator = groupList.iterator();
-			while (groupIterator.hasNext()) {
-				OrganisationalEntity group = groupIterator.next();
-				List<Member> groupOwners = getFilteredList(owners, group, OWNER);
-				List<Member> groupParticipants = getFilteredList(participants, group, PARTICIPANT);
-				List<Member> groupWaiting = getFilteredList(waitings, group, WAITING);
-
-				File filePerGroup = archiveAllInOne(resource, groupOwners, groupParticipants, groupWaiting, contextName, columnList, groupList,
-						orgEntityTitle, userLocale, group.getName(), tempDir, charset);
-				if (root == null && filePerGroup != null) {
-					root = filePerGroup.getParentFile();
-				}
-				outFiles.add(filePerGroup.getName());
-			}
-			//prefix must be at least 3 chars
-			File zipFile = File.createTempFile(ZIP_WITH_FILE_PER_GROUP_NAME_PREFIX, ".zip");
-			zipFile.delete();
-			boolean successfully = ZipUtil.zip(outFiles, root, zipFile, true);
-			if (successfully) { return zipFile; }
-		} catch (IOException e) {
-			throw new OLATRuntimeException(BusinessGroupArchiver.class, "could not create temp file", e);
-		} finally {
-			if (tempDir != null) {
-				FileUtils.deleteDirsAndFiles(tempDir, true, true);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Generates a CSV file per group and then creates a zip with them.
-	 *
-	 * @param owners
-	 * @param participants
-	 * @param waitings
-	 * @param contextName
-	 * @param columnList
-	 * @param groupList
-	 * @param userLocale
-	 * @return the output zip file located into the temp dir.
-	 */
-	private File archiveFilePerGroup(OLATResource resource, List<Member> owners, List<Member> participants,
-			List<Member> waitings, List<String> columnList, List<OrganisationalEntity> groupList, Locale userLocale,
-			String charset) {
-		Set<String> outFiles = new HashSet<String>();
-		File root = null;
-		File tempDir = null;
-		try {
-			tempDir = getTempDir();
-			Iterator<OrganisationalEntity> groupIterator = groupList.iterator();
-			while (groupIterator.hasNext()) {
-				OrganisationalEntity group = groupIterator.next();
-				List<Member> groupOwners = getFilteredList(owners, group, OWNER);
-				List<Member> groupParticipants = getFilteredList(participants, group, PARTICIPANT);
-				List<Member> groupWaiting = getFilteredList(waitings, group, WAITING);
-
-				File filePerGroup = archiveFileSingleGroup(resource, groupOwners, groupParticipants, groupWaiting, columnList,
-						userLocale, group.getName(), tempDir, charset);
-				if (root == null && filePerGroup != null) {
-					root = filePerGroup.getParentFile();
-				}
-				outFiles.add(filePerGroup.getName());
-			}
-			//prefix must be at least 3 chars
-			File zipFile = File.createTempFile(ZIP_WITH_FILE_PER_GROUP_NAME_PREFIX, ".zip");
-			zipFile.delete();
-			boolean successfully = ZipUtil.zip(outFiles, root, zipFile, true);
-			if (successfully) { return zipFile; }
-		} catch (IOException e) {
-			throw new OLATRuntimeException(BusinessGroupArchiver.class, "could not create temp file", e);
-		} finally {
-			if (tempDir != null) {
-				FileUtils.deleteDirsAndFiles(tempDir, true, true);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Save one group to xls file.
-	 * @param context
-	 * @param groupOwners
-	 * @param groupParticipants
-	 * @param groupWaiting
-	 * @param columnList
-	 * @param organisationalEntityList
-	 * @param orgEntityTitle
-	 * @param userLocale
-	 * @param fileNamePrefix
-	 * @param tempDir
-	 * @param charset
-	 * @return
-	 * @throws IOException
-	 */
-	private File archiveFileSingleGroup(OLATResource resource, List<Member> groupOwners, List<Member> groupParticipants, List<Member> groupWaiting,
-			List<String> columnList, Locale userLocale, String fileNamePrefix,
-			File tempDir, String charset) throws IOException {
-		File outFile = null;
-		StringBuffer stringBuffer = new StringBuffer();
-
-		Translator trans = getPackageTranslator(userLocale);
-		Translator propertyHandlerTranslator = UserManager.getInstance().getPropertyHandlerTranslator(trans);
-		// choice element has only one selected entry
-		List<String> titles = getCourseTitles (resource);
-		Iterator<String> titleIterator = titles.iterator();
-		DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, userLocale);
-		String formattedDate = dateFormat.format(new Date());
-
-		// coursename
-		stringBuffer.append(EOL);
-		stringBuffer.append(trans.translate("archive.coursename"));
-		stringBuffer.append(EOL);
-		while(titleIterator.hasNext()) {
-			stringBuffer.append(titleIterator.next());
-		}
-		stringBuffer.append(EOL);
-		stringBuffer.append(EOL);
-
-		// groupname
-		stringBuffer.append(trans.translate("group.name"));
-		stringBuffer.append(EOL);
-		stringBuffer.append(fileNamePrefix);
-		stringBuffer.append(EOL);
-		stringBuffer.append(EOL);
-
-		// date
-		stringBuffer.append(trans.translate("archive.date"));
-		stringBuffer.append(EOL);
-		stringBuffer.append(formattedDate);
-		stringBuffer.append(EOL);
-
-		// members
-		if (groupOwners.size() > 0) {
-			appendSection(stringBuffer, trans.translate("archive.header.owners"), groupOwners, columnList, new ArrayList<OrganisationalEntity>(), "",
-					propertyHandlerTranslator, OWNER);
-		}
-		if (groupParticipants.size() > 0) {
-			appendSection(stringBuffer, trans.translate("archive.header.partipiciant"), groupParticipants, columnList, new ArrayList<OrganisationalEntity>(),
-					"", propertyHandlerTranslator, PARTICIPANT);
-		}
-		if (groupWaiting.size() > 0) {
-			appendSection(stringBuffer, trans.translate("archive.header.waitinggroup"), groupWaiting, columnList, new ArrayList<OrganisationalEntity>(),
-					"", propertyHandlerTranslator, WAITING);
-		}
-		//appendInternInfo(stringBuffer, contextName, userLocale);
-		//prefix must be at least 3 chars
-		//add two of _ more if this is not the case
-		fileNamePrefix = fileNamePrefix + "_";
-		fileNamePrefix = fileNamePrefix.length() >= 3 ? fileNamePrefix : fileNamePrefix +"__";
-		fileNamePrefix = fileNamePrefix.replaceAll("[*?\"<>/\\\\:]","_"); // nicht erlaubte Zeichen in Dateinamen
-		String[] search = new String[] { "ß", "ä", "ö", "ü","Ä","Ö","Ü"," " };
-		String[] replace = new String[] { "ss", "ae", "oe", "ue","Ae","Oe","Ue","_" };
-		for (int i = 0; i < search.length; i++) {
-			fileNamePrefix = fileNamePrefix.replaceAll(search[i], replace[i]);
-		}
-		outFile = File.createTempFile(fileNamePrefix, ".xls", tempDir);
-		FileUtils.save(outFile, stringBuffer.toString(), charset);
-		//FileUtils.saveString(outFile, stringBuffer.toString());
-		String outFileName = outFile.getName();
-		outFileName = outFileName.substring(0, outFileName.lastIndexOf("_"));
-		outFileName += ".xls";
-		File renamedFile = new File(outFile.getParentFile(), outFileName);
-		boolean succesfullyRenamed = outFile.renameTo(renamedFile);
-		if (succesfullyRenamed) {
-			outFile = renamedFile;
-		}
-
-		return outFile;
-	}
-
-	/**
-	 * Filters the input "member" list, and returns only a sublist with the
-	 * members of the input "group".
-	 * 
-	 * @param members
-	 * @param group
-	 * @param role
-	 * @return the list with only the members of the input group.
-	 */
-	private List<Member> getFilteredList(List<Member> members, OrganisationalEntity group, String role) {
-		List<Member> filteredList = new ArrayList<Member>();
-		Iterator<Member> memberListIterator = members.iterator();
-		while (memberListIterator.hasNext()) {
-			Member currMember = memberListIterator.next();
-			if (currMember.getOrganisationalEntityRoleList().contains(new OrganisationalEntityRole(group.getKey(), role))) {
-				filteredList.add(currMember);
-			}
-		}
-		return filteredList;
-	}
-	
-	/**
-	 * Wraps the identities from "identityIterator" into Members, and adds the
-	 * members to the "members" list.
-	 * 
-	 * @param group
-	 * @param memberIterator
-	 * @param members
-	 * @param roleName
-	 */
-	private void addMembers(Long entityKey, Iterator<Object[]> identityIterator, List<Member> members, String roleName) {
-		while (identityIterator.hasNext()) {
-			Object[] element = identityIterator.next();
-			Identity identity = (Identity) element[0];
-			OrganisationalEntityRole role = new OrganisationalEntityRole(entityKey, roleName);
-			Member member = new Member(identity, new ArrayList<OrganisationalEntityRole>());
-			member.getOrganisationalEntityRoleList().add(role);
-			if(!members.contains(member)) {
-				members.add(member);
-			} else {
-				Iterator<Member> memberSetIterator = members.iterator();
-				while(memberSetIterator.hasNext()) {
-					Member currMember = memberSetIterator.next();
-					if(currMember.equals(member)) {
-						currMember.getOrganisationalEntityRoleList().add(role);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Appends course names and archive date.
-	 * @param buf
-	 * @param context
-	 * @param userLocale
-	 */
-	private void appendContextInfo(StringBuffer buf, OLATResource resource, Locale userLocale) {
-		List<String> titles = getCourseTitles (resource);
-		DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, userLocale);
-		String formattedDate = dateFormat.format(new Date());
-		Translator trans = getPackageTranslator(userLocale);
-		buf.append(EOL);
-		buf.append(trans.translate("archive.coursename"));
-		buf.append(DELIMITER);
-		buf.append(trans.translate("archive.date"));
-		buf.append(EOL);
-		
-		Iterator<String> titleIterator = titles.iterator();
-		int i=0;
-		while(titleIterator.hasNext()) {
-			buf.append(titleIterator.next());
-			buf.append(DELIMITER);
-			if(i<1) {
-				buf.append(formattedDate);
-			}
-			buf.append(EOL);
-			i++;
-		}
-	}
-	
-	/**
-	 * Appends header labels to the input stringBuffer as follows: first the
-	 * columnList items in that order and next the group list items.
-	 * 
-	 * @param buf
-	 * @param title
-	 * @param columList
-	 * @param groupList
-	 */
-	private void appendHeader(StringBuffer buf, String title, List<String> columnList, List<OrganisationalEntity> organisationalEntityList,
-			String orgEntityTitle, Translator trans) {
-		buf.append(EOL);
-		buf.append(title);
-		int colSize = columnList.size();
-		for (int i = 0; i < colSize; i++) {
-			buf.append(DELIMITER);
-		}
-		buf.append(orgEntityTitle);
-		buf.append(EOL);
-		Iterator<String> columnIterator = columnList.iterator();
-		while(columnIterator.hasNext()) {
-			String columnKey = columnIterator.next();
-			buf.append( trans.translate(columnKey));
-			buf.append(DELIMITER);
-		}
-		
-		Iterator<OrganisationalEntity> groupIterator = organisationalEntityList.iterator();
-		while(groupIterator.hasNext()) {
-			OrganisationalEntity group = groupIterator.next();
-			buf.append(group.getName());
-			buf.append(DELIMITER);
-		}
-		buf.append(EOL);		
-	}
-	
-	/**
-	 * Appends member info to the input stringBuffer.
-	 * 
-	 * @param buf
-	 * @param member
-	 * @param columnList
-	 * @param groupList
-	 * @param role
-	 */
-	private void appendMember(StringBuffer buf, Member member, List<String> columnList, List<OrganisationalEntity> groupList, String role) {
-		if(columnList.contains("username")) {
-		  buf.append(member.getIdentity().getName());	//TODO username
-		  buf.append(DELIMITER);
-		}		
-
-		// get selected user properties and append
-		User user = member.getIdentity().getUser();
-		for (String column : columnList) {
-			String key = column.substring(column.lastIndexOf(".")+1);		
-			if(!key.contains("username")) {
-			  String value = user.getProperty(key, null); // use default locale			
-		    buf.append((value == null ? "" : value));	
-		    buf.append(DELIMITER);	
-			}
-		}
-		
-		List<OrganisationalEntityRole> groupRoleList = member.getOrganisationalEntityRoleList();
-		Iterator<OrganisationalEntity> groupIterator = groupList.iterator();
-		while(groupIterator.hasNext()) {
-			OrganisationalEntity group = groupIterator.next();
-			OrganisationalEntityRole groupRole = new OrganisationalEntityRole(group.getKey(), role);
-			if(groupRoleList.contains(groupRole)) {
-				buf.append("X"); 
-			}
-			buf.append(DELIMITER);
-		}
-		buf.append(EOL);
-	}
-	
-	/**
-	 * Appends the section header and next the members.
-	 * 
-	 * @param stringBuffer
-	 * @param sectionTitle
-	 * @param members
-	 * @param columnList
-	 * @param groupList
-	 * @param trans
-	 * @param role
-	 */
-	private void appendSection(StringBuffer stringBuffer, String sectionTitle, List<Member> members, List<String> columnList,
-			List<OrganisationalEntity> organisationalEntityList, String orgEntityTitle, Translator trans, String role) {
-		
-		appendHeader(stringBuffer, sectionTitle, columnList, organisationalEntityList, orgEntityTitle, trans);
-		Iterator<Member> memberIterator = members.iterator();
-		while (memberIterator.hasNext()) {
-			Member member = memberIterator.next();
-			appendMember(stringBuffer, member, columnList, organisationalEntityList, role);
-		}
-	}
-	
-	/**
-	 * Converts a list of items of a certain type (BusinessGroup,BGArea) in a list
-	 * of OrganisationalEntitys.
-	 * 
-	 * @param itemList
-	 * @return
-	 */
-	private List<OrganisationalEntity> getOrganisationalEntityListFromGroups(List<BusinessGroup> itemList) {
-		List<OrganisationalEntity> entryList = new ArrayList<OrganisationalEntity>();
-		for (BusinessGroup group : itemList){
-			entryList.add(new OrganisationalEntity(group.getKey(), group.getName()));
-		}
-		return entryList;
-	}
-	
-	private List<OrganisationalEntity> getOrganisationalEntityListFromAreas(List<BGArea> areas) {
-		List<OrganisationalEntity> entryList = new ArrayList<OrganisationalEntity>();
-		for (BGArea area : areas){
-			entryList.add(new OrganisationalEntity(area.getKey(), area.getName()));
-		}
-		return entryList;
-	}
-
-	/**
-	 * Description:<br>
-	 * An organisational entity is a Group or an Area.
-	 * Encapsulates the entityKey and the role in the group.
-	 * <P>
-	 * Initial Date:  26.07.2007 <br>
-	 * 
-	 * @author Lavinia Dumitrescu
-	 */
-	private class OrganisationalEntityRole {
-		private Long entityKey;
-		private String roleInGroup;
-		
-		public OrganisationalEntityRole(Long entityKey, String roleInGroup) {
-			super();
-			this.entityKey = entityKey;
-			this.roleInGroup = roleInGroup;
-		}
-
-		public String getRoleInGroup() {
-			return roleInGroup;
-		}
-
-		public Long getEntityKey() {
-			return entityKey;
-		}
-		
-		public boolean equals(Object obj) {
-			OrganisationalEntityRole that = (OrganisationalEntityRole) obj;
-			return this.entityKey.equals(that.getEntityKey()) && this.getRoleInGroup().equals(that.getRoleInGroup());
-		}
-		
-		public int hashCode() {
-			return getEntityKey().intValue() + getRoleInGroup().hashCode();
-		}
-		
-	}
-	
-	/**
-	 * Description:<br>
-	 * Encapsulates an <code>Identity</code> and a list of <code>OrganisationalEntityRole</code> of the <code>Identity</code>.
-	 * <P>
-	 * Initial Date:  26.07.2007 <br>
-	 * 
-	 * @author Lavinia Dumitrescu
-	 */
-	private class Member {
-		private Identity identity;
-		private List<OrganisationalEntityRole> organisationalEntityRoleList;
-		
-		public Member(Identity identity, List<OrganisationalEntityRole> groupRoleList) {
-			super();
-			this.identity = identity;
-			this.organisationalEntityRoleList = groupRoleList;
-		}
-		
-		public List<OrganisationalEntityRole> getOrganisationalEntityRoleList() {
-			return organisationalEntityRoleList;
-		}
-
-		public Identity getIdentity() {
-			return identity;
-		}
-		
-		/**
-		 * Compares the identity of the members.
-		 * 
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			try {
-				Member groupMember = (Member)obj;
-				return this.identity.equals(groupMember.identity);
-			} catch(Exception ex) {	
-				//nothing to do
-			}
-			return false;
-		}
-		
-		public int hashCode() {
-			return this.identity.hashCode();
-		}
-	}
-
-	private class OrganisationalEntity {
-		private Long key;
-		private String name;
-
-		public OrganisationalEntity(Long key, String name) {
-			super();
-			this.key = key;
-			this.name = name;
-	}
-
-
-		public Long getKey() {
-			return key;
-		}
-
-		public String getName() {
-			return name;
-		}
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
index 3b990e9cfeb430cfff994a84f59c84a1e05af6ba..a2b0fcd463bd60eb012d5f67816f0319833129fb 100644
--- a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
+++ b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
@@ -1701,9 +1701,4 @@ public class BusinessGroupServiceImpl implements BusinessGroupService, UserDataD
 	public void archiveGroups(List<BusinessGroup> groups, File exportFile) {
 		businessGroupArchiver.archiveGroups(groups, exportFile);
 	}
-
-	@Override
-	public File archiveGroupMembers(OLATResource resource, List<String> columnList, List<BusinessGroup> groupList, String archiveType, Locale locale, String charset) {
-		return businessGroupArchiver.archiveGroupMembers(resource, columnList, groupList, archiveType, locale, charset);
-	}
 }
diff --git a/src/main/java/org/olat/group/ui/BGMailHelper.java b/src/main/java/org/olat/group/ui/BGMailHelper.java
index 9b7b4cf3bf8abc5016ec134b68fddcfa8098457d..a14f1db38e9e1a19bbdf8c790af0e8ef4a4fe5b9 100644
--- a/src/main/java/org/olat/group/ui/BGMailHelper.java
+++ b/src/main/java/org/olat/group/ui/BGMailHelper.java
@@ -189,8 +189,12 @@ public class BGMailHelper {
 	 */
 	private static MailTemplate createMailTemplate(BusinessGroupShort group, Identity actor, String subjectKey, String bodyKey) {
 		// get some data about the actor and fetch the translated subject / body via i18n module
-		String[] bodyArgs = new String[] { actor.getUser().getProperty(UserConstants.FIRSTNAME, null), actor.getUser().getProperty(UserConstants.LASTNAME, null), actor.getUser().getProperty(UserConstants.EMAIL, null),
-					actor.getName() };
+		String[] bodyArgs = new String[] {
+				actor.getUser().getProperty(UserConstants.FIRSTNAME, null),
+				actor.getUser().getProperty(UserConstants.LASTNAME, null),
+				actor.getUser().getProperty(UserConstants.EMAIL, null),
+				actor.getUser().getProperty(UserConstants.EMAIL, null)// 2x for compatibility with old i18m properties
+		};
 		Locale locale = I18nManager.getInstance().getLocaleOrDefault(actor.getUser().getPreferences().getLanguage());
 		Translator trans = Util.createPackageTranslator(BGMailHelper.class, locale);
 		String subject = trans.translate(subjectKey);
@@ -238,7 +242,7 @@ public class BGMailHelper {
 				User user = identity.getUser();
 				context.put("firstname", user.getProperty(UserConstants.FIRSTNAME, null));
 				context.put("lastname", user.getProperty(UserConstants.LASTNAME, null));
-				context.put("login", identity.getName());
+				context.put("login", user.getProperty(UserConstants.EMAIL, null));
 				// Put variables from greater context
 				context.put("groupname", groupname);
 				context.put("groupdescription", groupdescription);
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ar.properties
index 2500e0539c266cdb378c6a28f9497e63bc0ff9f9..46e3273be29d82b7a8759b8e41ceba65b10888f3 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ar.properties
@@ -50,11 +50,11 @@ menu.allgroups.alt=\u0642\u0627\u0626\u0645\u0629 \u0643\u0644 \u0645\u062C\u064
 menu.index=\u0625\u062F\u0627\u0631\u0629 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629
 menu.index.alt=\u0625\u062F\u0627\u0631\u0629 \u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062A\u0639\u0644\u064A\u0645
 newgroup.title=\u0625\u0646\u0634\u0627\u0621 \u0645\u062C\u0645\u0648\u0639\u0629 \u062A\u0639\u0644\u064A\u0645 \u062C\u062F\u064A\u062F\u0629
-notification.mail.added.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u062A\u0645\u062A \u062F\u0639\u0648\u062A\u0643 \u0644\u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({3})\:\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640\r\n\r\n\:\u062A\u0633\u062A\u062E\u062F\u0645 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u0645\u0635\u0627\u062F\u0631 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u064A\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629\r\n\r\n$courselist
+notification.mail.added.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u062A\u0645\u062A \u062F\u0639\u0648\u062A\u0643 \u0644\u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({2})\:\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640\r\n\r\n\:\u062A\u0633\u062A\u062E\u062F\u0645 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u0645\u0635\u0627\u062F\u0631 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u064A\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629\r\n\r\n$courselist
 notification.mail.added.self.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n\:\u062A\u0633\u062A\u062E\u062F\u0645 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u0645\u0635\u0627\u062F\u0631 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u064A\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629\r\n\r\n$courselist
 notification.mail.added.self.subject=$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u062A\u0639\u0644\u064A\u0645 \u0623\u0648\u0644\u0627\u062A
 notification.mail.added.subject=$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0628\u0623\u0648\u0644\u0627\u062A
-notification.mail.removed.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({3})\:\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640\r\n\r\n\:\u062A\u0633\u062A\u062E\u062F\u0645 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u0645\u0635\u0627\u062F\u0631 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u064A\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629\r\n\r\n$courselist
+notification.mail.removed.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({2})\:\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640\r\n\r\n\:\u062A\u0633\u062A\u062E\u062F\u0645 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u0645\u0635\u0627\u062F\u0631 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u064A\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629\r\n\r\n$courselist
 notification.mail.removed.self.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n\:\u062A\u0633\u062A\u062E\u062F\u0645 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u0645\u0635\u0627\u062F\u0631 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u064A\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629\r\n\r\n$courselist
 notification.mail.removed.self.subject=\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C. \:$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0628\u0623\u0648\u0644\u0627\u062A
 notification.mail.removed.subject=\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0640\u0631\u0648\u062C. \:$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0628\u0623\u0648\u0644\u0627\u062A
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_bg.properties
index 2035652e3e58cb22bf656b36f8ff3cf4d56aae02..2434afe771c8eb4986a105a0f4e14c4fd55af6be 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_bg.properties
@@ -46,11 +46,11 @@ menu.allgroups.alt=\u041D\u0430\u043F\u0440\u0430\u0432\u0435\u0442\u0435 \u0441
 menu.index=\u041C\u0435\u043D\u0438\u0434\u0436\u043C\u044A\u043D\u0442 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430
 menu.index.alt=\u0410\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0438\u0440\u0430\u0439\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u0433\u0440\u0443\u043F\u0438
 newgroup.title=\u0421\u044A\u0437\u0434\u0430\u0439\u0442\u0435 \u043D\u043E\u0432\u0430 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430
-notification.mail.added.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n \u0412\u0438\u0435 \u0441\u0442\u0435 \u043F\u043E\u043A\u0430\u043D\u0435\u043D\u0438 \u0432 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u043E\u0442 {0} {1} ({3})\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F, \u0441\u0432\u044A\u0440\u0436\u0435\u0442\u0435 \u0441\u0435 \u0441 {0} {1} ({2}). \r\n\r\n\u0423\u0447\u0435\u0431\u043D\u0430\u0442\u0430 \u0433\u0440\u0443\u043F\u0430 \u0441\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430 \u0432 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0438\:\r\n\r\n$courselist
+notification.mail.added.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n \u0412\u0438\u0435 \u0441\u0442\u0435 \u043F\u043E\u043A\u0430\u043D\u0435\u043D\u0438 \u0432 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u043E\u0442 {0} {1} ({2})\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F, \u0441\u0432\u044A\u0440\u0436\u0435\u0442\u0435 \u0441\u0435 \u0441 {0} {1} ({2}). \r\n\r\n\u0423\u0447\u0435\u0431\u043D\u0430\u0442\u0430 \u0433\u0440\u0443\u043F\u0430 \u0441\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430 \u0432 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0438\:\r\n\r\n$courselist
 notification.mail.added.self.body=*** \u0422\u043E\u0432\u0430 \u0432 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0442\u043E\u043A\u0443-\u0449\u043E \u0441\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u0445\u0442\u0435 \u0432 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0423\u0447\u0435\u0431\u043D\u0430\u0442\u0430 \u0433\u0440\u0443\u043F\u0430 \u0449\u0435 \u0431\u044A\u0434\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0430 \u0432 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0438\:\r\n\r\n$courselist
 notification.mail.added.self.subject=\u0423\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 $groupname 
 notification.mail.added.subject=\u0423\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 $groupname 
-notification.mail.removed.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D \u043E\u0442 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u043E\u0442 {0} {1} ({3})\:  \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F \u0441\u0432\u044A\u0440\u0436\u0435\u0442\u0435 \u0441\u0435 \u0441 {0} {1} ({2}).\r\n\r\n\u0422\u0430\u0437\u0438 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u0441\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0448\u0435 \u0432 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0438\:\r\n\r\n$courselist
+notification.mail.removed.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D \u043E\u0442 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u043E\u0442 {0} {1} ({2})\:  \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F \u0441\u0432\u044A\u0440\u0436\u0435\u0442\u0435 \u0441\u0435 \u0441 {0} {1} ({2}).\r\n\r\n\u0422\u0430\u0437\u0438 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u0441\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0448\u0435 \u0432 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0438\:\r\n\r\n$courselist
 notification.mail.removed.self.body=*** \u0422\u043E\u0432\u0430 \u0432 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043C\u043E\u043B\u044F \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0442\u043E\u043A\u0443-\u0449\u043E \u0441\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u0445\u0442\u0435 \u043E\u0442 \u0443\u0447\u0435\u0431\u043D\u0430\u0442\u0430 \u0433\u0440\u0443\u043F\u0430\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0422\u0430\u0437\u0438 \u0443\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u0441\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0448\u0435 \u0432 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0438\:\r\n\r\n$courselist
 notification.mail.removed.self.subject=\u0423\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 $groupname\: \u0412\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D\u0438.
 notification.mail.removed.subject=\u0423\u0447\u0435\u0431\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 $groupname\: \u0412\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D\u0438.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_cs.properties
index 7fe481dc52b8d7768473844f61942634bfb888e0..5bb8d2679ec03ce780f1cbd1ae2eb3e02c947d5d 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_cs.properties
@@ -49,11 +49,11 @@ menu.allgroups.alt=Seznam v\u0161ech studijn\u00EDch skupin
 menu.index=Administrace skupin
 menu.index.alt=Spravovat studijn\u00ED skupiny
 newgroup.title=Vytvo\u0159it novou studijn\u00ED skupinu
-notification.mail.added.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\n byl ste p\u0159i\u0159azen do studijn\u00ED skupiny {0} {1} ({3})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}). \n\nTato studijn\u00ED skupina se pou\u017E\u00EDv\u00E1 v n\u00E1sleduj\u00EDc\u00EDch zdroj\u00EDch\:\n\n$courselist
+notification.mail.added.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\n byl ste p\u0159i\u0159azen do studijn\u00ED skupiny {0} {1} ({2})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}). \n\nTato studijn\u00ED skupina se pou\u017E\u00EDv\u00E1 v n\u00E1sleduj\u00EDc\u00EDch zdroj\u00EDch\:\n\n$courselist
 notification.mail.added.self.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste p\u0159ihl\u00E1\u0161en do studijn\u00ED skupiny\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nTato studijn\u00ED skupina se bude pou\u017E\u00EDvat v n\u00E1sleduj\u00EDc\u00EDch zdroj\u00EDch\:\n\n$courselist
 notification.mail.added.self.subject=Studijn\u00ED skupina OLATu $groupname 
 notification.mail.added.subject=Studijn\u00ED skupiny OLATu $groupname 
-notification.mail.removed.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste odhl\u00E1\u0161en ze studijn\u00ED skupiny {0} {1} ({3})\:  \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte  {0} {1} ({2}).\n\nTato studijn\u00ED skupina se pou\u017E\u00EDv\u00E1 v n\u00E1sleduj\u00EDc\u00EDch zdroj\u00EDch\:\n\n$courselist
+notification.mail.removed.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste odhl\u00E1\u0161en ze studijn\u00ED skupiny {0} {1} ({2})\:  \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte  {0} {1} ({2}).\n\nTato studijn\u00ED skupina se pou\u017E\u00EDv\u00E1 v n\u00E1sleduj\u00EDc\u00EDch zdroj\u00EDch\:\n\n$courselist
 notification.mail.removed.self.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste odhl\u00E1\u0161en ze studijn\u00ED skupiny\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nTato studijn\u00ED skupina se pou\u017E\u00EDvala v n\u00E1sleduj\u00EDc\u00EDch zdroj\u00EDch\:\n\n$courselist
 notification.mail.removed.self.subject=Studijn\u00ED skupina OLATu $groupname\: Byl jste odhl\u00E1\u0161en.
 notification.mail.removed.subject=Studijn\u00ED skupina OLATu $groupname\: Byl jste odhl\u00E1\u0161en.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_da.properties
index b531d8390b279bfce02e2ee4395de8b08ffcd18e..0fa9ea797519056c53ee0320595563f9bd4a3250 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_da.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_da.properties
@@ -43,11 +43,11 @@ menu.allgroups.alt=Vis alle l\u00E6ringsgrupper
 menu.index=Gruppeadministration
 menu.index.alt=Administrer l\u00E6ringsgrupper
 newgroup.title=Opret ny l\u00E6ringsgruppe 
-notification.mail.added.body=*** Dette er en automatisk besked, send ikke svar *** \n\n Du er blevet inviteret til en l\u00E6ringsgruppe af  {0} {1} ({3})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l, kontakt venligst {0} {1} ({2}). \n\nDenne l\u00E6ringsgruppe bruges til f\u00F8lgende l\u00E6ringsressourcer\:\n\n$courselist
+notification.mail.added.body=*** Dette er en automatisk besked, send ikke svar *** \n\n Du er blevet inviteret til en l\u00E6ringsgruppe af  {0} {1} ({2})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l, kontakt venligst {0} {1} ({2}). \n\nDenne l\u00E6ringsgruppe bruges til f\u00F8lgende l\u00E6ringsressourcer\:\n\n$courselist
 notification.mail.added.self.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu er netop blevet tilmeldt en l\u00E6ringsgruppe\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nDenne l\u00E6ringsgruppe bruges til f\u00F8lgende l\u00E6ringsressourcer\:\n\n$courselist
 notification.mail.added.self.subject=OLAT l\u00E6ringsgruppe $groupname 
 notification.mail.added.subject=OLAT l\u00E6ringsgruppe $groupname 
-notification.mail.removed.body=*** Dette er en automatisk besked, send ikke svar *** \n\n Du er blevet fjernet fra en l\u00E6ringsgruppe af  {0} {1} ({3})\:  \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l, kontakt venligst  {0} {1} ({2}).\n\nDenne l\u00E6ringsgruppe bruges til f\u00F8lgende l\u00E6ringsressourcer\:\n\n$courselist
+notification.mail.removed.body=*** Dette er en automatisk besked, send ikke svar *** \n\n Du er blevet fjernet fra en l\u00E6ringsgruppe af  {0} {1} ({2})\:  \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l, kontakt venligst  {0} {1} ({2}).\n\nDenne l\u00E6ringsgruppe bruges til f\u00F8lgende l\u00E6ringsressourcer\:\n\n$courselist
 notification.mail.removed.self.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu er netop blevet udmeldt fra en l\u00E6ringsgruppe \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nDenne l\u00E6ringsgruppe bruges til f\u00F8lgende l\u00E6ringsressourcer\:\n\n$courselist
 notification.mail.removed.self.subject=OLAT l\u00E6ringsgruppe $groupname\: You have been signed out.
 notification.mail.removed.subject=OLAT l\u00E6ringsgruppe $groupname\: You were signed out.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_de.properties
index acbe3e88ff952191b78b6fb95600da7472373d24..0c12124430daf22ddd213743a240c101b5154027 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_de.properties
@@ -91,12 +91,12 @@ module.resource.groups=Lernressourcenverwalter k\u00F6nnen alle Gruppen suchen u
 module.resource.groups.grant=umfassender Gruppenzugriff erlaubt
 module.resource.title=Gruppe - Lernressourcen zuordnen
 newgroup.title=Neue Gruppe erstellen
-notification.mail.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) in eine Gruppe eingeladen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}). \n\nDiese Gruppe wird in folgenden Lernressourcen verwendet\:\n\n$courselist
+notification.mail.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) in eine Gruppe eingeladen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}). \n\nDiese Gruppe wird in folgenden Lernressourcen verwendet\:\n\n$courselist
 notification.mail.added.self.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie haben sich soeben in eine Gruppe eingetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nDiese Gruppe wird in folgenden Lernressourcen verwendet\:\n\n$courselist
 notification.mail.added.self.subject=Gruppe $groupname 
 notification.mail.added.subject=Gruppe $groupname 
 notification.mail.error=Die E-Mail konnte nicht verschickt werden. Bitte informieren Sie den Benutzer pers\u00F6nlich.
-notification.mail.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) aus der Gruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}). \n\nDiese Gruppe wurde in folgenden Lernressourcen verwendet\:\n\n$courselist
+notification.mail.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) aus der Gruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}). \n\nDiese Gruppe wurde in folgenden Lernressourcen verwendet\:\n\n$courselist
 notification.mail.removed.self.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie haben sich soeben aus der Gruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nDiese Gruppe wurde in folgenden Lernressourcen verwendet\:\n\n$courselist
 notification.mail.removed.self.subject=Gruppe $groupname\: Sie wurden ausgetragen.
 notification.mail.removed.subject=Gruppe $groupname\: Sie wurden ausgetragen.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_el.properties
index 8eb7d404ce18d5ef46eaba0481b54bb231fca857..442004eabb82f1ba51ec15efe0be3d99879f2f20 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_el.properties
@@ -47,11 +47,11 @@ menu.allgroups.alt=\u039B\u03AF\u03C3\u03C4\u03B1 \u03CC\u03BB\u03C9\u03BD \u03C
 menu.index=\u0394\u03B9\u03B1\u03C7\u03B5\u03AF\u03C1\u03B9\u03C3\u03B7 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2
 menu.index.alt=\u0394\u03B9\u03B1\u03C7\u03B5\u03AF\u03C1\u03B9\u03C3\u03B7 \u03BF\u03BC\u03AC\u03B4\u03C9\u03BD \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2
 newgroup.title=\u0394\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 \u03BD\u03AD\u03B1\u03C2 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2
-notification.mail.added.body=*** \u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n \u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03C3\u03BA\u03BB\u03B7\u03B8\u03B5\u03AF \u03C3\u03B5 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03B1\u03C0\u03CC {0} {1} ({3})\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}). \n\n\u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B5\u03AF\u03C4\u03B1\u03B9 \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03CC\u03C1\u03BF\u03C5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\:\n\n$courselist
+notification.mail.added.body=*** \u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n \u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03BF\u03C3\u03BA\u03BB\u03B7\u03B8\u03B5\u03AF \u03C3\u03B5 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03B1\u03C0\u03CC {0} {1} ({2})\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}). \n\n\u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B5\u03AF\u03C4\u03B1\u03B9 \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03CC\u03C1\u03BF\u03C5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\:\n\n$courselist
 notification.mail.added.self.body=*** \u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF \u03C3\u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\n\u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03B8\u03B1 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B7\u03B8\u03B5\u03AF \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03CC\u03C1\u03BF\u03C5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\:\n\n$courselist
 notification.mail.added.self.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 $groupname 
 notification.mail.added.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 $groupname 
-notification.mail.removed.body=*** \u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5  *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03B1\u03C0\u03CC {0} {1} ({3})\:  \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\:\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}).\n\n\u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03AD\u03C7\u03B5\u03B9 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B8\u03B5\u03AF \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03CC\u03C1\u03BF\u03C5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\:\n\n$courselist
+notification.mail.removed.body=*** \u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5  *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03B1\u03C0\u03CC {0} {1} ({2})\:  \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\:\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}).\n\n\u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03AD\u03C7\u03B5\u03B9 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B8\u03B5\u03AF \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03CC\u03C1\u03BF\u03C5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\:\n\n$courselist
 notification.mail.removed.self.body=*** \u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\n\u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03AE\u03B8\u03B7\u03BA\u03B5 \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03CC\u03C1\u03BF\u03C5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2\:\n\n$courselist
 notification.mail.removed.self.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 $groupname\: \u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF.
 notification.mail.removed.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 $groupname\: \u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_en.properties
index a61fe68555e0c9c8128ee122001fe0fa7e3f8b3e..858e01a789a5e64d69dd97d74f95ad58e507c8ab 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_en.properties
@@ -91,12 +91,12 @@ module.resource.groups=Learning resource managers can search and assign all grou
 module.resource.groups.grant=full group referencing right granted
 module.resource.title=Group - Resource assignment
 newgroup.title=Create a new group
-notification.mail.added.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were invited to a group by {0} {1} ({3})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions, please contact {0} {1} ({2}). \r\n\r\nThis group is used in the following learning resources\:\r\n\r\n$courselist
+notification.mail.added.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were invited to a group by {0} {1} ({2})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions, please contact {0} {1} ({2}). \r\n\r\nThis group is used in the following learning resources\:\r\n\r\n$courselist
 notification.mail.added.self.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have just signed in to a group\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nThis group will be used in the following learning resources\:\r\n\r\n$courselist
 notification.mail.added.self.subject=Group $groupname 
 notification.mail.added.subject=Group $groupname 
 notification.mail.error=E-Mail could not be sent. Please notify this user personally.
-notification.mail.removed.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were signed out of a group by {0} {1} ({3})\:  \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions, please contact  {0} {1} ({2}).\r\n\r\nThis group was used in the following learning resources\:\r\n\r\n$courselist
+notification.mail.removed.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were signed out of a group by {0} {1} ({2})\:  \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions, please contact  {0} {1} ({2}).\r\n\r\nThis group was used in the following learning resources\:\r\n\r\n$courselist
 notification.mail.removed.self.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have just signed out from the group\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nThis group was used in the following learning resources\:\r\n\r\n$courselist
 notification.mail.removed.self.subject=Group $groupname\: You have just been signed out.
 notification.mail.removed.subject=Group $groupname\: You were signed out.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_es.properties
index e00d0597c91e88f1b6838afa40b5ff724ac3082b..6d431f259d8072989258c43151ec998651d9cccb 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_es.properties
@@ -48,11 +48,11 @@ menu.allgroups.alt=Listar todos los grupos de estudios
 menu.index=Administraci\u00F3n de grupos
 menu.index.alt=Administra los grupos de estudios
 newgroup.title=Crear un nuevo grupo de estudios
-notification.mail.added.body=*** Esto es un mensaje generado autom\u00E1ticamente, no contestar *** \n\n Has sido invitado a un grupo de estudios por {0} {1} ({3})\: \n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nSi tienes alguna pregunta, por favor contacta con {0} {1} ({2}). \n\nEste grupo de estudios se utiliza en los recursos did\u00E1cticos siguientes\:\n\n$courselist
+notification.mail.added.body=*** Esto es un mensaje generado autom\u00E1ticamente, no contestar *** \n\n Has sido invitado a un grupo de estudios por {0} {1} ({2})\: \n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nSi tienes alguna pregunta, por favor contacta con {0} {1} ({2}). \n\nEste grupo de estudios se utiliza en los recursos did\u00E1cticos siguientes\:\n\n$courselist
 notification.mail.added.self.body=*** Esto es un mensaje generado autom\u00E1ticamente, no contestar *** \n\nTe has registrado en el grupo de estudios\: \n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nEste grupo de estudios se utiliza en los recursos did\u00E1cticos siguientes\:\n\n$courselist
 notification.mail.added.self.subject=Grupo de estudios OLAT $groupname
 notification.mail.added.subject=Grupo de estudios OLAT $groupname
-notification.mail.removed.body=*** Esto es un mensaje generado autom\u00E1ticamente, no contestar *** \n\nHas sido sacado del grupo de estudios por {0} {1} ({3})\: \n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nSi tienes alguna pregunta, por favor contacta con {0} {1} ({2}).\n\nEste grupo de estudios se utiliza en los recursos did\u00E1cticos siguientes\:\n\n$courselist
+notification.mail.removed.body=*** Esto es un mensaje generado autom\u00E1ticamente, no contestar *** \n\nHas sido sacado del grupo de estudios por {0} {1} ({2})\: \n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nSi tienes alguna pregunta, por favor contacta con {0} {1} ({2}).\n\nEste grupo de estudios se utiliza en los recursos did\u00E1cticos siguientes\:\n\n$courselist
 notification.mail.removed.self.body=*** Esto es un mensaje generado autom\u00E1ticamente, no contestar *** \n\nTe has salido del grupo de estudios\: \n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nEste grupo de estudios se utiliza en los recursos did\u00E1cticos siguientes\:\n\n$courselist
 notification.mail.removed.self.subject=Grupo de estudios OLAT $groupname\: Te has salido del grupo.
 notification.mail.removed.subject=Grupo de estudios OLAT $groupname\: Has sido sacado del grupo.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fa.properties
index 49840569485ff1dde87e3816dd54fc929f4f877d..faa5ebc30c463910504a744cb0136a6467795ac2 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fa.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fa.properties
@@ -35,11 +35,11 @@ menu.allgroups.alt=List all learning groups
 menu.index=Group management
 menu.index.alt=Administer learning groups
 newgroup.title=Create new learning group
-notification.mail.added.body=*** This is an automated message, do not reply *** \n\n You were invited to a learning group by {0} {1} ({3})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions, please contact {0} {1} ({2}). \n\nThis learning group is used in the following learning resources\:\n\n$courselist
+notification.mail.added.body=*** This is an automated message, do not reply *** \n\n You were invited to a learning group by {0} {1} ({2})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions, please contact {0} {1} ({2}). \n\nThis learning group is used in the following learning resources\:\n\n$courselist
 notification.mail.added.self.body=*** This is an automated message, do not reply *** \n\nYou have just signed into a learning group\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nThis learning group will be used in the following learning resources\:\n\n$courselist
 notification.mail.added.self.subject=OLAT learning group $groupname 
 notification.mail.added.subject=OLAT learning group $groupname 
-notification.mail.removed.body=*** This is an automated message, do not reply *** \n\nYou were signed out of a learning group by {0} {1} ({3})\:  \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions, please contact  {0} {1} ({2}).\n\nThis learning group was used in the following learning resources\:\n\n$courselist
+notification.mail.removed.body=*** This is an automated message, do not reply *** \n\nYou were signed out of a learning group by {0} {1} ({2})\:  \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions, please contact  {0} {1} ({2}).\n\nThis learning group was used in the following learning resources\:\n\n$courselist
 notification.mail.removed.self.body=*** This is an automated message, do not reply *** \n\nYou have just signed out from the learning group\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nThis learning group was used in the following learning resources\:\n\n$courselist
 notification.mail.removed.self.subject=OLAT learning group $groupname\: You have been signed out.
 notification.mail.removed.subject=OLAT learning group $groupname\: You were signed out.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fr.properties
index c5a05c57c874d05c7f7a22704379a10367714f76..433f0e2210257d89476e6ecfb8f89820854dcafc 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_fr.properties
@@ -69,12 +69,12 @@ module.admin.allow.create=Autoris\u00E9 \u00E0 cr\u00E9er un groupe
 module.admin.desc=D\u00E9finissez ci-dessus qui a le droit de cr\u00E9er un groupe
 module.admin.title=Module groupes
 newgroup.title=Cr\u00E9er un nouveau groupe d'\u00E9tude 
-notification.mail.added.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message. *** \r\n\r\nVous avez \u00E9t\u00E9 invit\u00E9(e) par {0} {1} ({3}) dans un groupe d'\u00E9tude \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter {0} {1} ({2}). \r\n\r\nCe groupe d'\u00E9tude est utilis\u00E9 pour les ressources didactiques suivantes \: \r\n\r\n$courselist
+notification.mail.added.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message. *** \r\n\r\nVous avez \u00E9t\u00E9 invit\u00E9(e) par {0} {1} ({2}) dans un groupe d'\u00E9tude \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter {0} {1} ({2}). \r\n\r\nCe groupe d'\u00E9tude est utilis\u00E9 pour les ressources didactiques suivantes \: \r\n\r\n$courselist
 notification.mail.added.self.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\nVous vous \u00EAtes inscrit(e) dans un groupe d'\u00E9tude\: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nCe groupe d'\u00E9tude est utilis\u00E9 pour les ressources didactiques suivantes\:\r\n\r\n$courselist
 notification.mail.added.self.subject=Groupe d'\u00E9tude OLAT $groupname
 notification.mail.added.subject=Groupe d'\u00E9tude OLAT $groupname
 notification.mail.error=Le courrier n'a pas pu \u00EAtre envoy\u00E9. Pri\u00E8re d'informer l'utilisateur personnellement.
-notification.mail.removed.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\nVous avez \u00E9t\u00E9 d\u00E9sinscrit(e) par {0} {1} ({3}) du groupe d'\u00E9tude \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter svp {0} {1} ({2}). \r\n\r\nCe groupe d'\u00E9tude est utilis\u00E9 pour les ressources didactiques suivantes \: \r\n\r\n$courselist
+notification.mail.removed.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\nVous avez \u00E9t\u00E9 d\u00E9sinscrit(e) par {0} {1} ({2}) du groupe d'\u00E9tude \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter svp {0} {1} ({2}). \r\n\r\nCe groupe d'\u00E9tude est utilis\u00E9 pour les ressources didactiques suivantes \: \r\n\r\n$courselist
 notification.mail.removed.self.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\nVous vous \u00EAtes d\u00E9sinscrit(e) du groupe d'\u00E9tude\: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nCe groupe d'\u00E9tude est utilis\u00E9 pour les ressources didactiques suivantes\:\r\n\r\n$courselist
 notification.mail.removed.self.subject=Groupe d'\u00E9tude OLAT $groupname\: Vous avez \u00E9t\u00E9 d\u00E9sinscrit-e.
 notification.mail.removed.subject=Groupe d'\u00E9tude OLAT $groupname \: vous avez \u00E9t\u00E9 d\u00E9sinscrit(e).
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_it.properties
index bd228e81471adae28eac9a2f895c99389696a468..3663fe8e1d88c19c0a8e37a18c0fdae71cc41d60 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_it.properties
@@ -69,12 +69,12 @@ module.admin.allow.create=Pu\u00F2 creare il gruppo
 module.admin.desc=Specificare chi pu\u00F2 creare gruppi.
 module.admin.title=Gestione dei gruppi
 newgroup.title=Creazione di un nuovo gruppo di studio.
-notification.mail.added.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. *** \n\n\u00C8 appena stata/o invitata/o da {0} {1} ({3}) in un gruppo di studio\: \n\nNome del gruppo\: $groupname\nDescrizione\: $groupdescription\n\nPer qualsiasi questione contatti {0} {1} ({2}), p.f. \n\nQuesto gruppo di studio viene utilizzato nelle risorse didattiche seguenti\:\n\n$courselist
+notification.mail.added.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. *** \n\n\u00C8 appena stata/o invitata/o da {0} {1} ({2}) in un gruppo di studio\: \n\nNome del gruppo\: $groupname\nDescrizione\: $groupdescription\n\nPer qualsiasi questione contatti {0} {1} ({2}), p.f. \n\nQuesto gruppo di studio viene utilizzato nelle risorse didattiche seguenti\:\n\n$courselist
 notification.mail.added.self.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. *** \n\nSi \u00E8 appena iscritta/o in un gruppo di studio\: \n\nNome del gruppo\: $groupname\nDescrizione\: $groupdescription\n\nQuesto gruppo di studio viene utilizzato nelle risorse didattiche seguenti\:\n\n$courselist
 notification.mail.added.self.subject=Gruppo di studio OLAT $groupname
 notification.mail.added.subject=Gruppo di studio OLAT $groupname
 notification.mail.error=Non \u00E8 stato possibile inviare la e-mail. Informi l'utente personalmente, p.f.
-notification.mail.removed.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. *** \r\n\r\n\u00C8 stata/o disiscritta/o da {0} {1} ({3}) da un gruppo di studio\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nPer qualsiasi questione contatti {0} {1} ({2}), p.f. \r\n\r\nQuesto gruppo di studio \u00E8 stato utilizzato nelle risorse didattiche seguenti\:\r\n\r\n$courselist
+notification.mail.removed.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. *** \r\n\r\n\u00C8 stata/o disiscritta/o da {0} {1} ({2}) da un gruppo di studio\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nPer qualsiasi questione contatti {0} {1} ({2}), p.f. \r\n\r\nQuesto gruppo di studio \u00E8 stato utilizzato nelle risorse didattiche seguenti\:\r\n\r\n$courselist
 notification.mail.removed.self.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. *** \n\nSi \u00E8 appena disiscritta/o da un gruppo di studio\: \n\nNome del gruppo\: $groupname\nDescrizione\: $groupdescription\n\nQuesto gruppo di studio \u00E8 stato utilizzato nelle risorse didattiche seguenti\:\n\n$courselist
 notification.mail.removed.self.subject=Gruppo di studio OLAT $groupname\: si \u00E8 disiscritta/o.
 notification.mail.removed.subject=Gruppo di studio OLAT $groupname\: \u00E8 stata/o disiscritta/o.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_lt.properties
index dbffea76c905e20c5673b128efb37055935d43cd..fab5af2cc94f46ab40362b9ac51767b0f9d2c456 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_lt.properties
@@ -35,11 +35,11 @@ menu.allgroups.alt=Pateikti vis\u0105 mokymosi grupi\u0173 s\u0105ra\u0161\u0105
 menu.index=Grup\u0117s valdymas
 menu.index.alt=Valdyti mokymosi grupes
 newgroup.title=Sukurti nauj\u0105 mokymosi grup\u0119
-notification.mail.added.body=*** \u0160i \u017Einut\u0117 yra automatin\u0117, neatsakykite. *** \n\n J\u016Bs buvote pakviestas \u012F mokymosi grup\u0119 prie  {0} {1} ({3})\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJeigu turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}). \n\n\u0160i mokymosi grup\u0117 yra naudojama kituose mokymosi resursuose\:\n\n$courselist
+notification.mail.added.body=*** \u0160i \u017Einut\u0117 yra automatin\u0117, neatsakykite. *** \n\n J\u016Bs buvote pakviestas \u012F mokymosi grup\u0119 prie  {0} {1} ({2})\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJeigu turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}). \n\n\u0160i mokymosi grup\u0117 yra naudojama kituose mokymosi resursuose\:\n\n$courselist
 notification.mail.added.self.body=** \u0160i \u017Einut\u0117 automatin\u0117, neatsakykite. *** \n\nJ\u016Bs k\u0105 tik prisijung\u0117te \u012F mokymosi grup\u0119\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\n\u0160i mokymosi grup\u0117 bus naudojama kituose mokymosi resursuose\:\n\n$courselist
 notification.mail.added.self.subject=OLAT mokymosi grup\u0117 $groupname
 notification.mail.added.subject=OLAT mokymosi grup\u0117 $groupname
-notification.mail.removed.body=*** \u0160i \u017Einut\u0117 automatin\u0117, neatsakykite *** \n\nJ\u016Bs atsijung\u0117te i\u0161 mokymosi grup\u0117s prie {0} {1} ({3})\:  \n\nGrup\u0117s pavadinimas\:\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJeigu turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}).\n\n\u0160i mokymosi grup\u0117 buvo naudojama kituose mokymosi resursuose\:\n\n$courselist
+notification.mail.removed.body=*** \u0160i \u017Einut\u0117 automatin\u0117, neatsakykite *** \n\nJ\u016Bs atsijung\u0117te i\u0161 mokymosi grup\u0117s prie {0} {1} ({2})\:  \n\nGrup\u0117s pavadinimas\:\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJeigu turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}).\n\n\u0160i mokymosi grup\u0117 buvo naudojama kituose mokymosi resursuose\:\n\n$courselist
 notification.mail.removed.self.body=*** \u0160i \u017Einut\u0117 automatin\u0117, neatsakykite. *** \nJ\u016Bs k\u0105 tik  atsijung\u0117te nuo mokymosi grup\u0117s\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\n\u0160i mokymosi grup\u0117 buvo naudojama kituose mokymosi resursuose\:\n\n$courselist
 notification.mail.removed.self.subject=OLAT mokymosi grup\u0117 $groupname\: J\u016Bs buvote atjungtas.
 notification.mail.removed.subject=OLAT mokymosi grup\u0117 $groupname\: J\u016Bs buvote atjungtas.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_nl_NL.properties
index 447ba6cb05e5febdd782d1610627d1756982c725..9c9e91e9e89a1b2d9408972960576e2b5121f6fa 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_nl_NL.properties
@@ -46,11 +46,11 @@ menu.allgroups.alt=Alle leergroepen lijsten
 menu.index=Groepsmanagement
 menu.index.alt=Leergroepen administreren
 newgroup.title=Een nieuwe leergroep aanmaken
-notification.mail.added.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden. *** \r\n\r\nU werd uitgenodigd voor een leergroep door {0} {1} ({3})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen, gelieve contact op te nemen met {0} {1} ({2}). \r\n\r\nDeze leergroep wordt gebruikt in de volgende leermiddelen\:\r\n\r\n$courselist
+notification.mail.added.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden. *** \r\n\r\nU werd uitgenodigd voor een leergroep door {0} {1} ({2})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen, gelieve contact op te nemen met {0} {1} ({2}). \r\n\r\nDeze leergroep wordt gebruikt in de volgende leermiddelen\:\r\n\r\n$courselist
 notification.mail.added.self.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden. *** \r\n\r\nU heeft u net voor een leergroep ingeschreven\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription \r\n\r\nDeze leergroep zal gebruikt worden in de volgende leermiddelen\:\r\n\r\n$courselist
 notification.mail.added.self.subject=OLAT leergroep $groupname
 notification.mail.added.subject=OLAT leergroep $groupname
-notification.mail.removed.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden. *** \r\n\r\nU werd uitgeschreven uit een leergroep door {0} {1} ({3})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen, gelieve contact op te nemen met {0} {1} ({2}). \r\n\r\nDeze leergroep werd gebruikt in de volgende leermiddelen\:\r\n\r\n$courselist
+notification.mail.removed.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden. *** \r\n\r\nU werd uitgeschreven uit een leergroep door {0} {1} ({2})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen, gelieve contact op te nemen met {0} {1} ({2}). \r\n\r\nDeze leergroep werd gebruikt in de volgende leermiddelen\:\r\n\r\n$courselist
 notification.mail.removed.self.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden. *** \r\n\r\nU heeft zich net uitgeschreven van de leergroep\:\r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen, gelieve contact op te nemen met {0} {1} ({2}). \r\n\r\nDeze leergroep werd gebruikt in de volgende leermiddelen\:\r\n\r\n$courselist
 notification.mail.removed.self.subject=OLAT leergroep $groupname\: u werd net uitgeschreven.
 notification.mail.removed.subject=OLAT leergroep $groupname\: U werd uitgeschreven.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pl.properties
index 2414e1e11ae6ff81c47f31a10b778b1bfacea636..960045242c21194f147c0df4747fb574e1384840 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pl.properties
@@ -80,12 +80,12 @@ module.admin.desc=Sprecyzuj, kto mo\u017Ce tworzy\u0107 grupy
 module.admin.title=Zarz\u0105dzanie grupami
 module.privacy.title=Ochrona danych
 newgroup.title=Utw\u00F3rz now\u0105 grup\u0119 edukacyjn\u0105
-notification.mail.added.body=*** Wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nZosta\u0142e\u015B zaproszony do grupy edukacyjnej przez\: {0} {1} ({3})\: \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nW razie pyta\u0144 skontaktuj si\u0119 z {0} {1} ({2}). \n\nTa grupa edukacyjna jest u\u017Cywana w nast\u0119puj\u0105cych zasobach edukacyjnych\:\n\n$courselist
+notification.mail.added.body=*** Wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nZosta\u0142e\u015B zaproszony do grupy edukacyjnej przez\: {0} {1} ({2})\: \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nW razie pyta\u0144 skontaktuj si\u0119 z {0} {1} ({2}). \n\nTa grupa edukacyjna jest u\u017Cywana w nast\u0119puj\u0105cych zasobach edukacyjnych\:\n\n$courselist
 notification.mail.added.self.body=*** Wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nW\u0142a\u015Bnie zapisa\u0142e\u015B si\u0119 do grupy edukacyjnej\: \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nTa grupa edukacyjna b\u0119dzie u\u017Cywana w nast\u0119puj\u0105cych zasobach edukacyjnych\:\n\n$courselist
 notification.mail.added.self.subject=Grupa edukacyjna OLAT\: $groupname 
 notification.mail.added.subject=Grupa edukacyjna OLAT\: $groupname 
 notification.mail.error=Nie uda\u0142o si\u0119 wys\u0142a\u0107 wiadomo\u015Bci e-mail. Poinformuj tego u\u017Cytkownika osobi\u015Bcie.
-notification.mail.removed.body=*** Wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nZosta\u0142e\u015B wypisany z grupy edukacyjnej przez\: {0} {1} ({3})\:  \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nW razie pyta\u0144 skontaktuj si\u0119 z{0} {1} ({2}).\n\nTa grupa edukacyjna jest u\u017Cywana w nast\u0119puj\u0105cych zasobach edukacyjnych\:\n\n$courselist
+notification.mail.removed.body=*** Wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nZosta\u0142e\u015B wypisany z grupy edukacyjnej przez\: {0} {1} ({2})\:  \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nW razie pyta\u0144 skontaktuj si\u0119 z{0} {1} ({2}).\n\nTa grupa edukacyjna jest u\u017Cywana w nast\u0119puj\u0105cych zasobach edukacyjnych\:\n\n$courselist
 notification.mail.removed.self.body=*** Wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nWypisa\u0142e\u015B si\u0119 z grupy edukacyjnej\: \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nTa grupa edukacyjna by\u0142a u\u017Cywana w nast\u0119puj\u0105cych zasobach edukacyjnych\:\n\n$courselist
 notification.mail.removed.self.subject=Grupa edukacyjna OLAT\: $groupname - Zosta\u0142e\u015B wypisany.
 notification.mail.removed.subject=Grupa edukacyjna OLAT\: $groupname - Zosta\u0142e\u015B wypisany.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_BR.properties
index 1fd7bf48c5f38bb60df571a181962ac93a357dbb..7deebb96968ac80ddc626e2de28625b4fff1af41 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_BR.properties
@@ -69,12 +69,12 @@ module.admin.allow.create=Permitir criar grupo
 module.admin.desc=Especifique aqui quem pode criar grupos.
 module.admin.title=Gest\u00E3o de grupos
 newgroup.title=Criar novo grupo de estudo
-notification.mail.added.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de estudo pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar {0} {1} ({2}). \n\nEste grupo de estudo \u00E9 usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
+notification.mail.added.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de estudo pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar {0} {1} ({2}). \n\nEste grupo de estudo \u00E9 usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
 notification.mail.added.self.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA acabou de entrar em um grupo de estudo\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nEste grupo de estudo ser\u00E1 usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist 
 notification.mail.added.self.subject=Grupo de estudo OLAT $groupname
 notification.mail.added.subject=Grupo de estudo OLAT $groupname 
 notification.mail.error=O e-mail n\u00E3o p\u00F4de ser enviado. Favor notificar este usu\u00E1rio pessoalmente. 
-notification.mail.removed.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA saiu de um grupo de estudo pelo {0} {1} ({3})\:  \n\nNome do grupo\:\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar  {0} {1} ({2}).\n\nEste grupo de estudo foi usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
+notification.mail.removed.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA saiu de um grupo de estudo pelo {0} {1} ({2})\:  \n\nNome do grupo\:\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar  {0} {1} ({2}).\n\nEste grupo de estudo foi usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
 notification.mail.removed.self.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA acabou de sair de um grupo de estudo\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nEste grupo de estudo foi usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
 notification.mail.removed.self.subject=Grupo de estudo OLAT $groupname\: Voc\u00EA foi retirado.
 notification.mail.removed.subject=Grupo de estudo OLAT $groupname\: Voc\u00EA saiu.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_PT.properties
index f64189e412c6e2ff00242d4c3d10e70e8399c558..290c010f5e3680f82ce3acbef0ae1390756929cc 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_pt_PT.properties
@@ -41,11 +41,11 @@ menu.allgroups.alt=Listar todos grupos de estudo
 menu.index=Grupo gestor
 menu.index.alt=Administrar grupos de estudo
 newgroup.title=Criar novo grupo de estudo
-notification.mail.added.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de estudo pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar {0} {1} ({2}). \n\nEste grupo de estudo \u00E9 usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
+notification.mail.added.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de estudo pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar {0} {1} ({2}). \n\nEste grupo de estudo \u00E9 usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
 notification.mail.added.self.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA acabou de entrar em um grupo de estudo\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nEste grupo de estudo ser\u00E1 usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist 
 notification.mail.added.self.subject=Grupo de estudo OLAT $groupname
 notification.mail.added.subject=Grupo de estudo OLAT $groupname 
-notification.mail.removed.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA saiu de um grupo de estudo pelo {0} {1} ({3})\:  \n\nNome do grupo\:\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar  {0} {1} ({2}).\n\nEste grupo de estudo foi usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
+notification.mail.removed.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA saiu de um grupo de estudo pelo {0} {1} ({2})\:  \n\nNome do grupo\:\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es, favor contactar  {0} {1} ({2}).\n\nEste grupo de estudo foi usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
 notification.mail.removed.self.body=*** Esta \u00E9 uma mensagem automatica, n\u00E3o responder *** \n\nVoc\u00EA acabou de sair de um grupo de estudo\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nEste grupo de estudo foi usado nos seguintes recursos did\u00E1ticos\:\n\n$courselist
 notification.mail.removed.self.subject=Grupo de estudo OLAT $groupname\: Voc\u00EA foi retirado.
 notification.mail.removed.subject=Grupo de estudo OLAT $groupname\: Voc\u00EA saiu.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ru.properties
index 2b67a896f17f683e235a1e7885223e417d70d62a..c05c03eaa87d6448f3e69f1124c0bf8a9d9179a6 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_ru.properties
@@ -47,11 +47,11 @@ menu.allgroups.alt=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0432\u0441
 menu.index=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0433\u0440\u0443\u043F\u043F\u043E\u0439
 menu.index.alt=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0433\u0440\u0443\u043F\u043F\u043E\u0439
 newgroup.title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F 
-notification.mail.added.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u043F\u0440\u0438\u0433\u043B\u0430\u0448\u0435\u043D\u044B {0} {1} ({3}) \u0432 \u0433\u0440\u0443\u043F\u043F\u0443 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430,  \u043A {0} {1} ({2}). \n\n\u042D\u0442\u0430 \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0443\u0447\u0435\u0431\u043D\u044B\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430\u0445\:\n\n$courselist
+notification.mail.added.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u043F\u0440\u0438\u0433\u043B\u0430\u0448\u0435\u043D\u044B {0} {1} ({2}) \u0432 \u0433\u0440\u0443\u043F\u043F\u0443 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430,  \u043A {0} {1} ({2}). \n\n\u042D\u0442\u0430 \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0443\u0447\u0435\u0431\u043D\u044B\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430\u0445\:\n\n$courselist
 notification.mail.added.self.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435*** \n\n \u0412\u044B \u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0442\u043E \u0437\u0430\u043F\u0438\u0441\u0430\u043B\u0438\u0441\u044C \u0432 \u0433\u0440\u0443\u043F\u043F\u0443 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u042D\u0442\u0430 \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0443\u0447\u0435\u0431\u043D\u044B\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430\u0445\:\n\n$courselist
 notification.mail.added.self.subject=OLAT \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F $groupname 
 notification.mail.added.subject=OLAT \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F $groupname 
-notification.mail.removed.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B {0} {1} ({3}) \u0438\u0437 \u0433\u0440\u0443\u043F\u043F\u044B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430,  \u043A {0} {1} ({2}). \n\n\u042D\u0442\u0430 \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0443\u0447\u0435\u0431\u043D\u044B\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430\u0445\:\n\n$courselist
+notification.mail.removed.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B {0} {1} ({2}) \u0438\u0437 \u0433\u0440\u0443\u043F\u043F\u044B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430,  \u043A {0} {1} ({2}). \n\n\u042D\u0442\u0430 \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0443\u0447\u0435\u0431\u043D\u044B\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430\u0445\:\n\n$courselist
 notification.mail.removed.self.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n \u0412\u044B \u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0442\u043E \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u043B\u0438 \u0441\u0435\u0431\u044F \u0438\u0437 \u0433\u0440\u0443\u043F\u043F\u044B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u042D\u0442\u0430 \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0432 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0443\u0447\u0435\u0431\u043D\u044B\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u0430\u0445\:\n\n$courselist
 notification.mail.removed.self.subject=OLAT \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F $groupname\: \u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B \u0438\u0437 \u0433\u0440\u0443\u043F\u043F\u044B.
 notification.mail.removed.subject=OLAT \u0433\u0440\u0443\u043F\u043F\u0430 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F $groupname\: \u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B \u0438\u0437 \u0433\u0440\u0443\u043F\u043F\u044B.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_sq.properties
index 9f578be6f89aebe8050dce6aef8421d0cd303f34..0f13de252a4ba59f5496f13ff7b9968e32b94415 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_sq.properties
@@ -45,11 +45,11 @@ menu.allgroups.alt=Lista e t\u00EB gjith\u00EB grupeve t\u00EB m\u00EBsimit
 menu.index=Drejtimi i grupeve
 menu.index.alt=Administro grupet e m\u00EBsimit
 newgroup.title=Krijo nj\u00EB grup t\u00EB ri t\u00EB m\u00EBsimit
-notification.mail.added.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos iu p\u00EBrgjigj *** \n\n Ju jeni ftuar nj\u00EB nj\u00EB grup m\u00EBsimi nga {0} {1} ({3})\: \n\nEmri i grupi\: $groupname\nP\u00EBrshkrimi\: $groupdescription\n\nP\u00EBr pyeje, ju lutem kontaktoni {0} {1} ({2}). \n\nKy grup m\u00EBsimi p\u00EBrdoret n\u00EB resurset vijuese t\u00EB m\u00EBsimit\:\n\n$courselist
+notification.mail.added.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos iu p\u00EBrgjigj *** \n\n Ju jeni ftuar nj\u00EB nj\u00EB grup m\u00EBsimi nga {0} {1} ({2})\: \n\nEmri i grupi\: $groupname\nP\u00EBrshkrimi\: $groupdescription\n\nP\u00EBr pyeje, ju lutem kontaktoni {0} {1} ({2}). \n\nKy grup m\u00EBsimi p\u00EBrdoret n\u00EB resurset vijuese t\u00EB m\u00EBsimit\:\n\n$courselist
 notification.mail.added.self.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos iu p\u00EBrgjigj *** \n\nJu jeni ky\u00E7ur n\u00EB nj\u00EB grup m\u00EBsimi\: \n\nEmri i grupi\: $groupname\nP\u00EBrshkrimi\: $groupdescription\n\nKy grup m\u00EBsimi p\u00EBrdoret n\u00EB resurset vijuese t\u00EB m\u00EBsimit\:\n\n$courselist
 notification.mail.added.self.subject=OLAT grupi i m\u00EBsimit$groupname 
 notification.mail.added.subject=OLAT grupi i m\u00EBsimit$groupname 
-notification.mail.removed.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos iu p\u00EBrgjigj *** \n\nJu jeni shk\u00EBputuar prej nj\u00EB grup m\u00EBsimi nga {0} {1} ({3})\:  \n\nEmri i grupi\: $groupname\nP\u00EBrshkrimi\: $groupdescription\n\nP\u00EBr pyetje, ju lutem kontaktoni {0} {1} ({2}).\n\nKy grup m\u00EBsimi p\u00EBrdoret n\u00EB resurset vijuese t\u00EB m\u00EBsimit\:\n\n$courselist
+notification.mail.removed.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos iu p\u00EBrgjigj *** \n\nJu jeni shk\u00EBputuar prej nj\u00EB grup m\u00EBsimi nga {0} {1} ({2})\:  \n\nEmri i grupi\: $groupname\nP\u00EBrshkrimi\: $groupdescription\n\nP\u00EBr pyetje, ju lutem kontaktoni {0} {1} ({2}).\n\nKy grup m\u00EBsimi p\u00EBrdoret n\u00EB resurset vijuese t\u00EB m\u00EBsimit\:\n\n$courselist
 notification.mail.removed.self.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos iu p\u00EBrgjigj *** \n\nJu sapo jeni shk\u00EBputuar prej nj\u00EB grup m\u00EBsimi nga\: \n\nEmri i grupi\: $groupname\nP\u00EBrshkrimi\: $groupdescription\n\nKy grup m\u00EBsimi p\u00EBrdoret n\u00EB resurset vijuese t\u00EB m\u00EBsimit\:\n\n$courselist
 notification.mail.removed.self.subject=OLAT grup m\u00EBsimi $groupname\: Ju jeni shk\u00EBputur.
 notification.mail.removed.subject=OLAT grup m\u00EBsimi $groupname\: Ju jeni shk\u00EBputur.
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_CN.properties
index 014a93f472c6dd52d24d39046b4f8f4e3a920303..450c38eaae742ea6dcbb7ae4b1adbc06775611a0 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_CN.properties
@@ -46,11 +46,11 @@ menu.allgroups.alt=\u6240\u6709\u5B66\u4E60\u7EC4\u5217\u8868
 menu.index=\u7FA4\u7EC4\u7BA1\u7406
 menu.index.alt=\u7BA1\u7406\u5B66\u4E60\u7EC4
 newgroup.title=\u521B\u5EFA\u65B0\u5B66\u4E60\u7EC4
-notification.mail.added.body=*** \u672C\u4FE1\u606F\u4E3A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u52FF\u56DE\u590D *** \n\n \u4F60\u88AB{2} {3} ({5})\u9080\u8BF7\u52A0\u5165\u5B66\u4E60\u7EC4\: \n\n\u7EC4\u540D\:{0}\n\u8BF4\u660E\:{1}\n\n\u6709\u95EE\u9898\u8BF7\u8054\u7CFB{2} {3} ({4}). \n\n\u8BE5\u5B66\u4E60\u7EC4\u5C06\u4F1A\u4F7F\u7528\u4EE5\u4E0B\u5B66\u4E60\u8D44\u6E90\:\n\n{6}
+notification.mail.added.body=*** \u672C\u4FE1\u606F\u4E3A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u52FF\u56DE\u590D *** \n\n \u4F60\u88AB{2} {3} ({2})\u9080\u8BF7\u52A0\u5165\u5B66\u4E60\u7EC4\: \n\n\u7EC4\u540D\:{0}\n\u8BF4\u660E\:{1}\n\n\u6709\u95EE\u9898\u8BF7\u8054\u7CFB{2} {3} ({2}). \n\n\u8BE5\u5B66\u4E60\u7EC4\u5C06\u4F1A\u4F7F\u7528\u4EE5\u4E0B\u5B66\u4E60\u8D44\u6E90\:\n\n{6}
 notification.mail.added.self.body=*** \u672C\u4FE1\u606F\u4E3A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u52FF\u56DE\u590D *** \n\n\u4F60\u5DF2\u7ECF\u52A0\u5165\u4E00\u4E2A\u5B66\u4E60\u7EC4\uFF1A \n\n\u7EC4\u540D\: {0}\\n\u8BF4\u660E\: {1}\n\n\u8BE5\u5B66\u4E60\u7EC4\u5C06\u4F7F\u7528\u4EE5\u4E0B\u5B66\u4E60\u8D44\u6E90\:\n\n{6}
 notification.mail.added.self.subject=OLAT\u5B66\u4E60\u7EC4{0}
 notification.mail.added.subject=OLAT\u5B66\u4E60\u7EC4{0}
-notification.mail.removed.body=*** \u672C\u4FE1\u606F\u4E3A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u52FF\u56DE\u590D *** \n\n\u4F60\u88AB{2} {3} ({5})\u9000\u51FA\u4E00\u4E2A\u5B66\u4E60\u7EC4\uFF1A \n\n\u7EC4\u540D\: {0}\n\u8BF4\u660E\: {1}\n\n\u82E5\u6709\u95EE\u9898\uFF0C\u8BF7\u8054\u7CFB{2} {3} ({4}).\n\n\u8BE5\u5B66\u4E60\u7EC4\u5C06\u4F1A\u4F7F\u7528\u4EE5\u4E0B\u5B66\u4E60\u8D44\u6E90\:\n\n{6}
+notification.mail.removed.body=*** \u672C\u4FE1\u606F\u4E3A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u52FF\u56DE\u590D *** \n\n\u4F60\u88AB{2} {3} ({2})\u9000\u51FA\u4E00\u4E2A\u5B66\u4E60\u7EC4\uFF1A \n\n\u7EC4\u540D\: {0}\n\u8BF4\u660E\: {1}\n\n\u82E5\u6709\u95EE\u9898\uFF0C\u8BF7\u8054\u7CFB{2} {3} ({4}).\n\n\u8BE5\u5B66\u4E60\u7EC4\u5C06\u4F1A\u4F7F\u7528\u4EE5\u4E0B\u5B66\u4E60\u8D44\u6E90\:\n\n{6}
 notification.mail.removed.self.body=***  \u672C\u4FE1\u606F\u4E3A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u52FF\u56DE\u590D *** \n\n\u4F60\u5DF2\u4ECE\u5B66\u4E60\u7EC4\u6CE8\u9500\uFF1A \n\n\u7EC4\u540D\: {0}\n\u8BF4\u660E\: {1}\n\n\u8BE5\u5B66\u4E60\u7EC4\u5C06\u4F1A\u4F7F\u7528\u4EE5\u4E0B\u5B66\u4E60\u8D44\u6E90\:\n\n{6}
 notification.mail.removed.self.subject=OLAT\u5B66\u4E60\u7EC4{0}\: \u4F60\u5DF2\u7ECF\u88AB\u6CE8\u9500\u3002
 notification.mail.removed.subject=OLAT\u5B66\u4E60\u7EC4{0}\:\u4F60\u5DF2\u7ECF\u88AB\u6CE8\u9500\u3002
diff --git a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_TW.properties
index f143f87da5d9340aa4a1b72e4b551a782367a451..b2afe490fedad32e6869206e9636f52d8f5e1fd1 100644
--- a/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/group/ui/_i18n/LocalStrings_zh_TW.properties
@@ -45,11 +45,11 @@ menu.allgroups.alt=\u5217\u51FA\u6240\u6709\u5B78\u7FD2\u7FA4\u7D44
 menu.index=\u7FA4\u7D44\u7BA1\u7406
 menu.index.alt=\u7BA1\u7406\u5B78\u7FD2\u7FA4\u7D44
 newgroup.title=\u5EFA\u7ACB\u4E00\u500B\u65B0\u7684\u5B78\u7FD2\u7FA4\u7D44
-notification.mail.added.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u7522\u751F\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u88AB {0} {1} ({3})\u9080\u8ACB\u52A0\u5165\u4E00\u500B\u5B78\u7FD2\u7FA4\u7D44\uFF1A\n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A$groupdescription\n\n\u5982\u6709\u554F\u984C\uFF0C\u8ACB\u6D3D {0} {1} ({2})\u3002 \n\n\u9019\u500B\u5B78\u7FD2\u7FA4\u7D44\u88AB\u7528\u5728\u4E0B\u9762\u7684\u5B78\u7FD2\u8CC7\u6E90\uFF1A\n\n$courselist
+notification.mail.added.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u7522\u751F\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u88AB {0} {1} ({2})\u9080\u8ACB\u52A0\u5165\u4E00\u500B\u5B78\u7FD2\u7FA4\u7D44\uFF1A\n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A$groupdescription\n\n\u5982\u6709\u554F\u984C\uFF0C\u8ACB\u6D3D {0} {1} ({2})\u3002 \n\n\u9019\u500B\u5B78\u7FD2\u7FA4\u7D44\u88AB\u7528\u5728\u4E0B\u9762\u7684\u5B78\u7FD2\u8CC7\u6E90\uFF1A\n\n$courselist
 notification.mail.added.self.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u7522\u751F\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u525B\u52A0\u5165\u4E86\u4E00\u500B\u5B78\u7FD2\u7FA4\u7D44\uFF1A\n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A$groupdescription\n\n\u9019\u500B\u5B78\u7FD2\u7FA4\u7D44\u88AB\u7528\u5728\u4E0B\u9762\u7684\u5B78\u7FD2\u8CC7\u6E90\uFF1A\n\n$courselist
 notification.mail.added.self.subject=OLAT \u5B78\u7FD2\u7FA4\u7D44 $groupname 
 notification.mail.added.subject=OLAT \u5B78\u7FD2\u7FA4\u7D44 $groupname 
-notification.mail.removed.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u7522\u751F\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u5DF2\u88AB{0} {1} ({3})\u8A3B\u92B7\u4E86\u5B78\u7FD2\u7FA4\u7D44\uFF1A\n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A$groupdescription\n\n\u5982\u6709\u554F\u984C\uFF0C\u8ACB\u6D3D  {0} {1} ({2})\u3002\n\n\u9019\u500B\u5B78\u7FD2\u7FA4\u7D44\u88AB\u7528\u5728\u4E0B\u9762\u7684\u5B78\u7FD2\u8CC7\u6E90\uFF1A\n\n$courselist
+notification.mail.removed.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u7522\u751F\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u5DF2\u88AB{0} {1} ({2})\u8A3B\u92B7\u4E86\u5B78\u7FD2\u7FA4\u7D44\uFF1A\n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A$groupdescription\n\n\u5982\u6709\u554F\u984C\uFF0C\u8ACB\u6D3D  {0} {1} ({2})\u3002\n\n\u9019\u500B\u5B78\u7FD2\u7FA4\u7D44\u88AB\u7528\u5728\u4E0B\u9762\u7684\u5B78\u7FD2\u8CC7\u6E90\uFF1A\n\n$courselist
 notification.mail.removed.self.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u7522\u751F\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u5DF2\u7D93\u5F9E\u5B78\u7FD2\u7FA4\u7D44\u8A3B\u92B7\u4E86\uFF1A\n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A$groupdescription\n\n\u9019\u500B\u5B78\u7FD2\u7FA4\u7D44\u88AB\u7528\u5728\u4E0B\u9762\u7684\u5B78\u7FD2\u8CC7\u6E90\uFF1A\n\n$courselist
 notification.mail.removed.self.subject=OLAT \u5B78\u7FD2\u7FA4\u7D44 $groupname\uFF1A\u60A8\u5DF2\u7D93\u8A3B\u92B7\u4E86\u3002
 notification.mail.removed.subject=OLAT \u5B78\u7FD2\u7FA4\u7D44 $groupname\uFF1A\u60A8\u5DF2\u7D93\u8A3B\u92B7\u4E86\u3002
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ar.properties
index 5a1ca11660c112582a9f38728b4e1b154f90874f..fff70b1f9799234abecb423f29c0e49f7531ecf8 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ar.properties
@@ -23,13 +23,13 @@ tools.add.buddygroup=\u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u06
 tools.add.header=\u0625\u0646\u0634\u0627\u0621
 tools.delete.header=\u062D\u0630\u0641
 tools.delete.unusedgroup=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u0645\u0634\u0631\u0648\u0639
-notification.mail.added.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u062A\u0645 \u062F\u0639\u0648\u062A\u0643 \u0644\u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0648\u0627\u0633\u0637\u0629{0} {1} ({3})\:\r\n\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n\u0625\u0630\u0627 \u0643\u0646\u062A \u0644\u0627 \u062A\u0648\u0627\u0641\u0642 \u0641\u0642\u0637 \u0642\u0645 \u0628\u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639.
+notification.mail.added.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u062A\u0645 \u062F\u0639\u0648\u062A\u0643 \u0644\u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0648\u0627\u0633\u0637\u0629{0} {1} ({2})\:\r\n\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n\u0625\u0630\u0627 \u0643\u0646\u062A \u0644\u0627 \u062A\u0648\u0627\u0641\u0642 \u0641\u0642\u0637 \u0642\u0645 \u0628\u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639.
 notification.mail.added.self.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u0625\u0646\u0634\u0627\u0621 \u0645\u062C\u0645\u0648\u0639\u0629 \u0645\u0634\u0631\u0648\u0639 \u0641\u0649 \u0623\u0648\u0644\u0627\u062A\r\n\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n\u064A\u0645\u0643\u0646\u0643 \u062D\u0630\u0641 \u0647\u0630\u0647 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629 \u0641\u0649 \u0623\u0649 \u0648\u0642.\u062A
 notification.mail.added.self.subject=$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0645\u0634\u0631\u0648\u0639 \u0623\u0648\u0644\u0627\u062A
 notification.mail.added.subject=$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0645\u0634\u0640\u0631\u0648\u0639 \u0623\u0648\u0644\u0627\u062A
-notification.mail.deleted.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0645\u0646\u0630 \u062D\u0630\u0641 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0643\u060C \u0648\u0623\u0646\u062A \u0628\u0627\u0644\u062E\u0627\u0631\u062C \u0645\u0646\u0647\u0627 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({3})\:\r\n\r\n\r\n$groupname  \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640
+notification.mail.deleted.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0645\u0646\u0630 \u062D\u0630\u0641 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0643\u060C \u0648\u0623\u0646\u062A \u0628\u0627\u0644\u062E\u0627\u0631\u062C \u0645\u0646\u0647\u0627 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({2})\:\r\n\r\n\r\n$groupname  \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640
 notification.mail.deleted.subject=\u062A\u0645 \u062D\u0630\u0641 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629 \:$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0645\u0634\u0631\u0648\u0639 \u0623\u0648\u0644\u0627\u062A
-notification.mail.removed.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0627\u0646\u062A \u062E\u0627\u0631\u062C \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({3})\:\r\n\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640
+notification.mail.removed.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0627\u0646\u062A \u062E\u0627\u0631\u062C \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0628\u0648\u0627\u0633\u0637\u0629 {0} {1} ({2})\:\r\n\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription\u0627\u0644\u0648\u0635\u0641\: \r\n\r\n({2}) {1} {0} \u0644\u0644\u0627\u0633\u062A\u0641\u0633\u0627\u0631 \u064A\u0645\u0643\u0646\u0643 \u0627\u0644\u0627\u062A\u0635\u0627\u0644 \u0628\u0640
 notification.mail.removed.self.body=***\u0647\u0630\u0647 \u0631\u0633\u0627\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0629\u060C \u0645\u0646 \u0641\u0636\u0644\u0643 \u0644\u0627 \u062A\u0631\u062F \u0639\u0644\u064A\u0647\u0627***\r\n\r\n\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \:\r\n\r\n\r\n$groupname \:\u0627\u0633\u0645 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629\r\n$groupdescription \:\u0627\u0644\u0648\u0635\u0641
 notification.mail.removed.self.subject=\u0644\u0642\u062F \u062A\u0631\u0643\u062A \u0647\u0630\u0647 \u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0629. \:$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0645\u0634\u0631\u0648\u0639 \u0623\u0648\u0644\u0627\u062A
 notification.mail.removed.subject=\u0644\u0642\u062F \u0642\u0645\u062A \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062E\u0631\u0648\u062C. \:$groupname \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_bg.properties
index dbc849827cd87b091b531d93975d46af132cb1dd..69a2f8763410ff7215997be73351c677633af162 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_bg.properties
@@ -23,13 +23,13 @@ tools.add.buddygroup=\u0413\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u0
 tools.add.header=\u0421\u044A\u0437\u0434\u0430\u0439\u0442\u0435
 tools.delete.header=\u0418\u0437\u0442\u0440\u0438\u0439\u0442\u0435
 tools.delete.unusedgroup=\u0413\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438
-notification.mail.added.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043F\u043E\u043A\u0430\u043D\u0435\u043D(\u0430) \u0432 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 \u043E\u0442 {0} {1} ({3})\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\u0410\u043A\u043E \u043D\u0435 \u0441\u0442\u0435 \u0441\u044A\u0433\u043B\u0430\u0441\u043D\u0438, \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0441\u0435 \u043E\u0442\u043F\u0438\u0448\u0435\u0442\u0435 \u043E\u0442 \u0442\u0430\u0437\u0438 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438.
+notification.mail.added.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043F\u043E\u043A\u0430\u043D\u0435\u043D(\u0430) \u0432 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 \u043E\u0442 {0} {1} ({2})\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\u0410\u043A\u043E \u043D\u0435 \u0441\u0442\u0435 \u0441\u044A\u0433\u043B\u0430\u0441\u043D\u0438, \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0441\u0435 \u043E\u0442\u043F\u0438\u0448\u0435\u0442\u0435 \u043E\u0442 \u0442\u0430\u0437\u0438 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438.
 notification.mail.added.self.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0441\u044A\u0437\u0434\u0430\u0434\u043E\u0445\u0442\u0435 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\u0442\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0438\u0437\u0442\u0440\u0438\u0435\u0442\u0435 \u0442\u0430\u0437\u0438 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u0432\u0441\u044F\u043A\u043E \u0432\u0440\u0435\u043C\u0435.
 notification.mail.added.self.subject=\u0413\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 $groupname
 notification.mail.added.subject=\u0413\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 $groupname
 notification.mail.deleted.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0422\u044A\u0439 \u043A\u0430\u0442\u043E \u0433\u0440\u0443\u043F\u0430\u0442\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 \u0435 \u0438\u0437\u0442\u0440\u0438\u0442\u0430, \u0432\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D\u0438 \u043E\u0442 \u043D\u0435\u044F \u043E\u0442 {0} {1} ({3})\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F, \u0441\u0432\u044A\u0440\u0436\u0435\u0442\u0435 \u0441\u0435 \u0441 {0} {1} ({2}).
 notification.mail.deleted.subject=\u0413\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 $groupname\: \u0413\u0440\u0443\u043F\u0430\u0442\u0430 \u0431\u0435\u0448\u0435 \u0438\u0437\u0442\u0440\u0438\u0442\u0430
-notification.mail.removed.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D\u0438 \u043E\u0442 \u0433\u0440\u0443\u043F\u0430\u0442\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 \u043E\u0442 {0} {1} ({3})\: \r\n\r\n\u0418\u043C\u0430 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F, \u0441\u0432\u044A\u0440\u0436\u0435\u0442\u0435 \u0441\u0435 \u0441 {0} {1} ({2}).
+notification.mail.removed.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D\u0438 \u043E\u0442 \u0433\u0440\u0443\u043F\u0430\u0442\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 \u043E\u0442 {0} {1} ({2})\: \r\n\r\n\u0418\u043C\u0430 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\r\n\r\n\u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043C\u043E\u043B\u044F, \u0441\u0432\u044A\u0440\u0436\u0435\u0442\u0435 \u0441\u0435 \u0441 {0} {1} ({2}).
 notification.mail.removed.self.body=*** \u0422\u043E\u0432\u0430 \u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u044A\u043E\u0431\u0449\u0435\u043D\u0438\u0435, \u043D\u0435 \u043E\u0442\u0433\u043E\u0432\u0430\u0440\u044F\u0439\u0442\u0435 *** \r\n\r\n\u0412\u0438\u0435 \u0442\u043E\u043A\u0443-\u0449\u043E \u0441\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u0445\u0442\u0435 \u043E\u0442 \u0442\u0430\u0437\u0438 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438\: \r\n\r\n\u0418\u043C\u0435 \u043D\u0430 \u0433\u0440\u0443\u043F\u0430\: $groupname\r\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription
 notification.mail.removed.self.subject=\u0413\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 $groupname\: \u0412\u0438\u0435 \u043D\u0430\u043F\u0443\u0441\u043D\u0430\u0445\u0442\u0435 \u0442\u0430\u0437\u0438 \u0433\u0440\u0443\u043F\u0430 \u0437\u0430\u0432\u0438\u043D\u0430\u0433\u0438.
 notification.mail.removed.subject=\u0413\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 $groupname\: \u0412\u0438\u0435 \u0441\u0442\u0435 \u043E\u0442\u043F\u0438\u0441\u0430\u043D\u0438.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_cs.properties
index e09d2a2bdbfea61e2a118bef79c42615f641c954..81eb1f010076b999a4c28fc72f2cc0ffdeec4be5 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_cs.properties
@@ -24,13 +24,13 @@ tools.add.buddygroup=Projektov\u00E1 skupina
 tools.add.header=Vytvo\u0159it
 tools.delete.header=Smazat
 tools.delete.unusedgroup=Projektov\u00E9 skupiny
-notification.mail.added.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste za\u0159azen do projektov\u00E9 skupiny {0} {1} ({3})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\nPokud nesouhlas\u00EDte, m\u016F\u017Eete se odhl\u00E1sit.
+notification.mail.added.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste za\u0159azen do projektov\u00E9 skupiny {0} {1} ({2})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\nPokud nesouhlas\u00EDte, m\u016F\u017Eete se odhl\u00E1sit.
 notification.mail.added.self.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nVytvo\u0159il jste projektovou skupinu\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nKdykoli m\u016F\u017Eete tuto skupinu zru\u0161it.
 notification.mail.added.self.subject=Projektov\u00E1 skupina OLATu $groupname
 notification.mail.added.subject=Projektov\u00E1 skupina OLATu $groupname
-notification.mail.deleted.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nProto\u017Ee projektov\u00E1 skupina byla zru\u0161ena, byl jste z n\u00ED odhl\u00E1\u0161en {0} {1} ({3})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}).
+notification.mail.deleted.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nProto\u017Ee projektov\u00E1 skupina byla zru\u0161ena, byl jste z n\u00ED odhl\u00E1\u0161en {0} {1} ({2})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}).
 notification.mail.deleted.subject=Projektov\u00E1 skupina OLATu $groupname\: Skupina byla vymaz\u00E1na
-notification.mail.removed.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste za\u0159azen do projektov\u00E9 skupiny {0} {1} ({3})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}).
+notification.mail.removed.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nByl jste za\u0159azen do projektov\u00E9 skupiny {0} {1} ({2})\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\nPokud m\u00E1te dotazy, kontaktujte {0} {1} ({2}).
 notification.mail.removed.self.body=*** Toto je automatick\u00E1 zpr\u00E1va, neodpov\u00EDdejte *** \n\nPr\u00E1v\u011B jste se odhl\u00E1sil z projektov\u00E9 skupiny\: \n\nJm\u00E9no skupiny\: $groupname\nPopis\: $groupdescription\n\n
 notification.mail.removed.self.subject=Projektov\u00E1 skupina OLATu $groupname\: Opustil jste projektovou skupinu.
 notification.mail.removed.subject=Projektov\u00E1 skupina OLATu $groupname\: Byl jste odhl\u00E1\u0161en.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_da.properties
index 14fdec47747b977c9dfdf5e202c323edea428d30..7d3c12e4d4e7dbd7b9b2190ed19b0358c85e5a1f 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_da.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_da.properties
@@ -22,13 +22,13 @@ tools.add.buddygroup=Projektgruppe
 tools.add.header=Opret
 tools.delete.header=Slet
 tools.delete.unusedgroup=Projektgrupper
-notification.mail.added.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu er blevet inviteret til en projektgruppe af {0} {1} ({3})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\nHvis du ikke er enig, kan du fjerne dig fra projekt gruppen.
+notification.mail.added.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu er blevet inviteret til en projektgruppe af {0} {1} ({2})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\nHvis du ikke er enig, kan du fjerne dig fra projekt gruppen.
 notification.mail.added.self.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu har oprettet en projektgruppe i OLAT\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nDu kan slette denne gruppe p\u00E5 et vilk\u00E5rligt tidspunkt.
 notification.mail.added.self.subject=OLAT projektgruppe $groupname
 notification.mail.added.subject=OLAT projektgruppe $groupname
-notification.mail.deleted.body=*** Dette er en automatisk besked, send ikke svar *** \n\nEftersom projektgruppen er slettet, er du fjernet fra den af  {0} {1} ({3})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l kontakt venligst {0} {1} ({2}).
+notification.mail.deleted.body=*** Dette er en automatisk besked, send ikke svar *** \n\nEftersom projektgruppen er slettet, er du fjernet fra den af  {0} {1} ({2})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l kontakt venligst {0} {1} ({2}).
 notification.mail.deleted.subject=OLAT projektgruppe $groupname\: Gruppen er slettet
-notification.mail.removed.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu er blevet inviteret til en projektgruppe af  {0} {1} ({3})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l kontakt venligst {0} {1} ({2}).
+notification.mail.removed.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu er blevet inviteret til en projektgruppe af  {0} {1} ({2})\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\nHar du sp\u00F8rgsm\u00E5l kontakt venligst {0} {1} ({2}).
 notification.mail.removed.self.body=*** Dette er en automatisk besked, send ikke svar *** \n\nDu er netop fjernet fra denne projektgruppe\: \n\nGruppe navn\: $groupname\nBeskrivelse\: $groupdescription\n\n
 notification.mail.removed.self.subject=OLAT projektgruppe $groupname\: Du har forladt gruppen.
 notification.mail.removed.subject=OLAT projektgruppe $groupname\: Du er blevet fjernet fra gruppen.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
index 5927f5dbf021f16dd08238f61ff8b6cd7113bb07..82e31b6d5104cbb0380e3e4f729a8dff680523a0 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
@@ -118,13 +118,13 @@ email.group=Email versenden
 config.group=Konfigurieren
 users.group=Benutzer verwalten
 
-notification.mail.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) in eine Arbeitsgruppe eingeladen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nSind Sie damit nicht einverstanden, so k\u00F6nnen Sie sich aus der Arbeitsgruppe wieder austragen.
+notification.mail.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) in eine Arbeitsgruppe eingeladen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nSind Sie damit nicht einverstanden, so k\u00F6nnen Sie sich aus der Arbeitsgruppe wieder austragen.
 notification.mail.added.self.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie haben in OLAT eine Arbeitsgruppe eröffnet\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nSie k\u00F6nnen die Gruppe jederzeit wieder löschen.
 notification.mail.added.self.subject=Gruppe $groupname
 notification.mail.added.subject=Gruppe $groupname
-notification.mail.deleted.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie wurden von {0} {1} ({3}) aus der Arbeitsgruppe ausgetragen, da sie gel\u00F6scht wurde\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
+notification.mail.deleted.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie wurden von {0} {1} ({2}) aus der Arbeitsgruppe ausgetragen, da sie gel\u00F6scht wurde\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
 notification.mail.deleted.subject=Gruppe $groupname\: Die Gruppe wurde gel\u00F6scht
-notification.mail.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) aus der Arbeitsgruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
+notification.mail.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) aus der Arbeitsgruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
 notification.mail.removed.self.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie haben sich soeben aus der Arbeitsgruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\n
 notification.mail.removed.self.subject=Gruppe $groupname\: Sie haben sich ausgetragen.
 notification.mail.removed.subject=Gruppe $groupname\: Sie wurden ausgetragen.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_el.properties
index 648a80338ffda3c06e2be45d3259620b45186cb2..493f4c870acc840297fb87380ee045e2025120b9 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_el.properties
@@ -23,13 +23,13 @@ tools.add.buddygroup=\u039F\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03
 tools.add.header=\u0394\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1
 tools.delete.header=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE
 tools.delete.unusedgroup=\u039F\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2
-notification.mail.added.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CC\u03C3\u03BA\u03BB\u03B7\u03C3\u03B7 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03BF\u03C7\u03AE\u03C2 \u03C3\u03B5 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03B1\u03C0\u03CC {0} {1} ({3})\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\\u0395\u03AC\u03BD \u03B4\u03B5\u03BD \u03C3\u03C5\u03BC\u03C6\u03C9\u03BD\u03B5\u03AF\u03C4\u03B5, \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF\u03C4\u03B5 \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2.
+notification.mail.added.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CC\u03C3\u03BA\u03BB\u03B7\u03C3\u03B7 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03BF\u03C7\u03AE\u03C2 \u03C3\u03B5 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03B1\u03C0\u03CC {0} {1} ({2})\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\\u0395\u03AC\u03BD \u03B4\u03B5\u03BD \u03C3\u03C5\u03BC\u03C6\u03C9\u03BD\u03B5\u03AF\u03C4\u03B5, \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF\u03C4\u03B5 \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2.
 notification.mail.added.self.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AE\u03C3\u03B5\u03B9 \u03BC\u03B9\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03C3\u03C4\u03BF OLAT\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\nDescription\: $groupdescription\n\n\u039C\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03B4\u03B9\u03B1\u03B3\u03C1\u03AC\u03C8\u03B5\u03C4\u03B5 \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03BF\u03C0\u03BF\u03B9\u03B1\u03B4\u03AE\u03C0\u03BF\u03C4\u03B5 \u03C3\u03C4\u03B9\u03B3\u03BC\u03AE \u03B5\u03C0\u03B9\u03B8\u03C5\u03BC\u03B5\u03AF\u03C4\u03B5.
 notification.mail.added.self.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 $groupname
 notification.mail.added.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 $groupname
-notification.mail.deleted.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0391\u03C0\u03CC \u03C4\u03B7 \u03C3\u03C4\u03B9\u03B3\u03BC\u03AE \u03C0\u03BF\u03C5 \u03B4\u03B9\u03B1\u03B3\u03C1\u03AC\u03C6\u03B7\u03BA\u03B5 \u03B7 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03B1\u03C5\u03C4\u03AE \u03B1\u03C0\u03CC {0} {1} ({3})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03B5\u03C1\u03C9\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}).
+notification.mail.deleted.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0391\u03C0\u03CC \u03C4\u03B7 \u03C3\u03C4\u03B9\u03B3\u03BC\u03AE \u03C0\u03BF\u03C5 \u03B4\u03B9\u03B1\u03B3\u03C1\u03AC\u03C6\u03B7\u03BA\u03B5 \u03B7 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03B1\u03C5\u03C4\u03AE \u03B1\u03C0\u03CC {0} {1} ({2})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03B5\u03C1\u03C9\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}).
 notification.mail.deleted.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 $groupname\: \u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B4\u03B9\u03B1\u03B3\u03C1\u03AC\u03C6\u03B7\u03BA\u03B5
-notification.mail.removed.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CC\u03C3\u03BA\u03BB\u03B7\u03C3\u03B7 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03BF\u03C7\u03AE\u03C2 \u03C3\u03B5 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03B1\u03C0\u03CC  {0} {1} ({3})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03B5\u03C1\u03C9\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}).
+notification.mail.removed.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CC\u03C3\u03BA\u03BB\u03B7\u03C3\u03B7 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03BF\u03C7\u03AE\u03C2 \u03C3\u03B5 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03B1\u03C0\u03CC  {0} {1} ({2})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\n\u0393\u03B9\u03B1 \u03B5\u03C1\u03C9\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2 \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \u03B5\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AE\u03C3\u03C4\u03B5 \u03BC\u03B5 {0} {1} ({2}).
 notification.mail.removed.self.body=*** \u0391\u03C5\u03C4\u03CC \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03BF \u03BC\u03AE\u03BD\u03C5\u03BC\u03B1, \u03BC\u03B7\u03BD \u03B1\u03C0\u03B1\u03BD\u03C4\u03AE\u03C3\u03B5\u03C4\u03B5 *** \n\n\u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2\: \n\n\u038C\u03BD\u03BF\u03BC\u03B1 \u03BF\u03BC\u03AC\u03B4\u03B1\u03C2\: $groupname\n\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE\: $groupdescription\n\n
 notification.mail.removed.self.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 $groupname\: \u0388\u03C7\u03B5\u03C4\u03B5 \u03B5\u03B3\u03BA\u03B1\u03C4\u03B1\u03BB\u03AE\u03C8\u03B5\u03B9 \u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1.
 notification.mail.removed.subject=\u039F\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 $groupname\: \u0388\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B8\u03B5\u03AF.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
index 6bf7978efeddc317d0fdd5869309a33af408712a..e71d0b80d0fa8f15de1bfa466a136b9b4b969971 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties
@@ -66,13 +66,13 @@ merge.group=Merge
 msg.alleastone.editable.group=You must select at least one group you own.
 msg.atleastone=There must be at least one coach in this group.
 nomembers=No members found that matches the given criteria.
-notification.mail.added.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were invited to a group by {0} {1} ({3})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nIf you do not agree, you can sign out from this group.
+notification.mail.added.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were invited to a group by {0} {1} ({2})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nIf you do not agree, you can sign out from this group.
 notification.mail.added.self.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have created a group in OLAT\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nYou can delete this group anytime.
 notification.mail.added.self.subject=Group $groupname
 notification.mail.added.subject=Group $groupname
-notification.mail.deleted.body=*** This is an automated message. Please do not reply *** \r\n\r\nSince your group was deleted, you were signed out from it by {0} {1} ({3})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions please contact {0} {1} ({2}).
+notification.mail.deleted.body=*** This is an automated message. Please do not reply *** \r\n\r\nSince your group was deleted, you were signed out from it by {0} {1} ({2})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions please contact {0} {1} ({2}).
 notification.mail.deleted.subject=Group $groupname\: This group is deleted
-notification.mail.removed.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were signed out of a group by {0} {1} ({3})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions please contact {0} {1} ({2}).
+notification.mail.removed.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were signed out of a group by {0} {1} ({2})\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nFor questions please contact {0} {1} ({2}).
 notification.mail.removed.self.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have just signed out of this group\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription
 notification.mail.removed.self.subject=Group $groupname\: You have left this group for good.
 notification.mail.removed.subject=Group $groupname\: You were signed out.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_es.properties
index 71b76b2e5229fc85e8ece96fea1bb5972a4f7af0..b44f93f993f54d911cd77d7824ee320a0b5a845a 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_es.properties
@@ -23,11 +23,11 @@ tools.add.buddygroup=Grupo de colaboraci\u00F3n
 tools.add.header=Crear
 tools.delete.header=Borrar
 tools.delete.unusedgroup=Grupo de colaboraci\u00F3n
-notification.mail.added.body=*** Este mensaje se genera autom\u00E1ticamente, no lo contestes *** \n\nHas sido invitado al grupo de colaboraci\u00F3n por {0}{1}({3})\:\n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nSi no est\u00E1s de acuerdo puedes quitarte del grupo de colaboraci\u00F3n.
+notification.mail.added.body=*** Este mensaje se genera autom\u00E1ticamente, no lo contestes *** \n\nHas sido invitado al grupo de colaboraci\u00F3n por {0}{1}({2})\:\n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nSi no est\u00E1s de acuerdo puedes quitarte del grupo de colaboraci\u00F3n.
 notification.mail.added.self.body=*** Este mensaje se genera autom\u00E1ticamente, no lo contestes *** \n\nHas creado un grupo de colaboraci\u00F3n OLAT\:\n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nPuedes eliminar este grupo en cualquier momento.
 notification.mail.added.self.subject=Grupo de colaboraci\u00F3n OLAT $groupname
 notification.mail.added.subject=Grupo de colaboraci\u00F3n OLAT $groupname
-notification.mail.deleted.body=***  Este mensaje se genera autom\u00E1ticamente, no lo contestes *** \n\nComo el grupo de colaboraci\u00F3n ha sido eliminado has sido borrado de \u00E9l por {0} {1} ({3})\:\n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nPara cualquier pregunta contactar con {0} {1} ({2}).
+notification.mail.deleted.body=***  Este mensaje se genera autom\u00E1ticamente, no lo contestes *** \n\nComo el grupo de colaboraci\u00F3n ha sido eliminado has sido borrado de \u00E9l por {0} {1} ({2})\:\n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nPara cualquier pregunta contactar con {0} {1} ({2}).
 notification.mail.deleted.subject=Grupo de colaboraci\u00F3n OLAT $groupname\: El grupo ha sido eliminado.
 notification.mail.removed.body=***  Este mensaje se genera autom\u00E1ticamente, no lo contestes *** \n\nHas sido borrado del grupo de colaboraci\u00F3n\:\n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription\n\nPara cualquier pregunta contactar con {0} {1} ({2}).
 notification.mail.removed.self.body=***  Este mensaje se genera autom\u00E1ticamente, no lo contestes *** \n\nTe has borrado del grupo de colaboraci\u00F3n\:\n\nNombre del grupo\: $groupname\nDescripci\u00F3n\: $groupdescription.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fa.properties
index 4f825590701a46068b73581e38c03ee76f335257..ab205e6451db8a181b01e9230a88ff0ba0f3d3e2 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fa.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fa.properties
@@ -20,13 +20,13 @@ table.header.leave=\u062A\u0631\u06A9 \u06A9\u0631\u062F\u0646
 table.header.type=\u0646\u0648\u0639
 tools.add.buddygroup=\u06AF\u0631\u0648\u0647 \u06A9\u0627\u0631\u06CC
 tools.add.header=\u0627\u06CC\u062C\u0627\u062F
-notification.mail.added.body=*** This is an automated message, do not reply *** \n\nYou were invited to a project group by {0} {1} ({3})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\nIf you do not agree, you can sign out from the project group.
+notification.mail.added.body=*** This is an automated message, do not reply *** \n\nYou were invited to a project group by {0} {1} ({2})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\nIf you do not agree, you can sign out from the project group.
 notification.mail.added.self.body=*** This is an automated message, do not reply *** \n\nYou have created a project group in OLAT\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nYou can delete this group anytime.
 notification.mail.added.self.subject=OLAT project group $groupname
 notification.mail.added.subject=OLAT project group $groupname
-notification.mail.deleted.body=*** This is an automated message, do not reply *** \n\nSince the project group was deleted, you were signed out from it by {0} {1} ({3})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions please contact {0} {1} ({2}).
+notification.mail.deleted.body=*** This is an automated message, do not reply *** \n\nSince the project group was deleted, you were signed out from it by {0} {1} ({2})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions please contact {0} {1} ({2}).
 notification.mail.deleted.subject=OLAT project group $groupname\: The group was deleted
-notification.mail.removed.body=*** This is an automated message, do not reply *** \n\nYou were invited to a project group by {0} {1} ({3})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions please contact {0} {1} ({2}).
+notification.mail.removed.body=*** This is an automated message, do not reply *** \n\nYou were invited to a project group by {0} {1} ({2})\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\nFor questions please contact {0} {1} ({2}).
 notification.mail.removed.self.body=*** This is an automated message, do not reply *** \n\nYou have just signed out of this project group\: \n\nGroup name\: $groupname\nDescription\: $groupdescription\n\n
 notification.mail.removed.self.subject=OLAT project group $groupname\: You have left this group for good.
 notification.mail.removed.subject=OLAT project group $groupname\: You were signed out.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties
index 65922bdf2f8310d6b688fb8d1ba91a06073e9d40..9405653abb29ab0cf0c40cb63c110cd10e9088c4 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties
@@ -38,13 +38,13 @@ menu.opengroups.alt=Les groupes qui ont \u00E9t\u00E9 publi\u00E9s et auxquels j
 merge.group=R\u00E9unir
 msg.alleastone.editable.group=Vous devez choisir au moins un groupe dont vous \u00EAtes coach,
 msg.atleastone=Il faut qu'au moins un coach fasse partie du groupe de travail.
-notification.mail.added.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez, SVP., ne pas r\u00E9pondre \u00E0 ce message. *** \r\n\r\nVous avez \u00E9t\u00E9 invit\u00E9(e) par {0} {1} ({3}) dans un groupe de travail \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nSi vous ne y donnez pas votre accord, vous pouvez vous d\u00E9sinscrire du groupe de travail.
+notification.mail.added.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez, SVP., ne pas r\u00E9pondre \u00E0 ce message. *** \r\n\r\nVous avez \u00E9t\u00E9 invit\u00E9(e) par {0} {1} ({2}) dans un groupe de travail \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nSi vous ne y donnez pas votre accord, vous pouvez vous d\u00E9sinscrire du groupe de travail.
 notification.mail.added.self.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez, SVP., ne pas r\u00E9pondre \u00E0 ce message *** \n\n Vous avez cr\u00E9\u00E9 un groupe de travail dans OLAT \:\n\nNom du groupe\: $groupname\nDescription\: $groupdescription\n\nVous pourrez annuler ce groupe \u00E0 tout moment. 
 notification.mail.added.self.subject=Groupe de travail OLAT $groupname
 notification.mail.added.subject=Groupe de travail OLAT $groupname
-notification.mail.deleted.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez, SVP., ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\n Vous venez d'\u00EAtre d\u00E9sinscrit(e) du groupe de travail par {0} {1} ({3}), car le groupe a \u00E9t\u00E9 effac\u00E9 \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter {0} {1} ({2}).
+notification.mail.deleted.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez, SVP., ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\n Vous venez d'\u00EAtre d\u00E9sinscrit(e) du groupe de travail par {0} {1} ({2}), car le groupe a \u00E9t\u00E9 effac\u00E9 \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter {0} {1} ({2}).
 notification.mail.deleted.subject=Groupe de travail OLAT $groupname\: Le groupe a \u00E9t\u00E9 supprim\u00E9
-notification.mail.removed.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\nVous avez \u00E9t\u00E9 d\u00E9sinscrit(e) par {0} {1} ({3}) du groupe de travail \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter svp {0} {1} ({2}).
+notification.mail.removed.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez svp ne pas r\u00E9pondre \u00E0 ce message *** \r\n\r\nVous avez \u00E9t\u00E9 d\u00E9sinscrit(e) par {0} {1} ({2}) du groupe de travail \: \r\n\r\nNom du groupe\: $groupname\r\nDescription\: $groupdescription\r\n\r\nPour toute question, veuillez contacter svp {0} {1} ({2}).
 notification.mail.removed.self.body=*** Ceci est un message g\u00E9n\u00E9r\u00E9 de mani\u00E8re automatique. Veuillez, SVP., ne pas r\u00E9pondre \u00E0 ce message *** \n\n Vous venez de vous d\u00E9sinscrire du groupe de travail \: \n\nNom du groupe\: $groupname\nDescription\: $groupdescription\n\n
 notification.mail.removed.self.subject=Groupe de travail OLAT $groupname\: Vous vous \u00EAtes d\u00E9sinscrit(e).
 notification.mail.removed.subject=Groupe de travail OLAT $groupname\: Vous avez \u00E9t\u00E9 d\u00E9sinscrit(e).
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_it.properties
index dae038e89cabcb9af2f6dcae0a68207cea58581f..39ff26bf0d694a22015b2bedbb45a6552c60cc45 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_it.properties
@@ -23,13 +23,13 @@ info.group.deleted=Il gruppo di lavoro \u00E8 stato eliminato
 menu.index=Gruppi
 menu.index.alt=Lavori con i Suoi gruppi.
 msg.atleastone=Nel gruppo di lavoro deve essere registrato almeno una/un proprietaria/o.
-notification.mail.added.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \r\n\r\n\u00C8 stata/o invitata/o da {0} {1} ({3}) in un gruppo di lavoro\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nSe non \u00E8 vuole convalidare questa operazione, pu\u00F2 disiscriversi dal gruppo.
+notification.mail.added.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \r\n\r\n\u00C8 stata/o invitata/o da {0} {1} ({2}) in un gruppo di lavoro\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nSe non \u00E8 vuole convalidare questa operazione, pu\u00F2 disiscriversi dal gruppo.
 notification.mail.added.self.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \n\nHa aperto un gruppo di lavoro OLAT\: \n\nNome del gruppo\: $groupname\nDescrizione\: $groupdescription\n\nPu\u00F2 eliminare il gruppo in qualsiasi momento.
 notification.mail.added.self.subject=Gruppo di lavoro OLAT $groupname
 notification.mail.added.subject=Gruppo di lavoro OLAT $groupname
-notification.mail.deleted.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \r\n\r\n\u00C8 stata/o disiscritta/o da {0} {1} ({3}) dal gruppo di lavoro perch\u00E9 quest'ultimo \u00E8 stato eliminato\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nPer qualsiasi chiarimento contatti {0} {1} ({2}), p.f.
+notification.mail.deleted.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \r\n\r\n\u00C8 stata/o disiscritta/o da {0} {1} ({2}) dal gruppo di lavoro perch\u00E9 quest'ultimo \u00E8 stato eliminato\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nPer qualsiasi chiarimento contatti {0} {1} ({2}), p.f.
 notification.mail.deleted.subject=Gruppo di lavoro OLAT $groupname\: il gruppo \u00E8 stato eliminato
-notification.mail.removed.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \r\n\r\n\u00C8 stata/o disiscritta/o da {0} {1} ({3}) dal gruppo di lavoro\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nPer qualsiasi chiarimento contatti {0} {1} ({2}), p.f.
+notification.mail.removed.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \r\n\r\n\u00C8 stata/o disiscritta/o da {0} {1} ({2}) dal gruppo di lavoro\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription\r\n\r\nPer qualsiasi chiarimento contatti {0} {1} ({2}), p.f.
 notification.mail.removed.self.body=*** Questo \u00E8 un messaggio generato automaticamente. Non risponda al messaggio, p.f. ***  \r\n\r\nSi \u00E8 appena disiscritta/o dal gruppo di lavoro\: \r\n\r\nNome del gruppo\: $groupname\r\nDescrizione\: $groupdescription
 notification.mail.removed.self.subject=Gruppo di lavoro OLAT $groupname\: Lei si \u00E8 disiscritta/o.
 notification.mail.removed.subject=Gruppo di lavoro OLAT $groupname\: \u00E8 stata/o disiscritta/o.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_jp.properties
index 470a7da7802a8e56576764d526940606198a2b78..5b6f7cb5dbf1202f3dc9e2b96819102a4c639a9f 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_jp.properties
@@ -20,13 +20,13 @@ tools.add.buddygroup=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D
 tools.add.header=\u4F5C\u6210
 tools.delete.header=\u524A\u9664
 tools.delete.unusedgroup=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7
-notification.mail.added.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u3042\u306A\u305F\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u306B\u62DB\u5F85\u3055\u308C\u307E\u3057\u305F\: {0} {1} ({3})\: \r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription\r\n\r\n\u540C\u610F\u3057\u306A\u3044\u5834\u5408\u3001\u3042\u306A\u305F\u306F\u3001\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304B\u3089\u96E2\u8131\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
+notification.mail.added.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u3042\u306A\u305F\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u306B\u62DB\u5F85\u3055\u308C\u307E\u3057\u305F\: {0} {1} ({2})\: \r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription\r\n\r\n\u540C\u610F\u3057\u306A\u3044\u5834\u5408\u3001\u3042\u306A\u305F\u306F\u3001\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304B\u3089\u96E2\u8131\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
 notification.mail.added.self.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u3042\u306A\u305F\u306F\u3001OLAT\u5185\u306B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u3092\u4F5C\u6210\u3057\u307E\u3057\u305F\:\r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription\r\n\r\n\u3042\u306A\u305F\u306F\u3001\u3053\u306E\u30B0\u30EB\u30FC\u30D7\u3092\u3044\u3064\u3067\u3082\u524A\u9664\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
 notification.mail.added.self.subject=OLAT\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7 $groupname
 notification.mail.added.subject=OLAT\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7 $groupname
-notification.mail.deleted.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304C\u524A\u9664\u3055\u308C\u305F\u305F\u3081\u3001\u3042\u306A\u305F\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3057\u305F\: {0} {1} ({3})\: \r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription\r\n\r\n\u8CEA\u554F\u7B49\u3001\u3053\u3061\u3089\u306B\u3054\u9023\u7D61\u304F\u3060\u3055\u3044\: {0} {1} ({2})
+notification.mail.deleted.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304C\u524A\u9664\u3055\u308C\u305F\u305F\u3081\u3001\u3042\u306A\u305F\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3057\u305F\: {0} {1} ({2})\: \r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription\r\n\r\n\u8CEA\u554F\u7B49\u3001\u3053\u3061\u3089\u306B\u3054\u9023\u7D61\u304F\u3060\u3055\u3044\: {0} {1} ({2})
 notification.mail.deleted.subject=OLAT\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7 $groupname\: \u30B0\u30EB\u30FC\u30D7\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
-notification.mail.removed.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u3042\u306A\u305F\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3057\u305F\: {0} {1} ({3})\: \r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription\r\n\r\n\u8CEA\u554F\u7B49\u3001\u3053\u3061\u3089\u306B\u3054\u9023\u7D61\u304F\u3060\u3055\u3044\: {0} {1} ({2})
+notification.mail.removed.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u3042\u306A\u305F\u306F\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3057\u305F\: {0} {1} ({2})\: \r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription\r\n\r\n\u8CEA\u554F\u7B49\u3001\u3053\u3061\u3089\u306B\u3054\u9023\u7D61\u304F\u3060\u3055\u3044\: {0} {1} ({2})
 notification.mail.removed.self.body=*** \u3053\u308C\u306F\u3001\u81EA\u52D5\u30E1\u30C3\u30BB\u30FC\u30B8\u3067\u3059\u3002\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306B\u8FD4\u4FE1\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002 *** \r\n\r\n\u3042\u306A\u305F\u306F\u3001\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u304B\u3089\u96E2\u8131\u3057\u307E\u3057\u305F\:\r\n\r\n\u30B0\u30EB\u30FC\u30D7\u540D\: $groupname\r\n\u8AAC\u660E\: $groupdescription
 notification.mail.removed.self.subject=OLAT\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7 $groupname\: \u3042\u306A\u305F\u306F\u3001\u3053\u306E\u30B0\u30EB\u30FC\u30D7\u3092\u96E2\u308C\u307E\u3057\u305F\u3002
 notification.mail.removed.subject=OLAT\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7 $groupname\: \u3042\u306A\u305F\u306F\u3001\u30ED\u30B0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F\u3002
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_lt.properties
index ffa52d7bca9f35c6d9df19c71f87dd7e214678df..b11c56c66c995d2610617559eaec1b56f480a3f2 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_lt.properties
@@ -20,13 +20,13 @@ table.header.leave=Palikti
 table.header.type=Tipas
 tools.add.buddygroup=Projekto grup\u0117
 tools.add.header=Sukurti
-notification.mail.added.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \n\nJ\u016Bs buvote pakviestas \u012F projekto grup\u0119 {0} {1} ({3})\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\nJeigu j\u016Bs nesutinkate, j\u016Bs galite atsijungti nuo projekto grup\u0117s.
+notification.mail.added.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \n\nJ\u016Bs buvote pakviestas \u012F projekto grup\u0119 {0} {1} ({2})\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\nJeigu j\u016Bs nesutinkate, j\u016Bs galite atsijungti nuo projekto grup\u0117s.
 notification.mail.added.self.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \n\nJ\u016Bs suk\u016Br\u0117te projekto grup\u0119 OLAT sistemoje\: \n\nGrup\u0117s vardas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJ\u016Bs galite i\u0161trinti \u0161i\u0105 grup\u0119 kada norite.
 notification.mail.added.self.subject=OLAT projekto grup\u0117 $groupname
 notification.mail.added.subject=OLAT projekto grup\u0117 $groupname
-notification.mail.deleted.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \n\nNuo projekto grup\u0117s pa\u0161alinimo j\u016Bs buvote atjungtas nuo {0} {1} ({3})\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJei turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}).
+notification.mail.deleted.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \n\nNuo projekto grup\u0117s pa\u0161alinimo j\u016Bs buvote atjungtas nuo {0} {1} ({2})\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJei turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}).
 notification.mail.deleted.subject=OLAT projekto grup\u0117 $groupname\: Grup\u0117 buvo i\u0161trinta.
-notification.mail.removed.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \nJ\u016Bs buvote pakviestas \u012F projekto grup\u0119 {0} {1} ({3})\: \n\nGrup\u0117s vardas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJei turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}).
+notification.mail.removed.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \nJ\u016Bs buvote pakviestas \u012F projekto grup\u0119 {0} {1} ({2})\: \n\nGrup\u0117s vardas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\nJei turite klausim\u0173, pra\u0161ome susisiekti {0} {1} ({2}).
 notification.mail.removed.self.body=*** Tai yra automatin\u0117 \u017Einut\u0117, pra\u0161ome neatsakin\u0117ti *** \n\nJ\u016Bs k\u0105 tik atsijung\u0117te nuo \u0161ios grup\u0117s\: \n\nGrup\u0117s pavadinimas\: $groupname\nApib\u016Bdinimas\: $groupdescription\n\n
 notification.mail.removed.self.subject=OLAT projekto grup\u0117 $groupname\: J\u016Bs pats palikote \u0161i\u0105 grup\u0119.
 notification.mail.removed.subject=OLAT projekto grup\u0117 $groupname\: j\u016Bs atsijung\u0117te.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_nl_NL.properties
index 7cec03588334a6740b9e1e4e3a10ab9d2c7fadea..d08ebcc9d5123bbc5a61ead552867b1d4a84358f 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_nl_NL.properties
@@ -23,13 +23,13 @@ tools.add.buddygroup=Werkgroep
 tools.add.header=Aanmaken
 tools.delete.header=Wissen
 tools.delete.unusedgroup=Werkgroepen
-notification.mail.added.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd uitgenodigd voor een projectgroep door {0} {1} ({3})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nAls u niet akkoord gaat, kunt u zich uitschrijven uit deze projectgroep.
+notification.mail.added.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd uitgenodigd voor een projectgroep door {0} {1} ({2})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nAls u niet akkoord gaat, kunt u zich uitschrijven uit deze projectgroep.
 notification.mail.added.self.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU heeft een projectgroep in OLAT aangemaakt\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nU kunt deze groep op elk moment verwijderen.
 notification.mail.added.self.subject=OLAT projectgroep $groupname
 notification.mail.added.subject=OLAT projectgroep $groupname
-notification.mail.deleted.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nSinds uw projectgroep verwijderd is, werd u er uitgeschreven door {0} {1} ({3})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen gelieve {0} {1} ({2}) te contacteren
+notification.mail.deleted.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nSinds uw projectgroep verwijderd is, werd u er uitgeschreven door {0} {1} ({2})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen gelieve {0} {1} ({2}) te contacteren
 notification.mail.deleted.subject=OLAT projectgroep $groupname\: Deze groep werd verwijderd
-notification.mail.removed.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd uitgeschreven uit uw projectgroep door {0} {1} ({3})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen gelieve {0} {1} ({2}) te contacteren
+notification.mail.removed.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU werd uitgeschreven uit uw projectgroep door {0} {1} ({2})\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription\r\n\r\nVoor vragen gelieve {0} {1} ({2}) te contacteren
 notification.mail.removed.self.body=*** Dit is een automatisch bericht. Gelieve niet te antwoorden *** \r\n\r\nU heeft zich net uit deze projectgroep uitgeschreven\: \r\n\r\nGroepsnaam\: $groupname\r\nBeschrijving\: $groupdescription
 notification.mail.removed.self.subject=OLAT projectgroep $groupname\: U heeft deze groep voorgoed verlaten.
 notification.mail.removed.subject=OLAT projectgroep $groupname\: U werd uitgeschreven.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties
index 5f8310dd026b89447acff3942ca97a2f6133e751..c14b479b35f3e7caaf9d25efdc90acbd382ce01d 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pl.properties
@@ -57,13 +57,13 @@ merge.group=Po\u0142\u0105cz
 msg.alleastone.editable.group=Musisz zaznaczy\u0107 co najmniej jedn\u0105 grup\u0119.
 msg.atleastone=W tej grupie musi by\u0107 co najmniej jeden w\u0142a\u015Bciciel.
 nomembers=Nie znaleziono cz\u0142onk\u00F3w spe\u0142niaj\u0105cych podane kryteria.
-notification.mail.added.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \r\n\r\n Zosta\u0142e\u015B zaproszony do grupy OLAT przez\: {0} {1} ({3})\: \r\n\r\n Nazwa grupy\: $groupname\r\n Opis\: $groupdescription\r\n Je\u015Bli si\u0119 nie zgadzasz, mo\u017Cesz si\u0119 wypisa\u0107 z tej grupy.
+notification.mail.added.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \r\n\r\n Zosta\u0142e\u015B zaproszony do grupy OLAT przez\: {0} {1} ({2})\: \r\n\r\n Nazwa grupy\: $groupname\r\n Opis\: $groupdescription\r\n Je\u015Bli si\u0119 nie zgadzasz, mo\u017Cesz si\u0119 wypisa\u0107 z tej grupy.
 notification.mail.added.self.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \r\n\r\n Utworzy\u0142e\u015B grup\u0119 OLAT \: \r\n\r\nNazwa grupy\: $groupname\r\nOpis\: $groupdescription\r\n\r\n Mo\u017Cesz usun\u0105\u0107 t\u0119 grup\u0119 w dowolnym momencie.
 notification.mail.added.self.subject=Grupa OLAT\: $groupname - Utworzy\u0142e\u015B grup\u0119
 notification.mail.added.subject=Grupa OLAT\: $groupname - Zosta\u0142e\u015B zaproszony
-notification.mail.deleted.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nPoniewa\u017C grupa zosta\u0142a usuni\u0119ta, zosta\u0142e\u015B z niej wypisany przez\: {0} {1} ({3})\: \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nW razie pyta\u0144 skontaktuj si\u0119 z\: {0} {1} ({2}).
+notification.mail.deleted.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \n\nPoniewa\u017C grupa zosta\u0142a usuni\u0119ta, zosta\u0142e\u015B z niej wypisany przez\: {0} {1} ({2})\: \n\nNazwa grupy\: $groupname\nOpis\: $groupdescription\n\nW razie pyta\u0144 skontaktuj si\u0119 z\: {0} {1} ({2}).
 notification.mail.deleted.subject=Grupa OLAT\: $groupname - Grupa zosta\u0142a usuni\u0119ta.
-notification.mail.removed.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \r\n\r\n Zosta\u0142e\u015B wypisany z grupy przez\: {0} {1} ({3})\: \r\n\r\n Nazwa grupy\: $groupname\r\nOpis\: $groupdescription\r\n\r\nW razie pyta\u0144 skontaktuj si\u0119 z\: {0} {1} ({2}).
+notification.mail.removed.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \r\n\r\n Zosta\u0142e\u015B wypisany z grupy przez\: {0} {1} ({2})\: \r\n\r\n Nazwa grupy\: $groupname\r\nOpis\: $groupdescription\r\n\r\nW razie pyta\u0144 skontaktuj si\u0119 z\: {0} {1} ({2}).
 notification.mail.removed.self.body=*** To jest wiadomo\u015B\u0107 generowana automatycznie, nie odpowiadaj na ni\u0105 *** \r\n\r\nWypisa\u0142e\u015B si\u0119 z grupy\: \r\n\r\nNazwa grupy\: $groupname\r\nOpis\: $groupdescription
 notification.mail.removed.self.subject=Grupa OLAT\: $groupname - Opu\u015Bci\u0142e\u015B t\u0119 grup\u0119.
 notification.mail.removed.subject=Grupa OLAT\: $groupname - Zosta\u0142e\u015B wypisany.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties
index 980fd36b493d1a9c4793efe1f591ea6e505ca5ef..952d3f4dd5d2a73ccd90ab914748ecb080e834d7 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_BR.properties
@@ -38,13 +38,13 @@ menu.opengroups.alt=Grupos de projetos que s\u00E3o publicados e reservados.
 merge.group=Juntar
 msg.alleastone.editable.group=Voc\u00EA deve selecionar pelo menos um grupo que voc\u00EA possui.
 msg.atleastone=Deve haver no m\u00EDnimo um propriet\u00E1rio neste grupo de projeto.
-notification.mail.added.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nSe voc\u00EA n\u00E3o concordar, voc\u00EA pode sair do grupo de projeto.
+notification.mail.added.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nSe voc\u00EA n\u00E3o concordar, voc\u00EA pode sair do grupo de projeto.
 notification.mail.added.self.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA criou um grupo de projeto no OLAT\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nVoc\u00EA pode apagar este grupo a qualquer momento.
 notification.mail.added.self.subject=Grupo de projeto do OLAT $groupname
 notification.mail.added.subject=Grupo de projeto do OLAT $groupname
-notification.mail.deleted.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nEstando grupo eliminado, voc\u00EA foi excluido pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es favor contactar {0} {1} ({2}).
+notification.mail.deleted.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nEstando grupo eliminado, voc\u00EA foi excluido pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es favor contactar {0} {1} ({2}).
 notification.mail.deleted.subject=Grupo de projeto do OLAT $groupname\: O grupo foi apagado
-notification.mail.removed.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nPara quest\u00F5es favor contactar {0} {1} ({2}).
+notification.mail.removed.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nPara quest\u00F5es favor contactar {0} {1} ({2}).
 notification.mail.removed.self.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA acabou de sair deste grupo de projeto\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\n
 notification.mail.removed.self.subject=Grupo de projeto do OLAT $groupname\: Voc\u00EA deixou este grupo.
 notification.mail.removed.subject=Grupo de projeto do OLAT $groupname\: Voc\u00EA saiu.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_PT.properties
index 949c45e3e9ba86c99e326289b33f7d4735400805..f1454e4d183fa58bb4847199c38e2bec14215491 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_pt_PT.properties
@@ -22,13 +22,13 @@ tools.add.buddygroup=Grupo de projeto
 tools.add.header=Criar
 tools.delete.header=Deletar
 tools.delete.unusedgroup=Grupos de projeto
-notification.mail.added.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nSe voc\u00EA n\u00E3o concordar, voc\u00EA pode sair do grupo de projeto.
+notification.mail.added.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nSe voc\u00EA n\u00E3o concordar, voc\u00EA pode sair do grupo de projeto.
 notification.mail.added.self.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA criou um grupo de projeto no OLAT\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nVoc\u00EA pode apagar este grupo a qualquer momento.
 notification.mail.added.self.subject=Grupo de projeto do OLAT $groupname
 notification.mail.added.subject=Grupo de projeto do OLAT $groupname
-notification.mail.deleted.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nEstando grupo eliminado, voc\u00EA foi excluido pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es favor contactar {0} {1} ({2}).
+notification.mail.deleted.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nEstando grupo eliminado, voc\u00EA foi excluido pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\nPara quest\u00F5es favor contactar {0} {1} ({2}).
 notification.mail.deleted.subject=Grupo de projeto do OLAT $groupname\: O grupo foi apagado
-notification.mail.removed.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({3})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nPara quest\u00F5es favor contactar {0} {1} ({2}).
+notification.mail.removed.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA foi convidado a um grupo de projeto pelo {0} {1} ({2})\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\nPara quest\u00F5es favor contactar {0} {1} ({2}).
 notification.mail.removed.self.body=*** Esta \u00E9 uma mensagem autom\u00E1tica, n\u00E3o responder *** \n\nVoc\u00EA acabou de sair deste grupo de projeto\: \n\nNome do grupo\: $groupname\nDescri\u00E7\u00E3o\: $groupdescription\n\n
 notification.mail.removed.self.subject=Grupo de projeto do OLAT $groupname\: Voc\u00EA deixou este grupo.
 notification.mail.removed.subject=Grupo de projeto do OLAT $groupname\: Voc\u00EA saiu.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ru.properties
index a11764a402602b354db7c43ad268542f3fbccee0..331a1ea1238e8b92db46568d13a296a78f4e4a22 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_ru.properties
@@ -23,13 +23,13 @@ tools.add.buddygroup=\u0420\u0430\u0431\u043E\u0447\u0430\u044F \u0433\u0440\u04
 tools.add.header=\u0421\u043E\u0437\u0434\u0430\u0442\u044C
 tools.delete.header=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
 tools.delete.unusedgroup=\u0420\u0430\u0431\u043E\u0447\u0438\u0435 \u0433\u0440\u0443\u043F\u043F\u044B
-notification.mail.added.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u043F\u0440\u0438\u0433\u043B\u0430\u0448\u0435\u043D\u044B {0} {1} ({3}) \u0432 \u0440\u0430\u0431\u043E\u0447\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u0415\u0441\u043B\u0438 \u0412\u044B \u0441 \u044D\u0442\u0438\u043C \u043D\u0435 \u0441\u043E\u0433\u043B\u0430\u0441\u043D\u044B, \u0442\u043E \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043E\u043F\u044F\u0442\u044C \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044C \u0441\u0435\u0431\u044F \u0438\u0437 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u0433\u0440\u0443\u043F\u043F\u044B.
+notification.mail.added.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u043F\u0440\u0438\u0433\u043B\u0430\u0448\u0435\u043D\u044B {0} {1} ({2}) \u0432 \u0440\u0430\u0431\u043E\u0447\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u0415\u0441\u043B\u0438 \u0412\u044B \u0441 \u044D\u0442\u0438\u043C \u043D\u0435 \u0441\u043E\u0433\u043B\u0430\u0441\u043D\u044B, \u0442\u043E \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043E\u043F\u044F\u0442\u044C \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044C \u0441\u0435\u0431\u044F \u0438\u0437 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u0433\u0440\u0443\u043F\u043F\u044B.
 notification.mail.added.self.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n \u0412\u044B \u0441\u043E\u0437\u0434\u0430\u043B\u0438 \u0432 OLAT \u0440\u0430\u0431\u043E\u0447\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0432 \u043B\u044E\u0431\u043E\u0435 \u0432\u0440\u0435\u043C\u044F \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u0443 \u0433\u0440\u0443\u043F\u043F\u0443.
 notification.mail.added.self.subject=OLAT \u0440\u0430\u0431\u043E\u0447\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 $groupname
 notification.mail.added.subject=OLAT \u0440\u0430\u0431\u043E\u0447\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 $groupname
-notification.mail.deleted.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435  *** \n\n \u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B {0} {1} ({3}) \u0438\u0437 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u0433\u0440\u0443\u043F\u043F\u044B, \u0442\u0430\u043A \u043A\u0430\u043A \u043E\u043D\u0430 \u0431\u044B\u043B\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0430\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043A {0} {1} ({2}).
+notification.mail.deleted.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435  *** \n\n \u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B {0} {1} ({2}) \u0438\u0437 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u0433\u0440\u0443\u043F\u043F\u044B, \u0442\u0430\u043A \u043A\u0430\u043A \u043E\u043D\u0430 \u0431\u044B\u043B\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0430\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043A {0} {1} ({2}).
 notification.mail.deleted.subject=OLAT \u0440\u0430\u0431\u043E\u0447\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 $groupname\: \u0413\u0440\u0443\u043F\u043F\u0430 \u0431\u044B\u043B\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0430.
-notification.mail.removed.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435  *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B {0} {1} ({3}) \u0438\u0437 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u0433\u0440\u0443\u043F\u043F\u044B\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043A {0} {1} ({2}).
+notification.mail.removed.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435  *** \n\n\u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B {0} {1} ({2}) \u0438\u0437 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u0433\u0440\u0443\u043F\u043F\u044B\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n\u041F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0439\u0442\u0435\u0441\u044C, \u043F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043A {0} {1} ({2}).
 notification.mail.removed.self.body=*** \u042D\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0439\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435 *** \n\n \u0412\u044B \u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0442\u043E \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u043B\u0438 \u0441\u0435\u0431\u044F \u0438\u0437 \u0440\u0430\u0431\u043E\u0447\u0435\u0439 \u0433\u0440\u0443\u043F\u043F\u044B\: \n\n\u0418\u043C\u044F \u0433\u0440\u0443\u043F\u043F\u044B\: $groupname\n\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435\: $groupdescription\n\n
 notification.mail.removed.self.subject=OLAT \u0440\u0430\u0431\u043E\u0447\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 $groupname\: \u0412\u044B \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u043B\u0438 \u0441\u0435\u0431\u044F \u0438\u0437 \u0433\u0440\u0443\u043F\u043F\u044B.
 notification.mail.removed.subject=OLAT \u0440\u0430\u0431\u043E\u0447\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 $groupname\: \u0412\u044B \u0431\u044B\u043B\u0438 \u0432\u044B\u0447\u0435\u0440\u043A\u043D\u0443\u0442\u044B \u0438\u0437 \u0433\u0440\u0443\u043F\u043F\u044B.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_sq.properties
index 3f079c4fc4035479d8d8092dc78dcc4a33df9979..b4d448177ab66c8f05eea2409134321691cbade1 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_sq.properties
@@ -20,13 +20,13 @@ table.header.leave=Braktis
 table.header.type=Lloji
 tools.add.buddygroup=Grup projektit
 tools.add.header=Krijo
-notification.mail.added.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nJu jeni ftuar n\u00EB grupin e projektit nga {2} {3} ({5})\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\nN\u00EBse ju nuk pajtoheni, ju mund t\u00EB shk\u00EBputeni nga grupi i projektit.
+notification.mail.added.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nJu jeni ftuar n\u00EB grupin e projektit nga {2} {3} ({2})\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\nN\u00EBse ju nuk pajtoheni, ju mund t\u00EB shk\u00EBputeni nga grupi i projektit.
 notification.mail.added.self.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nJu keni krijuar n\u00EB grup projekti n\u00EB OLAT\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\n\nJu mund t\u00EB fshini k\u00EBt\u00EB grup n\u00EB \u00E7far\u00EBdo kohe.
 notification.mail.added.self.subject=OLAT grup i projektit {0}
 notification.mail.added.subject=OLAT grupet e projektit {0}
-notification.mail.deleted.body=*** \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nPasi q\u00EB grupi i projekti \u00EBsht\u00EB fshir\u00EB, ju jeni shk\u00EBputur nga ky grup nga ana e {2} {3} ({5})\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\n\nP\u00EBr pyetje ju lutem kontaktoni {2} {3} ({4}).
+notification.mail.deleted.body=*** \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nPasi q\u00EB grupi i projekti \u00EBsht\u00EB fshir\u00EB, ju jeni shk\u00EBputur nga ky grup nga ana e {2} {3} ({2})\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\n\nP\u00EBr pyetje ju lutem kontaktoni {2} {3} ({2}).
 notification.mail.deleted.subject=OLAT grupi i projektit {0}\: Grupi \u00EBsht\u00EB fshir\u00EB
-notification.mail.removed.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nJu jeni ftuar n\u00EB nj\u00EB grup projekti nga {2} {3} ({5})\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\n\nP\u00EBr pyetje ju lutem kontaktoni {2} {3} ({4}).
+notification.mail.removed.body=*** Ky \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nJu jeni ftuar n\u00EB nj\u00EB grup projekti nga {2} {3} ({2})\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\n\nP\u00EBr pyetje ju lutem kontaktoni {2} {3} ({2}).
 notification.mail.removed.self.body=*** \u00EBsht\u00EB nj\u00EB mesazh i automatizuar, mos u p\u00EBrgjigjuni *** \n\nJu sapo jeni shk\u00EBputur nga ky grupi i projektit\: \n\nEmri i grupit\: {0}\nP\u00EBrshkrimi\: {1}\n\n
 notification.mail.removed.self.subject=OLAT grupi i projektit {0}\: J keni braktisur k\u00EBt\u00EB grup
 notification.mail.removed.subject=OLAT grupi i projektit {0}\: Ju jeni shk\u00EBputur.
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_CN.properties
index 5cddc022f9c8eb64bb9107cbc437181859e4bce9..9570141ddaef03a058fd136ee12856916f702bab 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_CN.properties
@@ -23,13 +23,13 @@ tools.add.buddygroup=\u9879\u76EE\u7EC4
 tools.add.header=\u521B\u5EFA
 tools.delete.header=\u5220\u9664
 tools.delete.unusedgroup=\u9879\u76EE\u7EC4
-notification.mail.added.body=***\u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D***\n\n\u9879\u76EE\u7EC4{2} {1} ({3})\u9080\u8BF7\u4F60\u52A0\u5165\uFF1A\n\n \u7EC4\u540D\uFF1A{0}\n \u8BF4\u660E\uFF1A{1}\n\\u \u5982\u679C\u4F60\u4E0D\u540C\u610F\uFF0C\u6CE8\u9500\u79BB\u5F00\u8BE5\u9879\u76EE\u7EC4
+notification.mail.added.body=***\u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D***\n\n\u9879\u76EE\u7EC4{2} {1} ({2})\u9080\u8BF7\u4F60\u52A0\u5165\uFF1A\n\n \u7EC4\u540D\uFF1A{0}\n \u8BF4\u660E\uFF1A{1}\n\\u \u5982\u679C\u4F60\u4E0D\u540C\u610F\uFF0C\u6CE8\u9500\u79BB\u5F00\u8BE5\u9879\u76EE\u7EC4
 notification.mail.added.self.body=***\u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D***\n\n\u4F60\u5DF2\u521B\u5EFA\u9879\u76EE\u7EC4\uFF1A \n\n\u7EC4\u540D\: {0}\n\u8BF4\u660E\: {1}\n\n\u4F60\u53EF\u4EE5\u968F\u65F6\u5220\u9664\u8BE5\u7EC4.
 notification.mail.added.self.subject=OLAT\u9879\u76EE\u7EC4{0}
 notification.mail.added.subject=OLAT\u9879\u76EE\u7EC4{0}
-notification.mail.deleted.body=*** \u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u7684\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D *** \n\n\u8BE5\u9879\u76EE\u7EC4\u5DF2\u7ECF\u88AB\u5220\u9664\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7{2} {3} ({5})\:\u6CE8\u518C \n\n\u7EC4\u540D\: {0}\n\u8BF4\u660E\: {1}\n\n\u54A8\u8BE2\uFF0C\u8BF7\u8054\u7CFB {2} {3} ({4})\u3002
+notification.mail.deleted.body=*** \u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u7684\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D *** \n\n\u8BE5\u9879\u76EE\u7EC4\u5DF2\u7ECF\u88AB\u5220\u9664\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7{2} {3} ({2})\:\u6CE8\u518C \n\n\u7EC4\u540D\: {0}\n\u8BF4\u660E\: {1}\n\n\u54A8\u8BE2\uFF0C\u8BF7\u8054\u7CFB {2} {3} ({2})\u3002
 notification.mail.deleted.subject=OLAT\u9879\u76EE\u7EC4{0}\uFF1A\u9879\u76EE\u7EC4\u5DF2\u7ECF\u88AB\u5220\u9664
-notification.mail.removed.body=***\u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D***\n\n\u9879\u76EE\u7EC4{2} {1} ({3})\u9080\u8BF7\u4F60\u52A0\u5165\uFF1A\n\n \u7EC4\u540D{0}\n \u8BF4\u660E\uFF1A{1}\n\\u \u54A8\u8BE2\uFF0C\u8BF7\u8054\u7CFB {2} {3} ({4})\u3002
+notification.mail.removed.body=***\u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D***\n\n\u9879\u76EE\u7EC4{2} {1} ({2})\u9080\u8BF7\u4F60\u52A0\u5165\uFF1A\n\n \u7EC4\u540D{0}\n \u8BF4\u660E\uFF1A{1}\n\\u \u54A8\u8BE2\uFF0C\u8BF7\u8054\u7CFB {2} {3} ({4})\u3002
 notification.mail.removed.self.body=*** \u8FD9\u662F\u4E00\u4E2A\u81EA\u52A8\u7684\u6D88\u606F\uFF0C\u8BF7\u4E0D\u8981\u56DE\u590D *** \n\n\u4F60\u5DF2\u7ECF\u6CE8\u518C\u4E86\u9879\u76EE\u7EC4\: \n\n\u7EC4\u540D\: {0}\n\u8BF4\u660E\:{1}\n\n
 notification.mail.removed.self.subject=OLAT\u9879\u76EE\u7EC4{0}\: \u4F60\u79BB\u5F00\u8FD9\u4E2A\u7EC4\u4F1A\u6BD4\u8F83\u597D.
 notification.mail.removed.subject=OLAT\u9879\u76EE\u7EC4{0}\uFF1A\u4F60\u88AB\u6CE8\u9500
diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_TW.properties
index 47cf85f57b1566bafbb66dd211e73588b86492ee..549cde1d13df05431894e63308d17ccf9e009431 100644
--- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_zh_TW.properties
@@ -23,13 +23,13 @@ tools.add.buddygroup=\u5C08\u6848\u7FA4\u7D44
 tools.add.header=\u5EFA\u7ACB
 tools.delete.header=\u522A\u9664
 tools.delete.unusedgroup=\u5C08\u6848\u7FA4\u7D44
-notification.mail.added.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u88AB{0} {1} ({3})\u9080\u8ACB\u52A0\u5165\u4E00\u500B\u5C08\u6848\u7FA4\u7D44\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\\u\u5982\u679C\u60A8\u4E0D\u540C\u610F\uFF0C\u60A8\u53EF\u8A3B\u92B7\u9019\u500B\u5C08\u6848\u7FA4\u7D44\u3002
+notification.mail.added.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u88AB{0} {1} ({2})\u9080\u8ACB\u52A0\u5165\u4E00\u500B\u5C08\u6848\u7FA4\u7D44\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A$groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\\u\u5982\u679C\u60A8\u4E0D\u540C\u610F\uFF0C\u60A8\u53EF\u8A3B\u92B7\u9019\u500B\u5C08\u6848\u7FA4\u7D44\u3002
 notification.mail.added.self.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u5DF2\u5728OLAT\u5EFA\u7ACB\u4E00\u500B\u5C08\u6848\u7FA4\u7D44\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A $groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\n\u60A8\u53EF\u4EE5\u65BC\u4EFB\u4F55\u6642\u9593\u522A\u9664\u9019\u500B\u7FA4\u7D44\u3002
 notification.mail.added.self.subject=OLAT \u5C08\u6848\u7FA4\u7D44 $groupname
 notification.mail.added.subject=OLAT \u5C08\u6848\u7FA4\u7D44 $groupname
-notification.mail.deleted.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u65E2\u7136\u9019\u500B\u5C08\u6848\u7FA4\u7D44\u88AB\u522A\u9664\u4E86\uFF0C\u60A8\u5C07\u88AB{0} {1} ({3})\u5F9E\u5B83\u8A3B\u92B7\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A $groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\n\u5982\u679C\u6709\u554F\u984C\u8ACB\u806F\u7D61 {0} {1} ({2})\u3002
+notification.mail.deleted.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u65E2\u7136\u9019\u500B\u5C08\u6848\u7FA4\u7D44\u88AB\u522A\u9664\u4E86\uFF0C\u60A8\u5C07\u88AB{0} {1} ({2})\u5F9E\u5B83\u8A3B\u92B7\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A $groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\n\u5982\u679C\u6709\u554F\u984C\u8ACB\u806F\u7D61 {0} {1} ({2})\u3002
 notification.mail.deleted.subject=OLAT \u5C08\u6848\u7FA4\u7D44 $groupname\: \u9019\u500B\u7FA4\u7D44\u5DF2\u88AB\u522A\u9664
-notification.mail.removed.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u5DF2\u88AB {0} {1} ({3})\u8A3B\u92B7\u9019\u500B\u5C08\u6848\u7FA4\u7D44\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A $groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\n\u5982\u679C\u6709\u554F\u984C\u8ACB\u6D3D {0} {1} ({2})\u3002
+notification.mail.removed.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u5DF2\u88AB {0} {1} ({2})\u8A3B\u92B7\u9019\u500B\u5C08\u6848\u7FA4\u7D44\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A $groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\n\u5982\u679C\u6709\u554F\u984C\u8ACB\u6D3D {0} {1} ({2})\u3002
 notification.mail.removed.self.body=*** \u9019\u662F\u4E00\u500B\u81EA\u52D5\u767C\u9001\u7684\u8A0A\u606F\uFF0C\u8ACB\u4E0D\u8981\u56DE\u8986 *** \n\n\u60A8\u525B\u8A3B\u92B7\u4E86\u9019\u500B\u5C08\u6848\u7FA4\u7D44\uFF1A \n\n\u7FA4\u7D44\u540D\u7A31\uFF1A $groupname\n\u8AAA\u660E\uFF1A $groupdescription\n\n
 notification.mail.removed.self.subject=OLAT \u5C08\u6848\u7FA4\u7D44 $groupname\: \u60A8\u5DF2\u6C38\u4E45\u5730\u9000\u51FA\u9019\u500B\u7FA4\u7D44\u3002
 notification.mail.removed.subject=OLAT \u5C08\u6848\u7FA4\u7D44 $groupname\: \u60A8\u5DF2\u7D93\u8A3B\u92B7\u4E86\u3002
diff --git a/src/main/java/org/olat/group/ui/wizard/MemberListWizardController.java b/src/main/java/org/olat/group/ui/wizard/MemberListWizardController.java
deleted file mode 100644
index c3d81051ee1181227f5cac7a8e9b65908dbedb00..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/group/ui/wizard/MemberListWizardController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-package org.olat.group.ui.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.choice.Choice;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.panel.Panel;
-import org.olat.core.gui.components.table.GenericObjectArrayTableDataModel;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.BasicController;
-import org.olat.core.gui.control.generic.choice.ChoiceController;
-import org.olat.core.gui.control.generic.wizard.WizardController;
-import org.olat.core.gui.media.CleanupAfterDeliveryFileMediaResource;
-import org.olat.core.gui.media.MediaResource;
-import org.olat.core.gui.translator.Translator;
-import org.olat.core.id.Roles;
-import org.olat.group.BusinessGroup;
-import org.olat.group.BusinessGroupService;
-import org.olat.group.area.BGArea;
-import org.olat.group.area.BGAreaManager;
-import org.olat.resource.OLATResource;
-import org.olat.user.UserManager;
-import org.olat.user.propertyhandlers.UserPropertyHandler;
-
-/**
- * 
- * Description:<br>
- * Wizard for choosing the format of the member list archive. <p>
- * 
- * First step: choose the interest groups/areas <p>
- * Second step: choose the columns for the user info (e.g. username, firstname, lastname, ...) <p>
- * Third step: choose the output format type, either output all members in a single .xls file,
- * or create a zip with a .xls file per group. <p>
- * Fourth step: Download file and cleanup temp file upon dispose.
- * 
- * <P>
- * Initial Date:  30.07.2007 <br>
- * @author Lavinia Dumitrescu
- */
-public class MemberListWizardController extends BasicController {
-					
-	private OLATResource resource;
-	private ChoiceController colsChoiceController;
-	private Choice groupsOrAreaChoice;		
-	private ChoiceController outputChoiceController;
-	
-	private Panel main;
-	private WizardController wizardController;
-	private int wizardSteps = 4;
-	
-	public final static String GROUPS_MEMBERS = "g_m";
-	public final static String AREAS_MEMBERS = "a_m";
-	private String wizardType = GROUPS_MEMBERS; //default
-	
-	private VelocityContainer velocityContainer2;
-	private VelocityContainer velocityContainer3;
-	private VelocityContainer velocityContainer4;
-	private Link backToFirstChoice;
-	private Link backToSecondChoice;
-	private Link showFileLink;
-	
-	private List<String> columList;
-	private List<BusinessGroup> groupList;		
-	private List<BGArea> areaList;		
-	private String archiveType;
-	private MediaResource archiveMediaResource;
-	private static final String usageIdentifyer = MemberListWizardController.class.getCanonicalName();
-	private Translator propertyHandlerTranslator;
-	
-	private final BusinessGroupService businessGroupService;
-	private final BGAreaManager areaManager;
-	
-	/**
-	 * 
-	 * @param ureq
-	 * @param wControl
-	 * @param context
-	 * @param type
-	 */
-	public MemberListWizardController(UserRequest ureq, WindowControl wControl, OLATResource resource, String type) {
-		super(ureq, wControl);
-		
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
-		areaManager = CoreSpringFactory.getImpl(BGAreaManager.class);
-		this.resource = resource;
-		propertyHandlerTranslator = UserManager.getInstance().getPropertyHandlerTranslator(getTranslator());
-		
-		if(GROUPS_MEMBERS.equals(type) || AREAS_MEMBERS.equals(type)) {
-		  this.wizardType = type;
-		}
-		
-		columList = new ArrayList<String>();
-		groupList = new ArrayList<BusinessGroup>();	
-		areaList = new ArrayList<BGArea>();
-		main = new Panel("main");
-				
-		//init wizard step 1
-		groupsOrAreaChoice = new Choice("groupsOrAreaChoice", getTranslator());
-		groupsOrAreaChoice.setTableDataModel(getGroupOrAreaChoiceTableDataModel(resource));
-		groupsOrAreaChoice.addListener(this);
-		groupsOrAreaChoice.setSubmitKey("next");
-		
-    //init wizard step 2		
-		boolean singleSelection = false;
-		boolean layoutVertical = true;
-		String[] keys = getColsChoiceKeys(ureq);	
-		String[] selectedKeys = getFirstN(keys, 4);
-		colsChoiceController = new ChoiceController(ureq, getWindowControl(), keys, getTranslatedKeys(propertyHandlerTranslator,keys), selectedKeys, singleSelection, layoutVertical, "next");		
-		this.listenTo(colsChoiceController);
-				
-		wizardController = new WizardController(ureq, wControl, wizardSteps);		
-		this.listenTo(wizardController);
-		wizardController.setWizardTitle(translate("memberlistwizard.title"));		
-		if (GROUPS_MEMBERS.equals(wizardType)) {
-			wizardController.setNextWizardStep(translate("memberlistwizard.groupchoice"), groupsOrAreaChoice);
-		} else if (AREAS_MEMBERS.equals(wizardType)) {
-			wizardController.setNextWizardStep(translate("memberlistwizard.areachoice"), groupsOrAreaChoice);
-		}	
-		main.setContent(wizardController.getInitialComponent());		
-		this.putInitialPanel(main);
-		
-    // step 2		
-		velocityContainer2 = this.createVelocityContainer("listWizardStep2");
-		backToFirstChoice = LinkFactory.createLinkBack(velocityContainer2,this); 
-    // step 3		
-		velocityContainer3 = this.createVelocityContainer("listWizardStep3");
-		backToSecondChoice = LinkFactory.createLinkBack(velocityContainer3,this);
-		//last step		
-		velocityContainer4 = this.createVelocityContainer("listWizardStep4");
-		showFileLink = LinkFactory.createButton("showfile", velocityContainer4, this);
-		//mark that this link starts a download
-		LinkFactory.markDownloadLink(showFileLink);
-	}
-	
-	/**
-	 * 
-	 * @param keys
-	 * @param n
-	 * @return an array with the first n elements of the input array
-	 */
-	private String[] getFirstN(String[] keys, int n) {			
-		if(n<0 || n>keys.length) {
-			n = keys.length;
-		}
-		String[] selKeys = new String[n];
-		for(int i=0; i<n; i++) {
-			selKeys[i] = keys[i];
-		}
-		return selKeys;
-	}
-	
-	private String[] getColsChoiceKeys(UserRequest ureq) {	
-		Roles roles = ureq.getUserSession().getRoles();
-		boolean isAdministrativeUser = (roles.isAuthor() || roles.isGroupManager() || roles.isUserManager() || roles.isOLATAdmin());	
-		List<UserPropertyHandler> userPropertyHandlers = UserManager.getInstance().getUserPropertyHandlersFor(usageIdentifyer, isAdministrativeUser);
-		Iterator<UserPropertyHandler> propertyIterator =  userPropertyHandlers.iterator();
-		ArrayList<String> array = new ArrayList<String>();
-		//add username first, next the user properties
-		array.add("username");
-		while(propertyIterator.hasNext()) {
-			array.add(propertyIterator.next().i18nColumnDescriptorLabelKey());
-		}
-		String[] keys = new String[array.size()];
-		keys = array.toArray(keys);
-		return keys;		
-	}
-	
-	private String[] getTranslatedKeys(Translator keyTranslator,String[] keys) {
-		int size = keys.length;
-		String[] translated = new String[size];
-		for(int i=0; i<size; i++) {
-			translated[i] = keyTranslator.translate(keys[i]);
-		}
-		return translated;
-	}
-	
-	
-	/**
-	 * Creates a <code>Choice</code> <code>TableDataModel</code> for the group/area choice. <br>
-	 * It contains two columns: booleans (true per default) on the first column, and ObjectWrappers for the
-	 * second column.
-	 * @param context
-	 * @return a GenericObjectArrayTableDataModel instead of a TableDataModel since it has to provide a setValueAt method.
-	 */
-	private GenericObjectArrayTableDataModel getGroupOrAreaChoiceTableDataModel(OLATResource resource) {
-		List<Object[]> objectArrays = new ArrayList<Object[]>();
-		if (GROUPS_MEMBERS.equals(wizardType)) {
-			List<BusinessGroup> groups = businessGroupService.findBusinessGroups(null, resource, 0, -1);
-			Collections.sort(groups, new Comparator<BusinessGroup>() {
-				@Override
-				public int compare(BusinessGroup g1, BusinessGroup g2) {
-					return g1.getName().compareTo(g2.getName());
-				}
-			});
-			for (BusinessGroup group : groups) {
-				Object[] groupChoiceRowData = new Object[2];
-				groupChoiceRowData[0] = new Boolean(true);
-				groupChoiceRowData[1] = new ObjectWrapper(group);
-				objectArrays.add(groupChoiceRowData);
-			}
-		} else if (AREAS_MEMBERS.equals(wizardType)) {
-			List<BGArea> areas = areaManager.findBGAreasInContext(resource);
-			Collections.sort(areas, new Comparator<BGArea>() {
-				@Override
-				public int compare(BGArea a1, BGArea a2) {
-					return a1.getName().compareTo(a2.getName());
-				}
-			});
-			for (BGArea area:areas) {
-				Object[] groupChoiceRowData = new Object[2];
-				groupChoiceRowData[0] = new Boolean(true);
-				groupChoiceRowData[1] = new ObjectWrapper(area);
-				objectArrays.add(groupChoiceRowData);
-			}
-		}
-		GenericObjectArrayTableDataModel tableModel = new GenericObjectArrayTableDataModel(objectArrays, 2);
-		return tableModel;
-	}
-		
-	
-	public void event(UserRequest ureq, Component source, Event event) {
-		// default wizard will listen to cancel wizard event
-		wizardController.event(ureq, source, event);
-		// wizard steps events
-		if (source == groupsOrAreaChoice) {
-			if (event == Choice.EVNT_VALIDATION_OK) {
-				List<Integer> selRows = groupsOrAreaChoice.getSelectedRows();
-				if (selRows.size() == 0) {
-					if (GROUPS_MEMBERS.equals(wizardType)) {						
-						this.showError("error.selectatleastonegroup");
-					} else if (AREAS_MEMBERS.equals(wizardType)) {						
-						this.showError("error.selectatleastonearea");
-					}
-				} else {
-					if (GROUPS_MEMBERS.equals(wizardType)) {						
-						setGroupList(getSelectedGroups(groupsOrAreaChoice));
-					} else if (AREAS_MEMBERS.equals(wizardType)) {						
-						setAreaList(getSelectedAreas(groupsOrAreaChoice));				
-					}								
-					velocityContainer2.put("colsChoice", colsChoiceController.getInitialComponent());				
-					wizardController.setNextWizardStep(translate("memberlistwizard.colchoice"), velocityContainer2);					
-				}
-			}
-		} else if (source == backToFirstChoice) {
-			syncTableModelWithSelection(groupsOrAreaChoice);
-			if (GROUPS_MEMBERS.equals(wizardType)) {
-				wizardController.setBackWizardStep(translate("memberlistwizard.groupchoice"), groupsOrAreaChoice);
-			} else if (AREAS_MEMBERS.equals(wizardType)) {
-				wizardController.setBackWizardStep(translate("memberlistwizard.areachoice"), groupsOrAreaChoice);
-			}
-		} else if (source == backToSecondChoice) {			
-			wizardController.setBackWizardStep(translate("memberlistwizard.colchoice"), velocityContainer2);		
-		} else if (source == showFileLink) {			
-			ureq.getDispatchResult().setResultingMediaResource(this.getArchiveMediaResource());
-		}
-	}
-	
-	/**
-	 * 
-	 * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest, org.olat.core.gui.control.Controller, org.olat.core.gui.control.Event)
-	 */
-	public void event(UserRequest ureq, Controller source, Event event) {
-		if(source == wizardController) {
-			if (event == Event.CANCELLED_EVENT) {
-				fireEvent(ureq, event);
-			}
-		}	else if (source == outputChoiceController) {
-			if (event == Event.DONE_EVENT) {
-				List<String> selected = outputChoiceController.getSelectedEntries();
-				if(selected.size()==0) {					
-					this.showError("error.selectonevalue");
-				} else {					
-					this.setArchiveType(selected.iterator().next());
-					
-					File outputFile = archiveMembers(ureq);
-					velocityContainer4.contextPut("filename", outputFile.getName());
-					wizardController.setWizardTitle(translate("memberlistwizard.finished.title"));
-					wizardController.setNextWizardStep(translate("memberlistwizard.finished"), velocityContainer4);					
-					this.setArchiveMediaResource(new CleanupAfterDeliveryFileMediaResource(outputFile));
-				}
-			}
-		} else if (source == colsChoiceController) {
-			if (event == Event.DONE_EVENT) {
-				List<String> selected = colsChoiceController.getSelectedEntries();
-				if (selected.size() == 0) {					
-					this.showError("error.selectatleastonecolumn");
-				} else {					
-					this.setColumList(selected);
-					
-					boolean singleSelection = true;
-					boolean layoutVertical = true;
-					String[] keys = new String[]{"memberlistwizard.archive.type.filePerGroupOrAreaInclGroupMembership", "memberlistwizard.archive.type.filePerGroupOrArea", "memberlistwizard.archive.type.allInOne"};
-					String[] translatedKeys = new String[]{translate("memberlistwizard.archive.type.filePerGroupOrAreaInclGroupMembership"), translate("memberlistwizard.archive.type.filePerGroupOrArea"),translate("memberlistwizard.archive.type.allInOne")};
-					String[] selectedKeys = new String[]{"memberlistwizard.archive.type.allInOne"};
-					outputChoiceController = new ChoiceController(ureq, getWindowControl(), keys, translatedKeys, selectedKeys, singleSelection, layoutVertical, "next");					
-					this.listenTo(outputChoiceController);
-					velocityContainer3.put("outputChoice", outputChoiceController.getInitialComponent());					
-					wizardController.setNextWizardStep(translate("memberlistwizard.outputchoice"), velocityContainer3);
-				}
-			}			
-		}
-	}
-	
-	
-	/**
-	 * Calls the archiveMembers method on <code>BusinessGroupArchiver</code>.
-	 * @return the output file.
-	 */
-	private File archiveMembers(UserRequest ureq) {
-		File outputFile = null;
-		List<String> columnList = getColumList();
-		List<BusinessGroup> groupList = getGroupList();
-		String archiveType = getArchiveType();
-		List<BGArea> areaList = getAreaList();
-		
-		Locale userLocale = ureq.getLocale();
-    String charset = UserManager.getInstance().getUserCharset(ureq.getIdentity());
-		
-		if(GROUPS_MEMBERS.equals(wizardType)) {
-			outputFile = businessGroupService.archiveGroupMembers(resource, columnList, groupList, archiveType, userLocale, charset);	
-		} else if(AREAS_MEMBERS.equals(wizardType)) {
-			outputFile = areaManager.archiveAreaMembers(resource, columnList, areaList, archiveType, userLocale, charset);
-		}			
-		return outputFile;
-	}	
-	
-	/**
-	 * Gets the list of the values in the second column of the tableDataModel of the input "choice",
-	 * where the first column value is true.
-	 * @param choice
-	 * @return a list with the selected values of the input choice component.
-	 */
-	private List<BGArea> getSelectedAreas(Choice choice) {	
-		List<BGArea> selValues = new ArrayList<BGArea>();
-		List<Integer> selRowsIndexes = choice.getSelectedRows();
-		int numRows = choice.getTableDataModel().getRowCount();
-		for(int i=0; i<numRows; i++) {
-			if(selRowsIndexes.size() == 0) {
-				boolean booleanValue = ((Boolean)choice.getTableDataModel().getValueAt(i, 0)).booleanValue();
-				if(booleanValue) {
-					ObjectWrapper objWrapper = (ObjectWrapper)choice.getTableDataModel().getValueAt(i, 1); 
-					if(objWrapper.getWrappedObj() instanceof BGArea) {
-						selValues.add((BGArea)objWrapper.getWrappedObj());
-					}
-				}
-			} else if(selRowsIndexes.contains(new Integer(i))) {
-				ObjectWrapper objWrapper = (ObjectWrapper)choice.getTableDataModel().getValueAt(i, 1); 
-				if(objWrapper.getWrappedObj() instanceof BGArea) {
-					selValues.add((BGArea)objWrapper.getWrappedObj());
-				}
-			}					
-		}		
-		return selValues;
-	}
-	
-	private List<BusinessGroup> getSelectedGroups(Choice choice) {	
-		List<BusinessGroup> selValues = new ArrayList<BusinessGroup>();
-		List<Integer> selRowsIndexes = choice.getSelectedRows();
-		int numRows = choice.getTableDataModel().getRowCount();
-		for(int i=0; i<numRows; i++) {
-			if(selRowsIndexes.size() == 0) {
-				boolean booleanValue = ((Boolean)choice.getTableDataModel().getValueAt(i, 0)).booleanValue();
-				if(booleanValue) {
-					ObjectWrapper objWrapper = (ObjectWrapper)choice.getTableDataModel().getValueAt(i, 1); 
-					if(objWrapper.getWrappedObj() instanceof BusinessGroup) {
-						selValues.add((BusinessGroup)objWrapper.getWrappedObj());
-					}
-				}
-			} else if(selRowsIndexes.contains(new Integer(i))) {
-				ObjectWrapper objWrapper = (ObjectWrapper)choice.getTableDataModel().getValueAt(i, 1); 
-				if(objWrapper.getWrappedObj() instanceof BusinessGroup) {
-					selValues.add((BusinessGroup)objWrapper.getWrappedObj());
-				}
-			}					
-		}		
-		return selValues;
-	}
-	
-	/**
-	 * Synchronizes the Choice's tableDataModel with its selection/removed status.
-	 * @param choice
-	 */
-	private void syncTableModelWithSelection(Choice choice) {
-		GenericObjectArrayTableDataModel tableDataModel = (GenericObjectArrayTableDataModel)choice.getTableDataModel();
-		List<Integer> removedRowsIndexes = choice.getRemovedRows();
-		if(removedRowsIndexes.size()>0) {
-			int numRows = choice.getTableDataModel().getRowCount();
-			for(int i=0; i<numRows; i++) {
-				if(removedRowsIndexes.contains(new Integer(i))) {				  
-				  tableDataModel.setValueAt(new Boolean(false), i, 0);
-				}
-			}
-		}		
-	}
-	
-	private String getArchiveType() {
-		return archiveType;
-	}
-	
-	private void setArchiveType(String archiveType) {
-		this.archiveType = archiveType;
-	}
-
-	private List<String> getColumList() {
-		return columList;
-	}
-	
-	private void setColumList(List<String> columList) {
-		this.columList = columList;		
-	}
-	
-	private List<BusinessGroup> getGroupList() {
-		return groupList;
-	}	
-	
-	private void setGroupList(List<BusinessGroup> groupList) {
-		this.groupList = groupList;
-	}
-	
-	private List<BGArea> getAreaList() {
-		return areaList;
-	}
-
-	private void setAreaList(List<BGArea> areaList) {
-		this.areaList = areaList;
-	}	
-	
-	private MediaResource getArchiveMediaResource() {
-		return archiveMediaResource;
-	}
-
-	private void setArchiveMediaResource(MediaResource archiveMediaResource) {
-		this.archiveMediaResource = archiveMediaResource;
-	}
-	
-	protected void doDispose() {
-		//child controllers registrered with listenTo() are disposed in BasicController
-	}
-		
-	/**
-	 * 
-	 * Description:<br>
-	 * Wraps <code>BusinessGroup</code>, <code>BGArea</code>, and Strings. <p>
-	 * If more objects types to wrap adapt the toString method.
-	 * 
-	 * <P>
-	 * Initial Date:  30.07.2007 <br>
-	 * @author Lavinia Dumitrescu
-	 */
-	private class ObjectWrapper {
-		private Object wrappedObj;
-		
-		public ObjectWrapper(Object wrappedObj) {
-			this.wrappedObj = wrappedObj;
-		}
-		
-		public String toString() {
-			if(wrappedObj instanceof BusinessGroup) {
-				return ((BusinessGroup)wrappedObj).getName();
-			} else if (wrappedObj instanceof BGArea) {
-				return ((BGArea)wrappedObj).getName();
-			} else if (wrappedObj instanceof String) {
-				return translate((String)wrappedObj);
-			} else {
-				return wrappedObj.toString();
-			}
-		}
-		public Object getWrappedObj() {
-			return wrappedObj;
-		}
-	}
-}
diff --git a/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java b/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
index 8c3eddc518a5527b600339d40b1118269d575588..afacd0e07adb71ff10b8343b87bf622731a65a30 100644
--- a/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
+++ b/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
@@ -533,10 +533,10 @@ public class QTIEditorMainController extends MainLayoutBasicController implement
 					// sein wenn man nur ein Menü braucht.
 					// TODO:pb:a extend ContentOnlyController to work also if menu and
 					// tool are null, hence only content is desired
-					String userN = ureq.getIdentity().getName();
+					String userN = ureq.getIdentity().getUser().getProperty(UserConstants.EMAIL, ureq.getLocale());
 					String lastN = ureq.getIdentity().getUser().getProperty(UserConstants.LASTNAME, ureq.getLocale());
 					String firstN = ureq.getIdentity().getUser().getProperty(UserConstants.FIRSTNAME, ureq.getLocale());
-					String changeMsg = "Changed by: " + firstN + " " + lastN + " [" + userN + "]\n";//TODO username
+					String changeMsg = "Changed by: " + firstN + " " + lastN + " [" + userN + "]\n";
 					changeMsg += createChangeMessage();
 					changeEmail.setBodyText(changeMsg);
 					chngMsgFormVC.contextPut("chngMsg", changeEmail.getBodyText());
diff --git a/src/main/java/org/olat/ims/qti/export/QTIExportFormatterCSVType1.java b/src/main/java/org/olat/ims/qti/export/QTIExportFormatterCSVType1.java
index 65cc8600d26a1a2945cb61d9d7559e7ff79e8fda..110d2d5856a7b3133bc31e855f511004e084ef87 100644
--- a/src/main/java/org/olat/ims/qti/export/QTIExportFormatterCSVType1.java
+++ b/src/main/java/org/olat/ims/qti/export/QTIExportFormatterCSVType1.java
@@ -25,6 +25,7 @@
 
 package org.olat.ims.qti.export;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -33,6 +34,8 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.olat.core.id.context.BusinessControlFactory;
+import org.olat.core.id.context.ContextEntry;
 import org.olat.core.logging.OLATRuntimeException;
 import org.olat.core.util.Formatter;
 import org.olat.core.util.filter.FilterFactory;
@@ -185,7 +188,8 @@ public class QTIExportFormatterCSVType1 extends QTIExportFormatter {
 		
 		String firstName = set.getFirstName();
 		String lastName = set.getLastName();
-		String login = set.getLogin();//TODO username
+		ContextEntry ce = BusinessControlFactory.getInstance().createContextEntry(set.getIdentity());
+		String login = BusinessControlFactory.getInstance().getAsURIString(Collections.singletonList(ce), false);
 		String instUsrIdent = set.getInstitutionalUserIdentifier();
 		if (instUsrIdent == null) {
 			instUsrIdent = translator.translate("column.field.notavailable");
diff --git a/src/main/java/org/olat/ldap/ui/IdentitySelectionTreeModel.java b/src/main/java/org/olat/ldap/ui/IdentitySelectionTreeModel.java
index fb16c6db8c3ed612c93dd0bb7417c8cb2cb46331..7848ee4b3921e13059d5bddea4c329f95467b0be 100644
--- a/src/main/java/org/olat/ldap/ui/IdentitySelectionTreeModel.java
+++ b/src/main/java/org/olat/ldap/ui/IdentitySelectionTreeModel.java
@@ -66,7 +66,7 @@ public class IdentitySelectionTreeModel  extends GenericTreeModel implements INo
 		for (Identity identity : identities) {
 			// collect user name information
 			StringBuffer sb = new StringBuffer();
-			sb.append(identity.getName()).append(": ");//TODO username
+			sb.append(identity.getName()).append(": ");
 			boolean first = true;
 			// collect user properties information
 			for (UserPropertyHandler userProperty : properHandlerList) {
diff --git a/src/main/java/org/olat/modules/tu/TunnelComponent.java b/src/main/java/org/olat/modules/tu/TunnelComponent.java
index ddfa5f82bd5d14c3e51406f3c6d0835418dec353..c02022e97b089c5ed8c601088a6a5f709e53a78d 100644
--- a/src/main/java/org/olat/modules/tu/TunnelComponent.java
+++ b/src/main/java/org/olat/modules/tu/TunnelComponent.java
@@ -36,6 +36,8 @@ import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
+import org.olat.basesecurity.BaseSecurityModule;
+import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.ComponentRenderer;
@@ -175,18 +177,20 @@ public class TunnelComponent extends Component implements AsyncMediaResponsible
 	 * @param userRequest
 	 */
 	private void fillTURequestWithUserInfo(TURequest tuRequest, UserRequest userRequest){
-		String userName = userRequest.getIdentity().getName();//TODO username
-		User u = userRequest.getIdentity().getUser();
-		String lastName = u.getProperty(UserConstants.LASTNAME, loc);
-		String firstName = u.getProperty(UserConstants.FIRSTNAME, loc);
-		String email = u.getProperty(UserConstants.EMAIL, loc);
-		String userIPAdress = userRequest.getUserSession().getSessionInfo().getFromIP();
-		
-		tuRequest.setEmail(email);
-		tuRequest.setFirstName(firstName);
-		tuRequest.setLastName(lastName);
-		tuRequest.setUserName(userName);
-		tuRequest.setUserIPAddress(userIPAdress);
+		if("enabled".equals(CoreSpringFactory.getImpl(BaseSecurityModule.class).getUserInfosTunnelCourseBuildingBlock())) {
+			String userName = userRequest.getIdentity().getName();
+			User u = userRequest.getIdentity().getUser();
+			String lastName = u.getProperty(UserConstants.LASTNAME, loc);
+			String firstName = u.getProperty(UserConstants.FIRSTNAME, loc);
+			String email = u.getProperty(UserConstants.EMAIL, loc);
+			String userIPAdress = userRequest.getUserSession().getSessionInfo().getFromIP();
+			
+			tuRequest.setEmail(email);
+			tuRequest.setFirstName(firstName);
+			tuRequest.setLastName(lastName);
+			tuRequest.setUserName(userName);
+			tuRequest.setUserIPAddress(userIPAdress);
+		}
 	}
 
 	
@@ -298,11 +302,14 @@ public class TunnelComponent extends Component implements AsyncMediaResponsible
 		// Add olat specific headers to the request, can be used by external
 		// applications to identify user and to get other params
 		// test page e.g. http://cgi.algonet.se/htbin/cgiwrap/ug/test.py
-		meth.addRequestHeader("X-OLAT-USERNAME", tuReq.getUserName());
-		meth.addRequestHeader("X-OLAT-LASTNAME", tuReq.getLastName());
-		meth.addRequestHeader("X-OLAT-FIRSTNAME", tuReq.getFirstName());
-		meth.addRequestHeader("X-OLAT-EMAIL", tuReq.getEmail());
-		meth.addRequestHeader("X-OLAT-USERIP", tuReq.getUserIPAddress());
+
+		if("enabled".equals(CoreSpringFactory.getImpl(BaseSecurityModule.class).getUserInfosTunnelCourseBuildingBlock())) {
+			meth.addRequestHeader("X-OLAT-USERNAME", tuReq.getUserName());
+			meth.addRequestHeader("X-OLAT-LASTNAME", tuReq.getLastName());
+			meth.addRequestHeader("X-OLAT-FIRSTNAME", tuReq.getFirstName());
+			meth.addRequestHeader("X-OLAT-EMAIL", tuReq.getEmail());
+			meth.addRequestHeader("X-OLAT-USERIP", tuReq.getUserIPAddress());
+		}
 
 		try {
 			client.executeMethod(meth);
diff --git a/src/main/java/org/olat/registration/PwChangeController.java b/src/main/java/org/olat/registration/PwChangeController.java
index 761f0589b986603af56a5417bb782efd1defa51c..0dc96daf286ee7df8357715f2e10c5733e268a98 100644
--- a/src/main/java/org/olat/registration/PwChangeController.java
+++ b/src/main/java/org/olat/registration/PwChangeController.java
@@ -226,7 +226,7 @@ public class PwChangeController extends BasicController {
 					TemporaryKey tk = rm.loadTemporaryKeyByEmail(emailAdress);
 					if (tk == null) tk = rm.createTemporaryKeyByEmail(emailAdress, ip, RegistrationManager.PW_CHANGE);
 					myContent.contextPut("pwKey", tk.getRegistrationKey());
-					body = userTrans.translate("pwchange.intro", new String[] { identity.getName() })//TODO username
+					body = userTrans.translate("pwchange.intro", new String[] { identity.getName() })
 							+ userTrans.translate("pwchange.body", new String[] { serverpath, tk.getRegistrationKey(),
 									I18nManager.getInstance().getLocaleKey(ureq.getLocale()) }) + SEPARATOR
 							+ userTrans.translate("reg.wherefrom", new String[] { serverpath, today, ip });
diff --git a/src/main/java/org/olat/repository/RepositoryMailing.java b/src/main/java/org/olat/repository/RepositoryMailing.java
index d273166f52bb486b518b4daf9ead65e71d8ca72d..cf96ac8842fe3306d93c4de96e2f2c6c97671c71 100644
--- a/src/main/java/org/olat/repository/RepositoryMailing.java
+++ b/src/main/java/org/olat/repository/RepositoryMailing.java
@@ -149,7 +149,7 @@ public class RepositoryMailing {
 				actor.getUser().getProperty(UserConstants.FIRSTNAME, null),
 				actor.getUser().getProperty(UserConstants.LASTNAME, null),
 				actor.getUser().getProperty(UserConstants.EMAIL, null),
-				actor.getName()
+				actor.getUser().getProperty(UserConstants.EMAIL, null)// 2x for compatibility with old i18m properties
 			};
 		
 		Locale locale = I18nManager.getInstance().getLocaleOrDefault(actor.getUser().getPreferences().getLanguage());
@@ -168,7 +168,7 @@ public class RepositoryMailing {
 				User user = identity.getUser();
 				context.put("firstname", user.getProperty(UserConstants.FIRSTNAME, null));
 				context.put("lastname", user.getProperty(UserConstants.LASTNAME, null));
-				context.put("login", identity.getName());//TODO username
+				context.put("login",  user.getProperty(UserConstants.EMAIL, null));
 				// Put variables from greater context
 				context.put("coursename", reName);
 				context.put("coursedescription", redescription);
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
index cb0e2dd1b5a3b2615590d2c0066498dd12cbe348..c9126b628ec74ad62c7d74aa38db1004efda59f8 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
@@ -471,7 +471,7 @@ wizardsteptitledescription=Beschreibung eintragen
 wizardsteptitleproperties=Einstellungen vornehmen 
 wizardsteptitleupload=Datei hochladen
 notification.mail.added.subject=Kurs $coursename 
-notification.mail.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) in einen Kurs eingeladen\: \n\nKursname\: $coursename\nBeschreibung\: $coursedescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
+notification.mail.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) in einen Kurs eingeladen\: \n\nKursname\: $coursename\nBeschreibung\: $coursedescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
 notification.mail.removed.subject=Kurs $coursename\: Sie wurden ausgetragen.
-notification.mail.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({3}) aus dem Kurs ausgetragen\: \n\nKursname\: $coursename\nBeschreibung\: $coursedescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
+notification.mail.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\nSie wurden von {0} {1} ({2}) aus dem Kurs ausgetragen\: \n\nKursname\: $coursename\nBeschreibung\: $coursedescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}).
 
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
index e7b5bce01cc32221aa0e1a7365ac3472d8f9014d..0a65b677ffbb5ec76df6ffa800ee74da0a99d58b 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
@@ -308,9 +308,9 @@ new.test=Create test
 new.test.intro=Create new test
 new.wiki=Create wiki
 new.wiki.intro=Create new wiki
-notification.mail.added.body=*** This is an automatically generated message. Please do not answer to this message *** \r\n\r\nYou have been added by {0} {1} ({3}) to a course\:\r\n\r\nCourse name\: $coursename\r\nDescription\: $coursedescription\r\n\r\nIf you have questions regarding this action, please contact {0} {1} ({2}).
+notification.mail.added.body=*** This is an automatically generated message. Please do not answer to this message *** \r\n\r\nYou have been added by {0} {1} ({2}) to a course\:\r\n\r\nCourse name\: $coursename\r\nDescription\: $coursedescription\r\n\r\nIf you have questions regarding this action, please contact {0} {1} ({2}).
 notification.mail.added.subject=Course $coursename
-notification.mail.removed.body=*** This is an automatically generated message. Please do not answer to this message *** \r\n\r\nYou have been removed by {0} {1} ({3}) from a course\:\r\n\r\nCourse name\: $coursename\r\nDescription\: $coursedescription\r\n\r\nIf you have questions regarding this action, please contact {0} {1} ({2}).
+notification.mail.removed.body=*** This is an automatically generated message. Please do not answer to this message *** \r\n\r\nYou have been removed by {0} {1} ({2}) from a course\:\r\n\r\nCourse name\: $coursename\r\nDescription\: $coursedescription\r\n\r\nIf you have questions regarding this action, please contact {0} {1} ({2}).
 notification.mail.removed.subject=Course $coursename\: you have been removed.
 properties.for=Settings - {0}
 referencableSearch.cmd.allEntries=All entries
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 60676c79aeba75b26e39bffc41bb43e1838731eb..e5fdf9045ac0a0387fb11fdc8206f50dd03f20a4 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -573,6 +573,9 @@ usersearch.autocomplete.administrators=enabled
 usersearch.maxResults=-1
 usersearch.maxResults.values=-1,20,50
 
+#send user informations with the request in the tunnel cours ebuilding block
+userinfos.tunnelcoursebuildingblock=disabled
+
 ########################################################################
 # Fulltext Search settings
 ########################################################################