diff --git a/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_en.properties
index 624ce42f0e2cf54d9894ab8b6ac1bacc66d5f820..ce595d7cd7143b4d191d627d8aae3b45ff01d7ac 100644
--- a/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_en.properties
@@ -6,3 +6,4 @@ bgr.glossary=Glossary tool
 bgr.groupmngt=Group management
 bgr.statistics=Statistics
 noRestriction=No restriction
+bgr.dbs=Course database
diff --git a/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_fr.properties
index 473add2b4541ab2a8dcac7cd26cb6238d449357f..9f0debdb1341b50b32112ec1a8ebaf8ffb0c20b2 100644
--- a/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/groupsandrights/_i18n/LocalStrings_fr.properties
@@ -6,3 +6,4 @@ bgr.glossary=Outil glossaire
 bgr.groupmngt=Gestion de groupes
 bgr.statistics=Statistiques
 noRestriction=Aucune restriction
+bgr.dbs=Banque de donnée du cours
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 e968c4f143fc22fd085cb670b3c598fbffd55533..056856035deef1d7bd2a0055b8f4a0175864b80c 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
@@ -45,34 +45,34 @@ author.allow.create=Authoren
 
 bgcopywizard.copyform.owners=Betreuer der Gruppe
 chkBox.show.owners=Mitglieder sehen Betreuer
-cmd.group.create=Neue Lerngruppe
+cmd.group.create=Neue Gruppe
 cmd.owners.message=E-Mail an Betreuer
-create.form.title=Neue Lerngruppe erstellen
+create.form.title=Neue Gruppe erstellen
 fieldset.legend.groupowners=Besitzer
 fieldset.legend.grouppartips=Teilnehmer
-group.type=Lerngruppe
-grouplist.title=Liste aller Lerngruppen im Kurs
-grouprun.details.title=Informationen zur Lerngruppe
+group.type=Gruppe
+grouplist.title=Liste aller Gruppen im Kurs
+grouprun.details.title=Informationen zur Gruppe
 
-menu.allgroups=Alle Lerngruppen
-menu.allgroups.alt=Alle Lerngruppen auflisten
+menu.allgroups=Alle Gruppen
+menu.allgroups.alt=Alle Gruppen auflisten
 menu.index=Gruppenmanagement
-menu.index.alt=Verwalten Sie Lerngruppen
-newgroup.title=Neue Lerngruppe 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 Lerngruppe eingeladen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}). \n\nDiese Lerngruppe 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 Lerngruppe eingetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nDiese Lerngruppe wird in folgenden Lernressourcen verwendet\:\n\n$courselist
-notification.mail.added.self.subject=OLAT-Lerngruppe $groupname 
-notification.mail.added.subject=OLAT-Lerngruppe $groupname 
-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 Lerngruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nBei Fragen kontaktieren Sie bitte {0} {1} ({2}). \n\nDiese Lerngruppe 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 Lerngruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\nDiese Lerngruppe wurde in folgenden Lernressourcen verwendet\:\n\n$courselist
-notification.mail.removed.self.subject=OLAT-Lerngruppe $groupname\: Sie wurden ausgetragen.
-notification.mail.removed.subject=OLAT-Lerngruppe $groupname\: Sie wurden ausgetragen.
-notification.mail.waitingList.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie sind in der Warteliste der folgenden Lerngruppe eingetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\n
-notification.mail.waitingList.added.subject=OLAT-Lerngruppe $groupname Warteliste
-notification.mail.waitingList.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie sind aus der Warteliste der folgenden Lerngruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\n
-notification.mail.waitingList.removed.subject=OLAT-Lerngruppe $groupname Warteliste\: Sie haben sich ausgetragen.
-notification.mail.waitingList.transfer.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie wurden von der Warteliste in die Teilnehmerliste der folgenden Lerngruppe \u00FCbernommen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\n
-notification.mail.waitingList.transfer.subject=OLAT-Lerngruppe $groupname Warteliste Status\u00E4nderung
+menu.index.alt=Verwalten Sie Gruppen
+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.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.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.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.
+notification.mail.waitingList.added.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie sind in der Warteliste der folgenden Gruppe eingetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\n
+notification.mail.waitingList.added.subject=Gruppe $groupname Warteliste
+notification.mail.waitingList.removed.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie sind aus der Warteliste der folgenden Gruppe ausgetragen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\n
+notification.mail.waitingList.removed.subject=Gruppe $groupname Warteliste\: Sie haben sich ausgetragen.
+notification.mail.waitingList.transfer.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Sie wurden von der Warteliste in die Teilnehmerliste der folgenden Gruppe \u00FCbernommen\: \n\nGruppenname\: $groupname\nBeschreibung\: $groupdescription\n\n
+notification.mail.waitingList.transfer.subject=Gruppe $groupname Warteliste Status\u00E4nderung
 overview.intro=Willkommen beim Gruppenmanagement.
 overview.title=Gruppenmanagement
 owners.message=E-Mail an alle Betreuer
@@ -85,7 +85,7 @@ userdetails.ownergroups.title=Betreute Gruppen
 userlist.owners.noOwners=Es sind keiner Gruppe Betreuer zugewiesen
 userlist.owners.title=Betreuer
 userlist.participants.title=Teilnehmer
-userlist.title=Liste aller Mitglieder in den Lerngruppen
+userlist.title=Liste aller Gruppenmitglieder
 userlist.waitinglist.title=Warteliste
 
 
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 f0d8baa757578e81982ef62302aaf20c2b753768..5a4e1e2510a9a1686417bf17e7fe608bdbfd47e5 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
@@ -1,6 +1,28 @@
-#Sat Jan 22 15:40:03 CET 2011
+#Wed Aug 15 14:06:50 CEST 2012
 LearningGroup=Group
 action.choose=Select 
+admin.menu.title=Group
+admin.menu.title.alt=Group configuration
+archive.areas=Learning areas
+archive.coursename=Course name
+archive.date=Group list created on
+archive.group.context.description=Context description
+archive.group.context.name=Context name
+archive.group.context.type=Context type
+archive.group.description=Group description
+archive.group.name=Group name
+archive.group.type=Group type
+archive.groups=Groups
+archive.header.owners=Owners
+archive.header.partipiciant=Members
+archive.header.waitinggroup=Waitlist
+archive.interninfo=Internal information
+archive.title=Group management
+author.allow.create=Author
+bgcopywizard.copyform.owners=Group tutors
+chkBox.show.owners=Members can see tutors
+cmd.group.create=New group
+cmd.owners.message=E-mail to tutors
 create.form.bulkmode.areanames=
 create.form.bulkmode.bgnames=
 create.form.businesspath=Link to this group
@@ -9,60 +31,57 @@ create.form.enableWaitinglist=Waiting list
 create.form.error.enableAutoCloseRanks=The option to move up automatically is only available in combination with a waiting list.
 create.form.error.enableWaitinglist=Waiting lists are only an option if the number of participants is limited.
 create.form.error.illegalName=Commas or quotes are not allowed in group names
-create.form.error.illegalNames=$:create.form.error.illegalName . Following group names are invalid: {0}
+create.form.error.illegalNames=$\:create.form.error.illegalName . Following group names are invalid\: {0}
 create.form.error.nameTooLong=Group names must not contain more than {0} characters
 create.form.error.numberOrNull=Only numbers or empty field for 'no restriction'
 create.form.message.example.group=(Example\: Red, Green, Blue)
+create.form.title=Create a new group
 create.form.title.bgname=Group name
 create.form.title.bgnames=Group name
 create.form.title.description=Description
 create.form.title.max=Maximum number of <br>participants
 create.form.title.min=Minimum number of <br>participants
 create.form.title.minmax.example=If unrestricted\: leave blank
+default.context=Created automatically in course 
 error.group.name.exists=This group name is already being used in this context, please select another one.
+fieldset.legend.groupowners=Tutors
+fieldset.legend.grouppartips=Participants
 form.error.disableNonEmptyWaitingList=Waiting list does contain data. In order to deactivate this list you have to delete all participants first. 
 group.deleted=The group has been deleted
-group.type=Project group
-groupsPortlet.description=Fast access to the most important learning groups, right groups, and project groups
+group.name=Group name
+group.not.existing=The group required does not exist anymore.
+group.type=Learning group
+grouplist.title=List of all groups in this course
+grouprun.details.title=Information on this group
+groupsPortlet.description=Fast access to the most important groups, right groups, and project groups
 groupsPortlet.no_member=You have been removed from this group as member or your group has been deleted. 
 groupsPortlet.nogroups=You are not a member of this group
 groupsPortlet.showAll=Show all
 groupsPortlet.title=My groups
+menu.allgroups=All groups
+menu.allgroups.alt=List all groups
+menu.index=Group management
+menu.index.alt=Administer groups
+module.admin.allow.create=May create group
+module.admin.desc=Specify here who can create groups.
+module.admin.title=Group management
+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.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.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.
 notification.mail.self.error=E-Mail could not be sent.
-warn.foldernotavailable=This folder is currently not activated and cannot be displayed.
-warn.forumnotavailable=This forum is currently not activated and cannot be displayed.
-
-
-bgcopywizard.copyform.owners=Group tutors
-chkBox.show.owners=Members can see tutors
-cmd.group.create=New learning group
-cmd.owners.message=E-mail to tutors
-create.form.title=Create a new learning group
-fieldset.legend.groupowners=Tutors
-fieldset.legend.grouppartips=Participants
-group.type=Learning group
-grouplist.title=List of all learning groups in this course
-grouprun.details.title=Information on learning groups
-menu.allgroups=All learning groups
-menu.allgroups.alt=List all learning groups
-menu.index=Group management
-menu.index.alt=Administer learning groups
-newgroup.title=Create a new learning group
-notification.mail.added.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were invited to a learning 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 learning 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 learning group\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nThis learning group will be used in the following learning resources\:\r\n\r\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. Please do not reply *** \r\n\r\nYou were signed out of a learning 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 learning 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 learning group\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription\r\n\r\nThis learning group was used in the following learning resources\:\r\n\r\n$courselist
-notification.mail.removed.self.subject=OLAT learning group $groupname\: You have just been signed out.
-notification.mail.removed.subject=OLAT learning group $groupname\: You were signed out.
-notification.mail.waitingList.added.body=*** This is an automated message. Please do not reply  *** \r\n\r\nYou are on the waiting list of the following learning group\: \r\n\r\nGroup\: $groupname\r\nDescription\: $groupdescription
-notification.mail.waitingList.added.subject=OLAT learning group $groupname waiting list
-notification.mail.waitingList.removed.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou are no longer on the waiting list of the following learning group\: \r\n\r\nGroup\: $groupname\r\nDescription\: $groupdescription
-notification.mail.waitingList.removed.subject=OLAT learning group $groupname waiting list\: You have just signed out.
-notification.mail.waitingList.transfer.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have been transferred from the waiting list to the list of participants of the following learning group\: \r\n\r\nGroup\: $groupname\r\nDescription\: $groupdescription
-notification.mail.waitingList.transfer.subject=OLAT learning group $groupname waiting list; modification of status
+notification.mail.waitingList.added.body=*** This is an automated message. Please do not reply  *** \r\n\r\nYou are on the waiting list of the following group\: \r\n\r\nGroup\: $groupname\r\nDescription\: $groupdescription
+notification.mail.waitingList.added.subject=Group $groupname waiting list
+notification.mail.waitingList.removed.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou are no longer on the waiting list of the following group\: \r\n\r\nGroup\: $groupname\r\nDescription\: $groupdescription
+notification.mail.waitingList.removed.subject=Group $groupname waiting list\: You have just signed out.
+notification.mail.waitingList.transfer.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have been transferred from the waiting list to the list of participants of the following group\: \r\n\r\nGroup\: $groupname\r\nDescription\: $groupdescription
+notification.mail.waitingList.transfer.subject=Group $groupname waiting list; modification of status
 overview.intro=Welcome to the group management
 overview.title=Group management
 owners.message=E-mail to all tutors
@@ -70,31 +89,13 @@ owners.message.to=All tutors
 sendtochooser.form.chckbx.owners=All tutors
 sendtochooser.form.chckbx.partip=All participants
 sendtochooser.form.chckbx.waitingList=All persons on waiting list
+user.allow.create=Learner
 userdetails.ownergroups.noGroups=This user does not tutor any group
 userdetails.ownergroups.title=Supervised groups
 userlist.owners.noOwners=None of these groups has tutors
 userlist.owners.title=Tutors
 userlist.participants.title=Participants
-userlist.title=List of all members in learning groups
+userlist.title=List of all members in this group
 userlist.waitinglist.title=Waiting list
-
-
-
-archive.areas=Learning areas
-archive.coursename=Course name
-archive.date=Group list created on
-archive.group.context.description=Context description
-archive.group.context.name=Context name
-archive.group.context.type=Context type
-archive.group.description=Group description
-archive.group.name=Group name
-archive.group.type=Group type
-archive.groups=Groups
-archive.header.owners=Owners
-archive.header.partipiciant=Members
-archive.header.waitinggroup=Waitlist
-archive.interninfo=Internal information
-archive.title=Group management
-default.context=Created automatically in course 
-group.name=Group name
-group.not.existing=The group required does not exist anymore.
+warn.foldernotavailable=This folder is currently not activated and cannot be displayed.
+warn.forumnotavailable=This forum is currently not activated and cannot be displayed.
diff --git a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
index f132c906458de15f16f51a57073dcd2b4066cc03..8130b5e7acbe43fd73481ad5719d2e4ba59af7df 100644
--- a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
@@ -30,13 +30,13 @@ chelp.learn1=Sofern im Gruppenmanagement des Kurses Lernbereiche erstellt worden
 chelp.learn2=Sie haben mittels den Checkboxes die M\u00F6glichkeit zu bestimmen, zu welchen Lernbereichen die Gruppe geh\u00F6ren soll.
 chelp.learn3=Diese Einstellung wird in die Konfigurationstabs <i>$org.olat.group.ui.area\:tab.groups</i> der gew\u00E4hlten Lernbereiche \u00FCbernommen.
 chelp.learn4=Sind noch keine Lernbereiche erstellt worden, erscheint der Text\:
-chelp.membAll3=In letzterem Fall verschwindet der Eintrag "$org.olat.group.ui.run\:menutree.members" aus der Navigation.
+chelp.membAll3=Abhängig von ihrer Wahl ist die Auflistung entweder nur für Gruppenmitglieder oder für alle Benutzer sichtbar. Wurde die Anzeige für eine Nutzergruppe abgewählt, verschwindet der Eintrag Mitglieder für diese Nutzer aus der Navigation.
 chelp.membBudLea8=$\:fieldset.legend.grouppartips haben kein Recht, die Gruppe zu administrieren und besitzen beschr\u00E4nkte Schreibrechte im Forum.
 chelp.membLearn1=Die $\:group.edit.tab.members einer $org.olat.group.ui\:LearningGroup bestehen aus <b>Besitzer</b> und <b>Teilnehmern</b>.
 chelp.membLearn2=Hier k\u00F6nnen Sie bestimmen, ob den Mitgliedern der $org.olat.group.ui\:LearningGroup entweder alle anderen Mitglieder oder lediglich die Besitzer resp. die Teilnehmer oder keine anderen Mitglieder angezeigt werden.
-chelp.membLearn5=$org.olat.group.ui\:fieldset.legend.groupowners der $org.olat.group.ui\:LearningGroup erhalten den Link "$org.olat.group.ui.run\:menutree.administration" im Menu.
-chelp.membLearn6=Sie k\u00F6nnen die $org.olat.group.ui\:LearningGroup also administrieren, insbesondere auch andere OLAT-Benutzer zu Betreuern ernennen.
-chelp.membLearn7=$org.olat.group.ui\:fieldset.legend.groupowners k\u00F6nnen beliebige OLAT-Benutzer als $\:fieldset.legend.grouppartips in die Gruppe einladen.
+chelp.membLearn5=Wenn Sie eine neue Gruppe erstellen, sind Sie automatisch Besitzer dieser Gruppe. Besitzer der Gruppe erhalten den Link "$org.olat.group.ui.run\:menutree.administration" im Menu.
+chelp.membLearn6=Sie k\u00F6nnen die $org.olat.group.ui\:LearningGroup also administrieren, insbesondere auch andere Benutzer zu Betreuern ernennen und die Gruppe löschen.
+chelp.membLearn7=$org.olat.group.ui\:fieldset.legend.groupowners k\u00F6nnen beliebige Benutzer als $\:fieldset.legend.grouppartips in die Gruppe einladen.
 chelp.membLearn8=Besitzer können die Kandidaten in der Warteliste als Teilnehmer übernehmen oder aus der Warteliste entfernen. In beiden Fällen können sie bestimmen, ob die Benutzer darüber per Email notifiziert werden sollen und können gegenfalls den Emailtext anpassen.
 chelp.right1=Sie haben die M\u00F6glichkeit, den Mitgliedern der Gruppe innerhalb des Kurses die Berechtigung f\u00FCr den Zugriff und die Verwendung der folgenden Werkzeuge zu vergeben\:
 chelp.tools.infoEd=Die Information k\u00F6nnen Sie weiter unten sogleich editieren
diff --git a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
index 350ee5675f100c7ab0cdad77235cc7ae7c2e8cf5..1efe35d87bd98c1c02fbb2f08477965878e7f529 100644
--- a/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Mon May 16 17:34:39 CEST 2011
+#Wed Aug 15 14:13:37 CEST 2012
 areachoice.no.areas.admin=No learning areas found. Please create a learning area within your group management.
 areachoice.no.areas.owner=No learning areas found. New learning areas can only be created by users who have access to the entire group management.
 chelp.area1=Provided that groups have already been created in the course, these will appear in the tab.
@@ -18,30 +18,31 @@ chelp.desc.learn7=If the planned number of participants is exceeded, your course
 chelp.desc.learn8=If you leave this field empty, your group will be open to any number of participants.
 chelp.desc.learn9=If you want to limit the number of participants you can nevertheless add a waiting list to your group.
 chelp.grp-Area-select-learn.title=Learning areas\: assign groups
+chelp.grp-assign.title=Group\: assign rights
 chelp.grp-des.title=Group\: description
 chelp.grp-member.title=Group\: members
-chelp.grp-memberOwner.title=Group\: tutors
+chelp.grp-memberOwner.title=Group\: owners
 chelp.grp-memberParticipants.title=Group\: participants
 chelp.grp-memberWaiting.title=Group\: waiting list
 chelp.grp-select-area.title=Group\: assign learning areas
-chelp.grp-tools.title=Group: configure collaborative tools
-chelp.grp-assign.title=Group\: assign rights
+chelp.grp-tools.title=Group\: configure collaborative tools
 chelp.learn1=Provided that learning areas have already been created in the group management of this course, they will appear in a tab.
 chelp.learn2=By means of check boxes you have the possibility to decide to which learning areas your group shall belong.
 chelp.learn3=This setting is adopted into the configuration tab <i>$org.olat.group.ui.area\:tab.groups</i> of the learning areas selected.
 chelp.learn4=If no learning areas have been created the following text will appear\:
-chelp.membAll3=In the last case the entry "$org.olat.group.ui.run\:menutree.members" will disappear from navigation.
+chelp.membAll3=Depending on your selection, the list of members is visible to group members or to all users. If visibility is deselected, the entry "Members" will disappear from navigation.
 chelp.membBudLea8=$\:fieldset.legend.grouppartips have no right to administer groups and possess only limited write permission in the forum.
-chelp.membLearn1=The $\:group.edit.tab.members of a group consist of <b>tutors</b> and <b>participants</b>.
-chelp.membLearn2=Here you can decide whether all members, no members, or merely course tutors or participants are displayed to members of your group
-chelp.membLearn5=$org.olat.group.ui\:fieldset.legend.groupowners of the group will see the link "$org.olat.group.ui.run\:menutree.administration" in the menu.
+chelp.membLearn1=The members of a group consist of <b>tutors</b> and <b>participants</b>.
+chelp.membLearn2=Here you can decide whether all members, no members, or merely course tutors or participants are displayed
+chelp.membLearn5=If you create a new group, you are automatically one of the owners of this group. Owners of this group will see the link "$org.olat.group.ui.run\:menutree.administration" in the menu. They can then administer this group, appoint other users as owners and delete the group.
 chelp.membLearn6=They can then administer that group and appoint other OLAT users as tutors.
-chelp.membLearn7=$org.olat.group.ui\:fieldset.legend.groupowners can invite OLAT users to be $\:fieldset.legend.grouppartips of their group.
+chelp.membLearn7=Owners can invite users to be participants of their group.
 chelp.membLearn8=Tutors can accept candidates from a waiting list as participants or delete them. Either way you can determine if users should be notified via e-mail; its text will be adaptable.
 chelp.right1=You have the possibility to assign access rights as well as the right to use the following tools to members of a group with the same rights during this course\:
 chelp.tools.infoEd=You can immediately edit this information further down.
 chelp.tools.learn1=You can provide information for members of your group.
 chelp.tools.learn10=You can provide this group with an ePortfolio.
+chelp.tools.learn13=You can provide this group with a private chat room.
 chelp.tools.learn2=This information can be displayed by means of the navigation of your group.
 chelp.tools.learn3=By embedding a mail link you can send e-mails to either owners, participants or all members, (i.e. owners and participants) of your group.
 chelp.tools.learn4=You enable members of your group to exchange files by using a folder.
@@ -52,18 +53,14 @@ chelp.tools.learn8=You can put a calendar at the disposal of your group to recor
 chelp.tools.learn9=You can put a Wiki at the disposal of your group.
 chelp.tools.quota=The available storage capacity is 10 MB.
 chelp.tools.title=Configuration of collaborative tools
-help.hover.bgArea=Help to assign learning areas to groups
-help.hover.bgCollabTools=Help to use collaborative tools of groups
-help.hover.bgDetail=Help to describe a group
-help.hover.bgGrpMngmnt=Help to display members of a group
-help.hover.bgGrpMngmntOwner=Help regarding tutors of groups
-help.hover.bgGrpMngmntParticipants=Help regarding members of groups
-help.hover.bgGrpMngmntWaiting=Help regarding waiting lists of groups
-help.hover.bgRights=Help regarding rights of a group
 chkBox.open=Publish group in group area for booking
+chkBox.open.owners=All users can see owners
+chkBox.open.partips=All users can see participants
+chkBox.open.waitingList=All users can see the waiting list
 chkBox.show.owners=Members can see owners
 chkBox.show.partips=Members can see participants
 chkBox.show.waitingList=Members can see waiting list
+cmd.addresource=Add course
 error.message.locked=This group is being edited by user {0} ({1}) and therefore locked. Please try again later.
 fieldset.legend.areas=Assigned learning areas
 fieldset.legend.collabtools=Collaborative tools
@@ -72,13 +69,28 @@ fieldset.legend.displaymembers=Display members
 fieldset.legend.groupowners=Owners
 fieldset.legend.grouppartips=Participants
 fieldset.legend.open=Visibility
+fieldset.legend.resources=Linked courses
 fieldset.legend.rights=Assigned rights
 fieldset.legend.waitinggroup=Waiting list
+group.deleted=$org.olat.group.ui\:group.deleted
 group.edit.tab.accesscontrol=Publishing and booking configuration
 group.edit.tab.areas=Learning areas
 group.edit.tab.collabtools=Tools
 group.edit.tab.details=Description
 group.edit.tab.members=Members
+group.edit.tab.resources=Courses
 group.edit.tab.rights=Rights
 group.edit.title=Edit group <i>{0}</i>
-group.deleted=$org.olat.group.ui\:group.deleted
+help.hover.bgArea=Help to assign learning areas to groups
+help.hover.bgCollabTools=Help to use collaborative tools of groups
+help.hover.bgDetail=Help to describe a group
+help.hover.bgGrpMngmnt=Help to display members of a group
+help.hover.bgGrpMngmntOwner=Help regarding tutors of groups
+help.hover.bgGrpMngmntParticipants=Help regarding members of groups
+help.hover.bgGrpMngmntWaiting=Help regarding waiting lists of groups
+help.hover.bgRights=Help regarding rights of a group
+resource.remove=You really doesn't want the groups management "{0}" in course "{1}"? The group and the course are not deleted with this action. You can add the relation between them at any time.
+resources.add=Link course
+resources.add.title=Select course
+resources.noresources=This group is not used in any courses. Choose "Add course" to link the course to this group.
+resources.remove=remove
diff --git a/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java b/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java
index 6a1682abf6205cbf1f7407b6299fee8f7e244c59..92dbdf345d5474224d688ab7cd121c7a29439f95 100644
--- a/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java
+++ b/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java
@@ -60,6 +60,7 @@ public class GroupInfoMainController extends MainLayoutBasicController implement
 	
 	/** The business group we're dealing with */
 	private BusinessGroup businessGroup;
+	private DisplayMembers members;
 	
 	/** The navigation tree */
 	private MenuTree menuTree;
@@ -77,6 +78,7 @@ public class GroupInfoMainController extends MainLayoutBasicController implement
 		this.businessGroup = businessGroup;
 		module = CoreSpringFactory.getImpl(BusinessGroupModule.class);
 		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
+		members = businessGroupService.getDisplayMembers(businessGroup);
 
 		menuTree = new MenuTree("menuTree");
 		menuTree.setRootVisible(false);
@@ -168,7 +170,7 @@ public class GroupInfoMainController extends MainLayoutBasicController implement
 		if(groupMembersDisplayController == null) {
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance("Members", 0l);
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
-			groupMembersDisplayController = new GroupMembersDisplayController(ureq, bwControl, businessGroup);
+			groupMembersDisplayController = new GroupMembersDisplayController(ureq, bwControl, businessGroup, members);
 			listenTo(groupMembersDisplayController);
 		}
 		
@@ -205,7 +207,6 @@ public class GroupInfoMainController extends MainLayoutBasicController implement
 		rootNode.addChild(childNode);
 		rootNode.setDelegate(childNode);
 		
-		DisplayMembers members = businessGroupService.getDisplayMembers(businessGroup);
 		if(members.isOwnersPublic() || members.isParticipantsPublic()) {
 			childNode = new GenericTreeNode();
 			childNode.setTitle(translate("main.menu.members"));
diff --git a/src/main/java/org/olat/group/ui/homepage/GroupMembersDisplayController.java b/src/main/java/org/olat/group/ui/homepage/GroupMembersDisplayController.java
index 4c8c025b8f39167c3f8d2598f5f3de6882e2aa53..4993075f46eb62f5e3ed467dfe6ccdb801db6757 100644
--- a/src/main/java/org/olat/group/ui/homepage/GroupMembersDisplayController.java
+++ b/src/main/java/org/olat/group/ui/homepage/GroupMembersDisplayController.java
@@ -27,6 +27,7 @@ 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.group.BusinessGroup;
+import org.olat.group.model.DisplayMembers;
 
 /**
  * 
@@ -36,22 +37,23 @@ import org.olat.group.BusinessGroup;
  */
 public class GroupMembersDisplayController extends BasicController {
 
-	/** The business group we're dealing with */
-	private BusinessGroup businessGroup;
 
 	private final VelocityContainer content;
 
-	public GroupMembersDisplayController(UserRequest ureq, WindowControl wControl, BusinessGroup businessGroup) {
+	public GroupMembersDisplayController(UserRequest ureq, WindowControl wControl, BusinessGroup businessGroup, DisplayMembers members) {
 		super(ureq, wControl);
-		this.businessGroup = businessGroup;
 		// display owners and participants
-		this.content = createVelocityContainer("groupmembersdisplay");
-		GroupController groupOwnersController = new GroupController(ureq, wControl, false, true, false, this.businessGroup.getOwnerGroup());
-		this.content.put("owners", groupOwnersController.getInitialComponent());
-		GroupController groupParticipantsController = new GroupController(ureq, wControl, false, true, false, this.businessGroup
-				.getPartipiciantGroup());
-		this.content.put("participants", groupParticipantsController.getInitialComponent());
-		putInitialPanel(this.content);
+		content = createVelocityContainer("groupmembersdisplay");
+
+		if(members.isOwnersPublic()) {
+			GroupController groupOwnersController = new GroupController(ureq, wControl, false, true, false, businessGroup.getOwnerGroup());
+			content.put("owners", groupOwnersController.getInitialComponent());
+		}
+		if(members.isParticipantsPublic()) {
+			GroupController groupParticipantsController = new GroupController(ureq, wControl, false, true, false, businessGroup.getPartipiciantGroup());
+			content.put("participants", groupParticipantsController.getInitialComponent());
+		}
+		putInitialPanel(content);
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/group/ui/homepage/_content/groupinfodisplay.html b/src/main/java/org/olat/group/ui/homepage/_content/groupinfodisplay.html
index f9087949788314797df10e78e3c1774a0b91360e..b4148c5111e0c4d08e18b75b163c6918d5039711 100644
--- a/src/main/java/org/olat/group/ui/homepage/_content/groupinfodisplay.html
+++ b/src/main/java/org/olat/group/ui/homepage/_content/groupinfodisplay.html
@@ -3,6 +3,10 @@
 	<p>$!description</p>
 	<div class="o_visitingcard_content">
 		<div class="o_visitingcard_image o_bcard_portrait o_bcard_portrait_group"></div>
-		$!numMembers $r.translate("GroupInfoDisplayController.content.numParticipants")
+		#if($!numMembers == 1)
+			$!numMembers $r.translate("GroupInfoDisplayController.content.numParticipant")
+		#else
+			$!numMembers $r.translate("GroupInfoDisplayController.content.numParticipants")
+		#end
 	</div>
 </div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_de.properties
index d1638c6ba3d1a51512bcf9fa25366b7da4c1c8d8..148d4b89436ce6c06df15af2a79c42a9e7e1549b 100644
--- a/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_de.properties
@@ -12,6 +12,7 @@ form.to.owners=Betreuer
 form.to.participants=Mitglieder
 GroupInfoDisplayController.content.title=Gruppe
 GroupInfoDisplayController.content.numParticipants=Mitglieder
+GroupInfoDisplayController.content.numParticipant=Mitglied
 main.menu.contact=Kontakt
 main.menu.members=Mitglieder
 main.menu.title=Gruppeninformationen
diff --git a/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_en.properties
index ae29a36775cdf1a7b71045eb7d5e6c852f66229c..44ae06fff5d3c4ed72120790bc6a8500fc3e7a47 100644
--- a/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_en.properties
@@ -1,5 +1,6 @@
 #Thu May 26 11:41:06 CEST 2011
 GroupInfoDisplayController.content.numParticipants=Members
+GroupInfoDisplayController.content.numParticipant=Member
 GroupInfoDisplayController.content.title=Group
 contact.to=Group members
 contactform.intro=Message to all members of this group
@@ -10,9 +11,9 @@ contactform.title=Contact
 form.fieldset.message=Message
 form.fieldset.to=Recipient
 form.to=To\:
-form.to.all=Participants and coaches
-form.to.owners=Coaches
-form.to.participants=Members
+form.to.all=Participants and owners
+form.to.owners=Owners
+form.to.participants=Participants
 main.menu.contact=Contact
 main.menu.members=Members
 main.menu.title=Group information
diff --git a/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_fr.properties
index 5263724bc307b90ae4b995c3e2824340ae83d6f0..e8d931765a63b90c77d4480bfca7feb23dae8733 100644
--- a/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/group/ui/homepage/_i18n/LocalStrings_fr.properties
@@ -1,5 +1,6 @@
 #Thu Aug 09 15:09:50 CEST 2012
-GroupInfoDisplayController.content.numParticipants=Membre
+GroupInfoDisplayController.content.numParticipants=Membres
+GroupInfoDisplayController.content.numParticipant=Membre
 GroupInfoDisplayController.content.title=Groupe
 contact.to=Membre du groupe
 contactform.intro=Message \u00E0 tous les membres du groupes.
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 5eac858e6533148b53e8c3112ceddfd51f7fcabc..3c2a97a88a29d96555f2ee17afae4331e80308f2 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
@@ -64,14 +64,14 @@ cif.coursetitle=Kurstitel
 cif.error.allempty=Bitte f\u00FCllen Sie mindestens ein Formularfeld aus.
 search.limit.type=Typ
 group.access.success=Zugriff auf Gruppe ist erfolgreich. 
-table.header.ac=Beitreten
-table.header.ac.method=Method
+table.header.ac=Aktion
+table.header.ac.method=Zugang
 table.header.bgname=Name
 table.header.businesscard=Kontakt
 table.header.delete=L\u00F6schen
 table.header.description=Beschreibung
 table.header.edit=\u00C4ndern
-table.header.lastUsage=Zuletzt
+table.header.lastUsage=Letzter Zugriff (Admin)
 table.header.leave=Verlassen
 table.header.leave.waiting=Verlassen
 table.header.group.full=Voll belegt
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 4fa60fff8aa2b1c33b7c433703c38708471c3aae..20091206e37a581ff42235c6f2aacc7e5655baa3 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
@@ -1,64 +1,109 @@
-#Thu May 26 09:55:47 CEST 2011
-buddy.header=Project groups
-buddy.intro=The following list shows all project groups you participate in. 
+#Wed Aug 15 14:23:55 CEST 2012
+buddy.header=Groups
+buddy.intro=The following list shows all groups you participate in. 
+cif.coursetitle=Course title
 cif.description=Description
 cif.displayname=Name
 cif.error.allempty=Please fill at least one form field.
 cif.id=ID
 cif.owner=Owner
-create.form.title=Create a new project group
-dialog.modal.bg.delete.text=Do you really want to delete the project group "{0}" ?<p>
+config.group=Configure
+copy.group=Copy
+create.form.title=Create a new group
+create.group=Create group
+create.group.description=Create a new group with the button below. As owner of this group you may then unlock the group tools, add users or publish the group.
+dialog.modal.bg.delete.text=Do you really want to delete the group "{0}" ?<p>
+dialog.modal.bg.delete.title=Delete group?
+dialog.modal.bg.leave.text=If you leave the group "{0}" you will no longer have access. <br>Do you really want to leave this group?<p>
 dialog.modal.bg.mail.text=Do you want to inform the members of this group by email?
-dialog.modal.bg.leave.text=If you leave the project group "{0}" you will no longer have access. <br>Do you really want to leave this project group?<p>
+email.group=Send E-mail
 group.access.success=Access to group is successful
 index.header=Groups
-index.intro=The following list shows all project groups, learning groups, and right groups you participate in.
+index.intro=The following list shows all groups, learning groups, and right groups you participate in.
 index.table.nogroup=You are not registered in any group.
-info.group.deleted=This project group has been deleted.
+info.group.deleted=This group has been deleted.
 learning.header=Learning groups
 learning.intro=The following list shows all learning groups you participate in. 
-menu.buddygroups=My project groups
-menu.buddygroups.alt=Work with your personal project groups
+main.menu.title=Groups
+marked.groups=Bookmark
+menu.buddygroups=My groups
+menu.buddygroups.alt=Work with your personal groups
+menu.group.admin=Group management
+menu.groups=My groups
+menu.groups.alt=Work with your groups
 menu.index=Groups
 menu.index.alt=Work with your groups
 menu.learninggroups=My learning groups
-menu.learninggroups.alt=Work with your personal learning groups
+menu.learninggroups.alt=Work with your personal groups
 menu.opengroups=Published groups
-menu.opengroups.alt=Project groups that are published and bookable.
+menu.opengroups.alt=Groups that are published and bookable.
 menu.rightgroups=My right groups
 menu.rightgroups.alt=Work with your personal right groups
-msg.atleastone=There must be at least one owner in this project group.
-open.header=Public project groups
-open.intro=In this list you will find all published project groups that you can participate in.
-open.nogroup=No project groups have been found that can be displayed.
+merge.group=Merge
+msg.atleastone=There must be at least one owner in 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} ({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.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.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.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.
+open.header=Public groups
+open.intro=In this list you will find all published groups you can participate in.
+open.nogroup=There are no groups matching your criteria.
 opengroups.all=All groups
 opengroups.search=Search
+owned.groups=Owner
 right.header=Right groups
 right.intro=The following list shows all right groups you participate in. 
+search.all=all
+search.attendee=Participant
 search.generic=Search mask
 search.header=Group
+search.headless=Orphans
+search.headless.check=Groups without members and resources
 search.intro=Search in group
 search.limit.type=Type
+search.no=no
+search.open=Published
+search.owner=Owner
+search.public=Public group
+search.resources=Linked with courses
+search.roles=Role
+search.waiting=Waiting list
+search.yes=yes
 table.access=Book
-table.header.ac=AC
+table.access.waitingList=Add to waiting list
+table.config=Configure
+table.delete=Delete
+table.duplicate=Duplicate
+table.email=Send E-mail
+table.header.ac=Action
+table.header.ac.method=Access
 table.header.bgname=Name
+table.header.businesscard=Contact
 table.header.delete=Delete
 table.header.description=Description
 table.header.edit=Edit
+table.header.firstTime=Registration
+table.header.freePlaces=Slots
+table.header.group.full=Full
+table.header.key=ID
+table.header.lastTime=Last visit
+table.header.lastUsage=Last access (admin)
 table.header.leave=Leave
+table.header.leave.waiting=Leave
+table.header.mark=Bookmark
 table.header.resources=Course
+table.header.role=Role
 table.header.type=Type
-tools.add.buddygroup=Project group
+table.leave=Leave
+table.merge=Merge
+table.users.management=Manage members
+tools.add.buddygroup=Group
 tools.add.header=Create
 tools.delete.header=Delete
-tools.delete.unusedgroup=Project groups
-notification.mail.added.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou were invited to a project 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 project group.
-notification.mail.added.self.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have created a project 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=OLAT project group $groupname
-notification.mail.added.subject=OLAT project group $groupname
-notification.mail.deleted.body=*** This is an automated message. Please do not reply *** \r\n\r\nSince your project 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.subject=OLAT project 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 project 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.self.body=*** This is an automated message. Please do not reply *** \r\n\r\nYou have just signed out of this project group\: \r\n\r\nGroup name\: $groupname\r\nDescription\: $groupdescription
-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.
+tools.delete.unusedgroup=Groups
diff --git a/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_de.properties
index 90278804191c95940d22a165834479789ea8234d..8cce2553a6313501e6e8e8d96fd7d7c61fd7a257 100644
--- a/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_de.properties
@@ -34,7 +34,7 @@ menutree.portfolio=Portfolio
 menutree.portfolio.alt=Kollaborative Portfoliomappe
 menutree.ac=Buchungen
 menutree.ac.alt=Buchungen
-resources.intro=Zu dieser Gruppe geh\u00F6rt der untenstehende Kurs. 
+resources.intro=Diese Gruppe hat Zugriff auf die unten aufgef\u00FChrten Kurse.
 resources.launch=Starten
 resources.noresources=Es wurde kein Kurs f\u00FCr diese Gruppe gefunden.
 resources.title=Kurs
diff --git a/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_en.properties
index 9b938ded0f9dc39080a27d8822c9dbecbf374c3b..7df51167e5cad4630518ec9d4370ead0e533eac8 100644
--- a/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_en.properties
@@ -34,7 +34,7 @@ menutree.resources.alt=Course that is part of this learning resource
 menutree.top.alt=Project group
 menutree.wiki=Wiki
 menutree.wiki.alt=Collaborative Content Management System
-resources.intro=The following course is part of this group.
+resources.intro=This group is linked to the courses listed below.
 resources.launch=Start
 resources.noresources=No course found for this group.
 resources.title=Course
@@ -51,7 +51,7 @@ sendtochooser.form.radio.owners.choose=Selected tutors
 sendtochooser.form.radio.owners.nothing=No tutor
 sendtochooser.form.radio.partip=Participant
 sendtochooser.form.radio.partip.all=All participants
-sendtochooser.form.radio.partip.choose=Selected participant
+sendtochooser.form.radio.partip.choose=Selected participants
 sendtochooser.form.radio.partip.nothing=No participants
 sendtochooser.form.radio.partip.rightgroup.all=All members
 sendtochooser.form.radio.partip.rightgroup.choose=Selected members
diff --git a/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_en.properties
index cd40307dc6c3af6ed3d193a6b0817d0d9ea1b25d..1b755d690f0ad67b9471db757fda980905f2765f 100644
--- a/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_en.properties
@@ -1,4 +1,5 @@
-#Fri Aug 13 17:56:57 CEST 2010
+#Wed Aug 15 14:28:49 CEST 2012
+action.general=Action
 backLink=Back
 bgcopywizard.copyform.areas=Configuration of learning areas
 bgcopywizard.copyform.label=Copy of
@@ -19,10 +20,20 @@ bgcopywizard.multiple.groupnames.title=Enter a list of group names
 bgcopywizard.multiple.groupnames.tooLongGroupname=Group names must not contain more than 100 characters
 bgcopywizard.multiple.title=Wizard to copy groups repeatedly
 bgcopywizard.title=Wizard to copy groups
+config.resources.desc=Courses
+config.tools.desc=Tools
 continue=Next
+copy.wizard.bgstep=Copy "{0}"
 create.form.error.emptylist=Please indicate at least one group name
 create.form.error.numberOrNull=Only figures, please\! (Or else leave blank)
 create.form.title.max=Intended number of <br>participants
+email.select.receiver.description=Target
+email.select.receiver.participant=Participants
+email.select.receiver.title=Target
+email.select.receiver.tutor=Owner
+email.select.receivers=Send E-mail
+email.select.receivers.desc=Choose the recipients, owner or participants or both.
+email.write.description=Write an E-mail
 error.selectatleastonearea=Please select at least one learning area.
 error.selectatleastonecolumn=Please select at least one column.
 error.selectatleastonegroup=Please select at least one group.
@@ -39,4 +50,22 @@ memberlistwizard.finished.title=Creation of list completed
 memberlistwizard.groupchoice=Select groups
 memberlistwizard.outputchoice=Select output format
 memberlistwizard.title=Create lists containing names of group participants
+merge.confirmation=These groups will be deleted after the merge\: "{0}".
+merge.confirmation.description=Confirmation
+merge.description=Merge description
+merge.target.description=Choose the target group
+merge.target.group=Target group
+merge.target.title=Choose the target group
+merge.wizard.title=Merge groups
+remove=Remove
 showfile=Download file
+table.role=Role
+table.status=Status
+table.subject.action=Action
+table.user.login=Login
+users.addowner=Add owner
+users.addparticipant=Add participant
+users.addwaiting=Add to waiting list
+users.email.desc=Send E-mail
+users.manage.desc=Manage members
+users.manage.title=Manager members