From d8cdb6b6cc16556f06b6f31b8a2ba934b0967247 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 19 Sep 2012 18:11:40 +0200
Subject: [PATCH] OO-291: fix divers issues, feedback
---
.../member/AbstractMemberListController.java | 4 +-
.../CourseBusinessGroupListController.java | 7 ++-
.../member/_i18n/LocalStrings_de.properties | 4 +-
.../run/_i18n/LocalStrings_ar.properties | 1 -
.../run/_i18n/LocalStrings_bg.properties | 1 -
.../run/_i18n/LocalStrings_cs.properties | 1 -
.../run/_i18n/LocalStrings_da.properties | 3 +-
.../run/_i18n/LocalStrings_de.properties | 3 +-
.../run/_i18n/LocalStrings_el.properties | 1 -
.../run/_i18n/LocalStrings_en.properties | 3 +-
.../run/_i18n/LocalStrings_es.properties | 3 +-
.../run/_i18n/LocalStrings_fa.properties | 3 +-
.../run/_i18n/LocalStrings_fr.properties | 3 +-
.../run/_i18n/LocalStrings_it.properties | 3 +-
.../run/_i18n/LocalStrings_jp.properties | 1 -
.../run/_i18n/LocalStrings_lt.properties | 1 -
.../run/_i18n/LocalStrings_nl_NL.properties | 3 +-
.../run/_i18n/LocalStrings_pl.properties | 3 +-
.../run/_i18n/LocalStrings_pt_BR.properties | 3 +-
.../run/_i18n/LocalStrings_pt_PT.properties | 3 +-
.../run/_i18n/LocalStrings_ru.properties | 1 -
.../run/_i18n/LocalStrings_sq.properties | 1 -
.../run/_i18n/LocalStrings_zh_CN.properties | 1 -
.../run/_i18n/LocalStrings_zh_TW.properties | 1 -
.../main/BusinessGroupTableModelWithType.java | 12 ++--
.../org/olat/group/ui/main/GroupNumber.java | 55 +++++++++++++++++++
...ctBusinessGroupCourseAuthorController.java | 4 +-
.../SelectFavoritBusinessGroupController.java | 2 +-
.../SelectOwnedBusinessGroupController.java | 4 +-
.../SelectSearchBusinessGroupController.java | 2 +-
.../ui/main/_i18n/LocalStrings_ar.properties | 4 --
.../ui/main/_i18n/LocalStrings_bg.properties | 4 --
.../ui/main/_i18n/LocalStrings_cs.properties | 6 +-
.../ui/main/_i18n/LocalStrings_da.properties | 4 --
.../ui/main/_i18n/LocalStrings_de.properties | 4 --
.../ui/main/_i18n/LocalStrings_el.properties | 4 --
.../ui/main/_i18n/LocalStrings_en.properties | 4 --
.../ui/main/_i18n/LocalStrings_es.properties | 4 --
.../ui/main/_i18n/LocalStrings_fa.properties | 4 --
.../ui/main/_i18n/LocalStrings_fr.properties | 4 --
.../ui/main/_i18n/LocalStrings_it.properties | 4 --
.../ui/main/_i18n/LocalStrings_jp.properties | 2 -
.../ui/main/_i18n/LocalStrings_lt.properties | 4 --
.../main/_i18n/LocalStrings_nl_NL.properties | 4 --
.../ui/main/_i18n/LocalStrings_pl.properties | 4 --
.../main/_i18n/LocalStrings_pt_BR.properties | 4 --
.../main/_i18n/LocalStrings_pt_PT.properties | 4 --
.../ui/main/_i18n/LocalStrings_ru.properties | 4 --
.../ui/main/_i18n/LocalStrings_sq.properties | 6 +-
.../main/_i18n/LocalStrings_zh_CN.properties | 4 --
.../main/_i18n/LocalStrings_zh_TW.properties | 4 --
.../wizard/_i18n/LocalStrings_de.properties | 20 +++----
.../olat/repository/RepositoryManager.java | 20 ++-----
.../database/mysql/alter_8_1_x_to_8_2_0.sql | 4 +-
.../database/mysql/setupDatabase.sql | 4 +-
.../postgresql/alter_8_1_x_to_8_2_0.sql | 4 +-
.../database/postgresql/setupDatabase.sql | 4 +-
57 files changed, 112 insertions(+), 167 deletions(-)
create mode 100644 src/main/java/org/olat/group/ui/main/GroupNumber.java
diff --git a/src/main/java/org/olat/course/member/AbstractMemberListController.java b/src/main/java/org/olat/course/member/AbstractMemberListController.java
index 13483cc5fd6..3d5021b730c 100644
--- a/src/main/java/org/olat/course/member/AbstractMemberListController.java
+++ b/src/main/java/org/olat/course/member/AbstractMemberListController.java
@@ -152,8 +152,8 @@ public abstract class AbstractMemberListController extends BasicController {
memberListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(Cols.role.i18n(), Cols.role.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, roleRenderer));
CustomCellRenderer groupRenderer = new GroupCellRenderer();
memberListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(Cols.groups.i18n(), Cols.groups.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, groupRenderer));
- memberListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_EDIT, "action", translate("table.header.edit")));
- memberListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_REMOVE, "action", translate("table.header.remove")));
+ memberListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_EDIT, "table.header.edit", translate("table.header.edit")));
+ memberListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_REMOVE, "table.header.remove", translate("table.header.remove")));
}
@Override
diff --git a/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java b/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java
index 9bd39677e4e..8998f178b73 100644
--- a/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java
+++ b/src/main/java/org/olat/course/member/CourseBusinessGroupListController.java
@@ -95,8 +95,8 @@ public class CourseBusinessGroupListController extends AbstractBusinessGroupList
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.waitingListCount.i18n(), Cols.waitingListCount.ordinal(), null, getLocale()));
CustomCellRenderer acRenderer = new BGAccessControlledCellRenderer();
groupListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(Cols.accessTypes.i18n(), Cols.accessTypes.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, acRenderer));
- groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_LAUNCH, "action", translate("table.header.edit")));
- groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_LAUNCH, "action", translate("table.header.remove")));
+ groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_LAUNCH, "table.header.edit", translate("table.header.edit")));
+ groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_LAUNCH, "table.header.remove", translate("table.header.remove")));
return 11;
}
@@ -136,7 +136,8 @@ public class CourseBusinessGroupListController extends AbstractBusinessGroupList
selectController = new SelectBusinessGroupController(ureq, getWindowControl());
listenTo(selectController);
- cmc = new CloseableModalController(getWindowControl(), translate("close"), selectController.getInitialComponent(), true, translate("select.group"));
+ cmc = new CloseableModalController(getWindowControl(), translate("close"),
+ selectController.getInitialComponent(), true, translate("select.group"));
cmc.activate();
listenTo(cmc);
}
diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties
index 445f97bf869..511be2767ec 100644
--- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties
@@ -11,7 +11,7 @@ members.all=Alle
owners=Besitzer
owners.infos=Besitzer haben volle Autoren- und Administrationsrechte für diesen Kurs.
tutors=Betreuer
-tutors.infos=Betreuer haben Zugang zum Coaching- und Bewertswerkzeug für Kursteilnehmer.<br/>Gruppenbetreuer haben Zugang zum Coaching- und bewertswerkzeug ihrer Gruppenteilnehmer.
+tutors.infos=Betreuer haben Zugang zum Coaching- und Bewertungswerkzeug für Kursteilnehmer.<br/>Gruppenbetreuer haben Zugang zum Coaching- und Bewertungswerkzeug ihrer Gruppenteilnehmer.
participants=Teilnehmer
participants.infos=Teilnehmer haben Zugang zum Kurs.<br/>Gruppenteilnehmer haben Zugang zum Kurs und zu ihrer Gruppe.
waitinglist=Warteliste
@@ -64,5 +64,5 @@ table.header.freePlace=Frei
table.header.tutors=Betreuer
table.header.participants=Teilnehmer
table.header.waitingList=Warteliste
-select.group=Gruppe wählen
+select.group=Gruppe hinzufügen
nomembers=Es wurden keine Mitglieder gefunden die Ihren Kriterien entsprechen.
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_ar.properties
index 7d2d07bc899..d05d2b98260 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_ar.properties
@@ -35,7 +35,6 @@ header.tools=\u0623\u062F\u0648\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631
header.tools.general=\u0639\u0627\u0645
header.tools.ownerGroups=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u062A\u0645 \u0627\u0644\u062A\u062F\u0631\u064A\u0633 \u0644\u0647\u0627
header.tools.participatedGroups=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0649
-header.tools.rightGroups=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062D\u0642\u0648\u0642 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0649
header.tools.waitingListGroups=\u0639\u0644\u0649 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0627\u0646\u062A\u0638\u0627\u0631
msg.nodenotavailableanymore=\u062A\u0645 \u062A\u0639\u062F\u064A\u0644 \u0635\u0644\u0627\u062D\u064A\u0627\u062A \u0627\u0644\u0648\u0635\u0648\u0644 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0643 \u0645\u0646\u0630 \u0641\u062A\u0631\u0629\u060C \u0648\u0644\u0630\u0644\u0643 \u0644\u0627 \u064A\u0645\u0643\u0646\u0643 \u062A\u062D\u062F\u064A\u062F \u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u0637\u0644\u0648\u0628 \u0628\u0639\u062F \u0627\u0644\u0622\u0646..
participants.in.course=\u0627\u0644\u0645\u0634\u0627\u0631\u0643\u064A\u0646 \u0641\u0649 \u0627\u0644\u0645\u0642\u0631\u0631
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_bg.properties
index ed8d1e5a071..1a248e7d955 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_bg.properties
@@ -34,7 +34,6 @@ header.tools=\u041A\u0443\u0440\u0441\u043E\u0432\u0438 \u0438\u043D\u0441\u0442
header.tools.general=\u041E\u0431\u0449\u0438
header.tools.ownerGroups=\u041E\u0431\u0443\u0447\u0430\u0432\u0430\u043D\u0438 \u0433\u0440\u0443\u043F\u0438
header.tools.participatedGroups=\u041C\u043E\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u0433\u0440\u0443\u043F\u0438
-header.tools.rightGroups=\u041C\u043E\u0438\u0442\u0435 \u0433\u0440\u0443\u043F\u0438 \u0441\u044A\u0441 \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u043D\u0438 \u043F\u0440\u0430\u0432\u0430
header.tools.waitingListGroups=\u0412 \u0441\u043F\u0438\u0441\u044A\u043A \u0441 \u0440\u0435\u0437\u0435\u0440\u0432\u0438
msg.nodenotavailableanymore=\u041C\u0435\u0436\u0434\u0443\u0432\u0440\u0435\u043C\u0435\u043D\u043D\u043E \u0432\u0430\u0448\u0438\u0442\u0435 \u043F\u0440\u0430\u0432\u0430 \u0437\u0430 \u0434\u043E\u0441\u0442\u044A\u043F \u0441\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u0435\u043D\u0438. \u041F\u043E\u0440\u0430\u0434\u0438 \u0442\u043E\u0432\u0430, \u0432\u0438\u0435 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u043F\u043E\u0432\u0435\u0447\u0435 \u0434\u0430 \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0436\u0435\u043B\u0430\u043D\u0438\u044F \u043A\u0443\u0440\u0441\u043E\u0432 \u0435\u043B\u0435\u043C\u0435\u043D\u0442.
participants.in.course=\u041A\u0443\u0440\u0441\u043E\u0432 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_cs.properties
index c00e96c8842..9b962ac7da0 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_cs.properties
@@ -31,7 +31,6 @@ header.tools=N\u00E1stroje kurzu
header.tools.general=Obecn\u00E9
header.tools.ownerGroups=Garantovan\u00E9 skupiny
header.tools.participatedGroups=Moje studijn\u00ED skupiny
-header.tools.rightGroups=Moje skupiny pr\u00E1v
header.tools.waitingListGroups=V po\u0159adn\u00EDku
msg.nodenotavailableanymore=Va\u0161e p\u0159\u00EDstupov\u00E1 pr\u00E1va byla zm\u011Bn\u011Bna. Proto nem\u016F\u017Eete vybrat tento element kurzu.
warn.cannotactivatesinceintool=Jin\u00FD editor kurzu je otev\u0159en nad t\u00EDmto kurzem. Deaktivujte prosim nejprve p\u0159edchoz\u00ED editor.
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_da.properties
index 169988453b2..3583eaa72bc 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_da.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_da.properties
@@ -27,7 +27,6 @@ error.noglossary=Denne ordliste er ikke tilg\u00E6ngelig nu
header.tools=Kursusv\u00E6rkt\u00F8jer
header.tools.general=Generelt
header.tools.ownerGroups=Tutor grupper
-header.tools.participatedGroups=Mine l\u00E6ringsgrupper
-header.tools.rightGroups=Mine rettighedsgrupper
+header.tools.participatedGroups=Mine grupper
header.tools.waitingListGroups=P\u00E5 venteliste
msg.nodenotavailableanymore=Dine adgangsrettigheder er i mellemtiden \u00E6ndret. Derfor kan du ikke v\u00E6lge det \u00F8nskede kursuselement mere.
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties
index 2437d72df01..aa62f2c4eb9 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_de.properties
@@ -38,8 +38,7 @@ error.accesscontrol=Zugang verweigert
header.tools=Kurswerkzeuge
header.tools.general=Allgemeines
header.tools.ownerGroups=Betreute Gruppen
-header.tools.participatedGroups=Meine Lerngruppen
-header.tools.rightGroups=Meine Rechtegruppen
+header.tools.participatedGroups=Meine Gruppen
header.tools.waitingListGroups=Auf Warteliste
msg.nodenotavailableanymore=Es haben sich Berechtigungen ver\u00E4ndert, so dass Sie den gew\u00FCnschten Kursbaustein nicht mehr aufrufen k\u00F6nnen.
participants.in.course={0} Kursteilnehmer anwesend
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_el.properties
index 57da08e828b..0ca88d7a220 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_el.properties
@@ -35,7 +35,6 @@ header.tools=\u0395\u03C1\u03B3\u03B1\u03BB\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8
header.tools.general=\u0393\u03B5\u03BD\u03B9\u03BA\u03AC
header.tools.ownerGroups=\u039F\u03BC\u03AC\u03B4\u03B5\u03C2 \u03B4\u03B9\u03B4\u03B1\u03C3\u03BA\u03B1\u03BB\u03AF\u03B1\u03C2
header.tools.participatedGroups=\u039F\u03BC\u03AC\u03B4\u03B5\u03C2 \u03B5\u03BA\u03C0\u03B1\u03AF\u03B4\u03B5\u03C5\u03C3\u03B7\u03C2
-header.tools.rightGroups=\u039F\u03BC\u03AC\u03B4\u03B5\u03C2 \u03B4\u03B9\u03BA\u03B1\u03B9\u03C9\u03BC\u03AC\u03C4\u03C9\u03BD
header.tools.waitingListGroups=\u03A3\u03B5 \u03BB\u03AF\u03C3\u03C4\u03B1 \u03B1\u03BD\u03B1\u03BC\u03BF\u03BD\u03AE\u03C2
msg.nodenotavailableanymore=\u03A4\u03B1 \u03B4\u03B9\u03BA\u03B1\u03B9\u03CE\u03BC\u03B1\u03C4\u03B1 \u03C0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7\u03C2 \u03AD\u03C7\u03BF\u03C5\u03BD \u03B1\u03BB\u03BB\u03B1\u03C7\u03C4\u03B5\u03AF \u03C0\u03C1\u03CC\u03C3\u03C6\u03B1\u03C4\u03B1. \u0393\u03B9\u03B1 \u03B1\u03C5\u03C4\u03CC \u03C4\u03BF \u03BB\u03CC\u03B3\u03BF \u03B4\u03B5\u03BD \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03C4\u03B5 \u03C4\u03BF \u03C3\u03C5\u03B3\u03BA\u03B5\u03BA\u03C1\u03B9\u03BC\u03AD\u03BD\u03BF \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2.
participants.in.course=\u03A3\u03C5\u03BC\u03BC\u03B5\u03C4\u03AD\u03C7\u03C9\u03BD
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties
index b1d76967e99..de772eb4943 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_en.properties
@@ -38,8 +38,7 @@ error.noglossary=This glossary is currently not available
header.tools=Course tools
header.tools.general=General
header.tools.ownerGroups=Tutored groups
-header.tools.participatedGroups=My learning groups
-header.tools.rightGroups=My right groups
+header.tools.participatedGroups=My groups
header.tools.waitingListGroups=On waiting list
msg.nodenotavailableanymore=Your access rights have been altered in the meantime. Therefore you cannot select the course element required anymore.
participants.in.course={0} course participants present
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_es.properties
index fa726a534ca..7545858f19f 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_es.properties
@@ -33,8 +33,7 @@ error.noglossary=El glosario no est\u00E1 disponible
header.tools=Herramientas de curso
header.tools.general=Informaciones generales
header.tools.ownerGroups=Grupos tutorizados
-header.tools.participatedGroups=Mis grupos de estudios
-header.tools.rightGroups=Mis grupos de permisos
+header.tools.participatedGroups=Mis grupos
header.tools.waitingListGroups=Listas de espera
msg.nodenotavailableanymore=Tus permisos de acceso han cambiado. Por tanto ya no puedes seleccionar el elemento de curso solicitado.
participants.in.course=Participantes del curso
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_fa.properties
index 6a44757549a..5f9d52cccfd 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_fa.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_fa.properties
@@ -20,6 +20,5 @@ error.invalid.group=You have been removed from this group as a group member. The
header.tools=Course tools
header.tools.general=General
header.tools.ownerGroups=Tutored groups
-header.tools.participatedGroups=My learning groups
-header.tools.rightGroups=My right groups
+header.tools.participatedGroups=My groups
msg.nodenotavailableanymore=Your access rights have changed in the meantime. Therefore you cannot select the desired course element anymore.
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties
index f75743b97f4..73cf1c24f9e 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_fr.properties
@@ -34,8 +34,7 @@ error.noglossary=Le glossaire n'est pas disponible pour le moment
header.tools=Outils de cours
header.tools.general=G\u00E9n\u00E9ralit\u00E9s
header.tools.ownerGroups=Groupes avec tutorat
-header.tools.participatedGroups=Mes groupes d'\u00E9tude
-header.tools.rightGroups=Mes groupes de droits
+header.tools.participatedGroups=Mes groupes
header.tools.waitingListGroups=Sur liste d'attente
msg.nodenotavailableanymore=Des autorisations ont chang\u00E9, de sorte que vous ne pouvez plus consulter l'\u00E9l\u00E9ment de cours d\u00E9sir\u00E9.
participants.in.course=Participants au cours
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_it.properties
index 5c8d8fd13a5..b793577def4 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_it.properties
@@ -34,8 +34,7 @@ error.noglossary=Il glossario non \u00E8 attualmente disponibile
header.tools=Strumenti di corso
header.tools.general=Generale
header.tools.ownerGroups=Gruppi con tutorato
-header.tools.participatedGroups=I miei gruppi di studio
-header.tools.rightGroups=I miei gruppi con diritti
+header.tools.participatedGroups=I miei gruppi
header.tools.waitingListGroups=In lista d'attesa
msg.nodenotavailableanymore=Nel frattempo le autorizzazioni si sono modificate in modo da impedire la selezione dell'elemento di corso desiderato.
participants.in.course=Partecipanti al corso
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_jp.properties
index 3f2f87b0c75..17ad26d80a5 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_jp.properties
@@ -34,7 +34,6 @@ header.tools=\u30B3\u30FC\u30B9\u30C4\u30FC\u30EB
header.tools.general=\u4E00\u822C
header.tools.ownerGroups=\u30C1\u30E5\u30FC\u30BF\u30FC\u30B0\u30EB\u30FC\u30D7
header.tools.participatedGroups=\u30DE\u30A4\u5B66\u7FD2\u30B0\u30EB\u30FC\u30D7
-header.tools.rightGroups=\u30DE\u30A4\u6A29\u5229\u30B0\u30EB\u30FC\u30D7
msg.nodenotavailableanymore=\u307E\u3082\u306A\u304F\u3001\u3042\u306A\u305F\u306E\u30A2\u30AF\u30BB\u30B9\u6A29\u9650\u304C\u5909\u66F4\u3055\u308C\u307E\u3059\u3002\u305D\u306E\u305F\u3081\u3001\u76EE\u7684\u3068\u3059\u308B\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u3092\u9078\u629E\u3067\u304D\u306A\u3044\u3088\u3046\u306B\u306A\u308A\u307E\u3059\u3002
participants.in.course=\u30B3\u30FC\u30B9\u53C2\u52A0\u8005
participants.in.course.desc=\u30B3\u30FC\u30B9\u53C2\u52A0\u8005\u6570
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_lt.properties
index 62676105b2c..82f826fa2c8 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_lt.properties
@@ -21,5 +21,4 @@ header.tools=Kurso \u012Frankiai
header.tools.general=Bendra
header.tools.ownerGroups=Kuratori\u0173 grup\u0117s
header.tools.participatedGroups=Mano mokymosi grup\u0117s
-header.tools.rightGroups=Mano teisi\u0173 grup\u0117s
msg.nodenotavailableanymore=J\u016Bs\u0173 turimos prieigos teis\u0117s pasikeit\u0117. D\u0117l to j\u016Bs daugiau negalite pasirinkti norimo kurs\u0173 elemento.
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_nl_NL.properties
index fc1de9efb47..36889c6ad2d 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_nl_NL.properties
@@ -34,8 +34,7 @@ error.noglossary=Dit glossarium is tijdelijk niet beschikbaar.
header.tools=Cursuswerktuigen
header.tools.general=Algemeen
header.tools.ownerGroups=Begeleide groepen
-header.tools.participatedGroups=Mijn leergroepen
-header.tools.rightGroups=Mijn rechtgroepen
+header.tools.participatedGroups=Mijn groepen
header.tools.waitingListGroups=Op wachtlijst
msg.nodenotavailableanymore=Uw toegangsrechten zijn in de tussentijd aangepast. Hierdoor kunt u het gewenste cursuselement niet meer selecteren.
participants.in.course={0} aanwezige cursisten
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_pl.properties
index fedde108ba3..180ebf07f46 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_pl.properties
@@ -34,8 +34,7 @@ error.noglossary=Ten s\u0142ownik jest chwilowo niedost\u0119pny.
header.tools=Narz\u0119dzia kursu
header.tools.general=Og\u00F3lne
header.tools.ownerGroups=Nadzorowane grupy
-header.tools.participatedGroups=Moje grupy edukacyjne
-header.tools.rightGroups=Moje grupy uprawnie\u0144
+header.tools.participatedGroups=Moje grupy
header.tools.waitingListGroups=Na li\u015Bcie oczekuj\u0105cych
msg.nodenotavailableanymore=Twoje prawa dost\u0119pu uleg\u0142y w mi\u0119dzyczasie zmianie. Nie mo\u017Cesz wybra\u0107 \u017C\u0105danego elementu kursu.
participants.in.course=Uczestnicy kursu
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_BR.properties
index 4260d2672fa..64c7a76848c 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_BR.properties
@@ -38,8 +38,7 @@ error.noglossary=O gloss\u00E1rio n\u00E3o est\u00E1 dispon\u00EDvel atualmente
header.tools=Ferramentas do curso
header.tools.general=Geral
header.tools.ownerGroups=Grupos de tutores
-header.tools.participatedGroups=Meus grupos de estudo
-header.tools.rightGroups=Meus grupos de direito
+header.tools.participatedGroups=Meus grupos
header.tools.waitingListGroups=Em lista de espera
msg.nodenotavailableanymore=Seus direitos de acesso mudaram neste \u00EDnterim. Voc\u00EA n\u00E3o pode selecionar o elemento de curso desejado.
participants.in.course=Participante do curso
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_PT.properties
index abddaecee3a..3655cc6fce0 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_pt_PT.properties
@@ -27,7 +27,6 @@ error.noglossary=O gloss\u00E1rio n\u00E3o est\u00E1 dispon\u00EDvel atualmente
header.tools=Ferramentas do curso
header.tools.general=Geral
header.tools.ownerGroups=Grupos de tutores
-header.tools.participatedGroups=Meus grupos de estudo
-header.tools.rightGroups=Meus grupos de direito
+header.tools.participatedGroups=Meus grupos
header.tools.waitingListGroups=Em lista de espera
msg.nodenotavailableanymore=Seus direitos de acesso mudaram neste \u00EDnterim. Voc\u00EA n\u00E3o pode selecionar o elemento de curso desejado.
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_ru.properties
index f26c1c04c68..3e993b26c71 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_ru.properties
@@ -35,7 +35,6 @@ header.tools=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0430\
header.tools.general=\u041E\u0431\u0449\u0435\u0435
header.tools.ownerGroups=\u041A\u0443\u0440\u0438\u0440\u0443\u0435\u043C\u044B\u0435 \u0433\u0440\u0443\u043F\u043F\u044B
header.tools.participatedGroups=\u041C\u043E\u0438 \u0433\u0440\u0443\u043F\u043F\u044B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F
-header.tools.rightGroups=\u041C\u043E\u0438 \u0433\u0440\u0443\u043F\u043F\u044B \u043F\u0440\u0430\u0432 \u0434\u043E\u0441\u0442\u0443\u043F\u0430
header.tools.waitingListGroups=\u0412 \u0441\u043F\u0438\u0441\u043E\u043A\u0435 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u044F
msg.nodenotavailableanymore=\u041F\u0440\u0430\u0432\u0430 \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u0438\u0437\u043C\u0435\u043D\u0438\u043B\u0438\u0441\u044C, \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u0412\u044B \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u043E\u0442\u043A\u0440\u044B\u0442\u044C \u0434\u0430\u043D\u043D\u044B\u0439 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u043D\u044B\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442 \u043A\u0443\u0440\u0441\u0430.
participants.in.course=\u0421\u043B\u0443\u0448\u0430\u0442\u0435\u043B\u044C \u043A\u0443\u0440\u0441\u0430
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_sq.properties
index aa623249a55..84f1bb10eb4 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_sq.properties
@@ -28,6 +28,5 @@ header.tools=Mjetet e kursit
header.tools.general=T\u00EB p\u00EBrgjithshme
header.tools.ownerGroups=Grupet e tutoruara
header.tools.participatedGroups=Grupet e mia t\u00EB m\u00EBsimit
-header.tools.rightGroups=Grupet e mia t\u00EB t\u00EB drejtave
header.tools.waitingListGroups=N\u00EB list\u00EBn e pritjes
msg.nodenotavailableanymore=E drejta e juaj e qasjes \u00EBsht\u00EB nd\u00EBrruar nd\u00EBrkoh\u00EB. K\u00EBshtu q\u00EB ju m\u00EB nuk mund t\u00EB p\u00EBrzgjedhni elementin e d\u00EBshiruar
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_CN.properties
index ee58f4ebeb0..8445b54218a 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_CN.properties
@@ -35,7 +35,6 @@ header.tools=\u5B66\u7A0B\u5DE5\u5177
header.tools.general=\u7EFC\u5408
header.tools.ownerGroups=\u8F85\u5BFC\u6559\u5E08\u7FA4\u7EC4
header.tools.participatedGroups=\u6211\u7684\u5B66\u4E60\u7EC4
-header.tools.rightGroups=\u6211\u7684\u6743\u9650\u7EC4
header.tools.waitingListGroups=\u5728\u7B49\u5F85\u5217\u8868\u4E0A
msg.nodenotavailableanymore=\u540C\u65F6\uFF0C\u4F60\u7684\u8BBF\u95EE\u6743\u9650\u5DF2\u7ECF\u6539\u53D8\u3002\u56E0\u6B64\u4F60\u65E0\u6CD5\u9009\u62E9\u6240\u9700\u7684\u5B66\u7A0B\u5143\u7D20\u3002
participants.in.course=\u4EBA\u6B63\u5728\u5B66\u4E60
diff --git a/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_TW.properties
index 438304eccc8..9479b541ad2 100644
--- a/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/course/run/_i18n/LocalStrings_zh_TW.properties
@@ -35,7 +35,6 @@ header.tools=\u8AB2\u7A0B\u5DE5\u5177
header.tools.general=\u4E00\u822C
header.tools.ownerGroups=\u6709\u6559\u5E2B\u7684\u7FA4\u7D44
header.tools.participatedGroups=\u6211\u7684\u5B78\u7FD2\u7FA4\u7D44
-header.tools.rightGroups=\u6211\u7684\u6B0A\u9650\u7FA4\u7D44
header.tools.waitingListGroups=\u5728\u7B49\u5019\u6E05\u55AE
msg.nodenotavailableanymore=\u60A8\u7684\u5B58\u53D6\u6B0A\u9650\u5DF2\u5728\u6B64\u6642\u88AB\u8ABF\u6574\u3002\u56E0\u6B64\u60A8\u7121\u6CD5\u518D\u9078\u64C7\u60F3\u8981\u7684\u8AB2\u7A0B\u5143\u7D20\u3002
participants.in.course=\u8AB2\u7A0B\u53C3\u8207\u8005
diff --git a/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java b/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java
index fa9dafd308d..d958be07ca1 100644
--- a/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java
+++ b/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java
@@ -115,24 +115,24 @@ public class BusinessGroupTableModelWithType extends DefaultTableDataModel<BGTab
Integer maxParticipants = wrapped.getMaxParticipants();
if(maxParticipants != null && maxParticipants.intValue() > 0) {
long free = maxParticipants - wrapped.getNumOfParticipants();
- return Long.toString(free);
+ return new GroupNumber(free);
}
- return "∞";
+ return GroupNumber.INFINITE;
}
case participantsCount: {
long count = wrapped.getNumOfParticipants();
- return count < 0 ? "0" : Long.toString(count);
+ return count < 0 ? GroupNumber.ZERO : new GroupNumber(count);
}
case tutorsCount: {
long count = wrapped.getNumOfOwners();
- return count < 0 ? "0" : Long.toString(count);
+ return count < 0 ? GroupNumber.ZERO : new GroupNumber(count);
}
case waitingListCount: {
if(wrapped.isWaitingListEnabled()) {
long count = wrapped.getNumWaiting();
- return count < 0 ? "0" : Long.toString(count);
+ return count < 0 ? GroupNumber.ZERO : new GroupNumber(count);
}
- return "-";
+ return GroupNumber.NONE;
}
case wrapper:
return wrapped;
diff --git a/src/main/java/org/olat/group/ui/main/GroupNumber.java b/src/main/java/org/olat/group/ui/main/GroupNumber.java
new file mode 100644
index 00000000000..4599226245c
--- /dev/null
+++ b/src/main/java/org/olat/group/ui/main/GroupNumber.java
@@ -0,0 +1,55 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <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 the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <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>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.group.ui.main;
+
+/**
+ * A wrappe for the number of xx in a group. If the long == Long.MAX_VALUE, it
+ * show infinite, if negative, it show -
+ *
+ *
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ */
+public class GroupNumber implements Comparable<GroupNumber> {
+
+ public static final GroupNumber INFINITE = new GroupNumber(Long.MAX_VALUE);
+ public static final GroupNumber ZERO = new GroupNumber(0);
+ public static final GroupNumber NONE = new GroupNumber(-1);
+
+ private long count = -1;
+
+ public GroupNumber(long count) {
+ this.count = count;
+ }
+
+ @Override
+ public int compareTo(GroupNumber o) {
+ return (count<o.count ? -1 : (count==o.count ? 0 : 1));
+ }
+
+ @Override
+ public String toString() {
+ if(count < 0) {
+ return "-";
+ } else if(count == Long.MAX_VALUE) {
+ return "∞";
+ }
+ return Long.toString(count);
+ }
+}
diff --git a/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java b/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java
index c60c59f307e..e7a3ff4cd4d 100644
--- a/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java
+++ b/src/main/java/org/olat/group/ui/main/SelectBusinessGroupCourseAuthorController.java
@@ -68,13 +68,13 @@ public class SelectBusinessGroupCourseAuthorController extends AbstractBusinessG
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.freePlaces.i18n(), Cols.freePlaces.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.waitingListCount.i18n(), Cols.waitingListCount.ordinal(), null, getLocale()));
- groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "action", translate("select")));
+ groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "select", translate("select")));
return 10;
}
protected void updateOwnedGroups() {
SearchBusinessGroupParams params = new SearchBusinessGroupParams();
- updateTableModel(params, true);
+ updateTableModel(params, false);
}
@Override
diff --git a/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java b/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java
index d2922b87625..ff1e624ab09 100644
--- a/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java
+++ b/src/main/java/org/olat/group/ui/main/SelectFavoritBusinessGroupController.java
@@ -64,7 +64,7 @@ public class SelectFavoritBusinessGroupController extends AbstractBusinessGroupL
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.freePlaces.i18n(), Cols.freePlaces.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.waitingListCount.i18n(), Cols.waitingListCount.ordinal(), null, getLocale()));
- groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "action", translate("select")));
+ groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "select", translate("select")));
return 9;
}
diff --git a/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java b/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java
index d6337db96b6..524eae62cfd 100644
--- a/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java
+++ b/src/main/java/org/olat/group/ui/main/SelectOwnedBusinessGroupController.java
@@ -65,7 +65,7 @@ public class SelectOwnedBusinessGroupController extends AbstractBusinessGroupLis
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.freePlaces.i18n(), Cols.freePlaces.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.waitingListCount.i18n(), Cols.waitingListCount.ordinal(), null, getLocale()));
- groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "action", translate("select")));
+ groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "select", translate("select")));
return 10;
}
@@ -75,6 +75,6 @@ public class SelectOwnedBusinessGroupController extends AbstractBusinessGroupLis
params.setOwner(true);
params.setAttendee(false);
params.setWaiting(false);
- updateTableModel(params, true);
+ updateTableModel(params, false);
}
}
diff --git a/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java b/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java
index ada12598e86..9c045b7a4c1 100644
--- a/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java
+++ b/src/main/java/org/olat/group/ui/main/SelectSearchBusinessGroupController.java
@@ -78,7 +78,7 @@ public class SelectSearchBusinessGroupController extends AbstractBusinessGroupLi
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.participantsCount.i18n(), Cols.participantsCount.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.freePlaces.i18n(), Cols.freePlaces.ordinal(), null, getLocale()));
groupListCtr.addColumnDescriptor(new DefaultColumnDescriptor(Cols.waitingListCount.i18n(), Cols.waitingListCount.ordinal(), null, getLocale()));
- groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "action", translate("select")));
+ groupListCtr.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_SELECT, "select", translate("select")));
return 10;
}
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 dd922137265..4d582c2d1ae 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
@@ -8,12 +8,8 @@ index.table.nogroup=\u0623\u0646\u062A \u063A\u064A\u0631 \u0645\u0634\u062A\u06
info.group.deleted=\u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u062A\u0645 \u062D\u0630\u0641\u0647\u0627.
learning.header=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062A\u0639\u0644\u064A\u0645
learning.intro=\u0641\u0649 \u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629 \u062A\u0648\u062C\u062F \u0643\u0644 \u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u062A\u0649 \u062A\u0634\u0627\u0631\u0643 \u0641\u064A\u0647\u0627.
-menu.buddygroups=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0649
-menu.buddygroups.alt=\u0627\u0639\u0645\u0644 \u0645\u0639 \u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u0645\u0634\u0631\u0648\u0639 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0643
menu.index=\u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0627\u062A
menu.index.alt=\u0627\u0639\u0645\u0644 \u0645\u0639 \u0645\u062C\u0645\u0648\u0639\u0627\u062A\u0643
-menu.learninggroups=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0649
-menu.learninggroups.alt=\u0627\u0639\u0645\u0644 \u0645\u0639 \u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0643
msg.atleastone=\u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0647\u0646\u0627\u0643 \u0645\u0624\u0644\u0641 \u0645\u0633\u0627\u0639\u062F \u0648\u0627\u062D\u062F\u0627\u064B \u0639\u0644\u0649 \u0627\u0644\u0623\u0642\u0644 \u0641\u0649 \u0645\u062C\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u0634\u0631\u0648\u0639.
right.header=\u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062D\u0642\u0648\u0642
right.intro=\u0627\u0644\u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062A\u0627\u0644\u064A\u0629 \u062A\u0648\u0636\u062D \u0643\u0644 \u0645\u062C\u0645\u0648\u0639\u0627\u062A \u0627\u0644\u062D\u0642\u0648\u0642 \u0627\u0644\u062A\u0649 \u062A\u0634\u0627\u0631\u0643 \u0641\u064A\u0647\u0627.
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 e52f016a321..07bf779bd9e 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
@@ -8,12 +8,8 @@ index.table.nogroup=\u041D\u0435 \u0441\u0442\u0435 \u0440\u0435\u0433\u0438\u04
info.group.deleted=\u0422\u0430\u0437\u0438 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438 \u0435 \u0438\u0437\u0442\u0440\u0438\u0442\u0430.
learning.header=\u0423\u0447\u0435\u0431\u043D\u0438 \u0433\u0440\u0443\u043F\u0438
learning.intro=\u0422\u043E\u0437\u0438 \u0441\u043F\u0438\u0441\u044A\u043A \u043F\u043E\u043A\u0430\u0437\u0432\u0430 \u0432\u0441\u0438\u0447\u043A\u0438 \u0443\u0447\u0435\u0431\u043D\u0438 \u0433\u0440\u0443\u043F\u0438, \u0432 \u043A\u043E\u0438\u0442\u043E \u0443\u0447\u0430\u0441\u0442\u0432\u0430\u0442\u0435.
-menu.buddygroups=\u041C\u043E\u0438\u0442\u0435 \u0433\u0440\u0443\u043F\u0438 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438
-menu.buddygroups.alt=\u0420\u0430\u0431\u043E\u0442\u0435\u0442\u0435 \u0441 \u0432\u0430\u0448\u0430\u0442\u0430 \u043B\u0438\u0447\u043D\u0430 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438
menu.index=\u0413\u0440\u0443\u043F\u0438
menu.index.alt=\u0420\u0430\u0431\u043E\u0442\u0435\u0442\u0435 \u0441 \u0432\u0430\u0448\u0438\u0442\u0435 \u0433\u0440\u0443\u043F\u0438
-menu.learninggroups=\u041C\u043E\u0438\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u0438 \u0433\u0440\u0443\u043F\u0438
-menu.learninggroups.alt=\u0420\u0430\u0431\u043E\u0442\u0435\u0442\u0435 \u0441 \u0432\u0430\u0448\u0438\u0442\u0435 \u043B\u0438\u0447\u043D\u0438 \u0443\u0447\u0435\u0431\u043D\u0438 \u0433\u0440\u0443\u043F\u0438
msg.atleastone=\u0422\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0438\u043C\u0430 \u043F\u043E\u043D\u0435 \u0435\u0434\u0438\u043D \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u0438\u043A \u0432 \u0442\u0430\u0437\u0438 \u0433\u0440\u0443\u043F\u0430 \u043F\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0438.
right.header=\u0413\u0440\u0443\u043F\u0438 \u0441\u044A\u0441 \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u043D\u0438 \u043F\u0440\u0430\u0432\u0430
right.intro=\u0422\u043E\u0437\u0438 \u0441\u043F\u0438\u0441\u044A\u043A \u043F\u043E\u043A\u0430\u0437\u0432\u0430 \u0432\u0441\u0438\u0447\u043A\u0438 \u0433\u0440\u0443\u043F\u0438 \u0441\u044A\u0441 \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u043D\u0438 \u043F\u0440\u0430\u0432\u0430, \u0432 \u043A\u043E\u0438\u0442\u043E \u0443\u0447\u0430\u0441\u0442\u0432\u0430\u0442\u0435.
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 3bd202c19ec..f7ec13d1b60 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
@@ -6,13 +6,9 @@ index.header=Skupiny
index.intro=Seznam v\u0161ech projektov\u00FDch, studijn\u00EDch a pr\u00E1vn\u00EDch skupin, v nich\u017E jste za\u0159azen
index.table.nogroup=Nejste za\u0159azen v \u017E\u00E1dn\u00E9 skupin\u011B
learning.header=Studijn\u00ED skupiny
-learning.intro=N\u00E1sleduj\u00EDc\u00ED seznam ukazuje v\u0161echny studijn\u00ED skupiny, ve kter\u00FDch jste za\u0159azen
-menu.buddygroups=Moje projektov\u00E9 skupiny
-menu.buddygroups.alt=Pr\u00E1ce s osobn\u00EDmi projektov\u00FDmi skupinami
+learning.intro=N\u00E1sleduj\u00EDc\u00ED seznam ukazuje v\u0161echny studijn\u00ED skupiny, ve kter\u00FDch jste za\u0159azen
menu.index=Skupiny
menu.index.alt=Pr\u00E1ce se skupinami
-menu.learninggroups=Moje studijn\u00ED skupiny
-menu.learninggroups.alt=Pr\u00E1ce s osobn\u00EDmi studijn\u00EDmi skupinami
menu.rightgroups=Moje skupiny pr\u00E1v
menu.rightgroups.alt=Pr\u00E1ce s osobn\u00EDmi skupinami pr\u00E1v
msg.atleastone=V projektov\u00E9 skupin\u011B mus\u00ED existovat alespo\u0148 jeden vlastn\u00EDk
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 842a0216659..fe3fbc87ce2 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
@@ -7,12 +7,8 @@ index.intro=Den f\u00F8lgende liste viser alle projekter, l\u00E6rings og rettig
index.table.nogroup=Du er ikke registreret i nogen grupper.
learning.header=L\u00E6ringsgrupper
learning.intro=Den f\u00F8lgende liste viser alle l\u00E6ringsgrupper du er medlem af.
-menu.buddygroups=Mine projektgrupper
-menu.buddygroups.alt=Arbejd med dine personlige projektgrupper
menu.index=Grupper
menu.index.alt=Arbejd med dine grupper
-menu.learninggroups=Mine l\u00E6ringsgrupper
-menu.learninggroups.alt=Arbejd med dine personlige l\u00E6ringsgrupper
msg.atleastone=Der skal v\u00E6re mindst en ejer i denne projektgruppe.
right.header=Rettighedsgrupper
right.intro=Den f\u00F8lgende liste viser alle rettighedsgrupper du er medlem af.
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 fc2e5cf76df..1bfd6763b56 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
@@ -17,12 +17,8 @@ learning.header=Lerngruppen
learning.intro=In der untenstehenden Liste finden Sie alle Lerngruppen, an denen Sie teilnehmen.
menu.group.admin=Gruppenverwaltung
menu.group.admin.alt=Gruppenverwaltung
-menu.buddygroups=Meine Arbeitsgruppen
-menu.buddygroups.alt=Arbeiten Sie mit Ihren Arbeitsgruppen
menu.index=Gruppen
menu.index.alt=Arbeiten Sie mit Ihren Gruppen
-menu.learninggroups=Meine Lerngruppen
-menu.learninggroups.alt=Arbeiten Sie mit Ihren Lerngruppen
menu.groups=Meine Gruppen
menu.groups.alt=Arbeiten Sie mit Ihren Gruppen
menu.opengroups=Ver\u00F6ffentlichte Gruppen
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 02b90871db7..da4f3f502f8 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
@@ -8,12 +8,8 @@ index.table.nogroup=\u0394\u03B5\u03BD \u03B5\u03AF\u03C3\u03C4\u03B5 \u03B5\u03
info.group.deleted=\u0397 \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03AD\u03C7\u03B5\u03B9 \u03B4\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03B5\u03AF.
learning.header=\u039F\u03BC\u03AC\u03B4\u03B5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2
learning.intro=\u0397 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03BB\u03AF\u03C3\u03C4\u03B1 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03B9\u03AC\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03BF\u03BC\u03AC\u03B4\u03B5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03C3\u03C4\u03B9\u03C2 \u03BF\u03C0\u03BF\u03AF\u03B5\u03C2 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03AD\u03C7\u03B5\u03C4\u03B5.
-menu.buddygroups=\u039F\u03B9 \u03BF\u03BC\u03AC\u03B4\u03B5\u03C2 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2 \u03BC\u03BF\u03C5
-menu.buddygroups.alt=\u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03BC\u03B5 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03C9\u03C0\u03B9\u03BA\u03AD\u03C2 \u03C3\u03B1\u03C2 \u03BF\u03BC\u03AC\u03B4\u03B5\u03C2 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2
menu.index=\u039F\u03BC\u03AC\u03B4\u03B5\u03C2
menu.index.alt=\u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03BC\u03B5 \u03C4\u03B9\u03C2 \u03BF\u03BC\u03AC\u03B4\u03B5\u03C2 \u03C3\u03B1\u03C2
-menu.learninggroups=\u039F\u03B9 \u03BF\u03BC\u03AC\u03B4\u03B5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03AE\u03C2 \u03BC\u03BF\u03C5
-menu.learninggroups.alt=\u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03BC\u03B5 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03C9\u03C0\u03B9\u03BA\u03AD\u03C2 \u03C3\u03B1\u03C2 \u03BF\u03BC\u03AC\u03B4\u03B5\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2
msg.atleastone=\u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03C4\u03BF\u03C5\u03BB\u03AC\u03C7\u03B9\u03C3\u03C4\u03BF\u03BD \u03AD\u03BD\u03B1\u03C2 \u03BA\u03AC\u03C4\u03BF\u03C7\u03BF\u03C2 \u03C3\u03C4\u03B7\u03BD \u03BF\u03BC\u03AC\u03B4\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2.
right.header=\u039F\u03BC\u03AC\u03B4\u03B5\u03C2 \u03B4\u03B9\u03BA\u03B1\u03B9\u03C9\u03BC\u03AC\u03C4\u03C9\u03BD
right.intro=\u0397 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03BB\u03AF\u03C3\u03C4\u03B1 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03B9\u03AC\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03BF\u03BC\u03AC\u03B4\u03B5\u03C2 \u03B4\u03B9\u03BA\u03B1\u03B9\u03C9\u03BC\u03AC\u03C4\u03C9\u03BD \u03C3\u03C4\u03B9\u03C2 \u03BF\u03C0\u03BF\u03AF\u03B5\u03C2 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03AD\u03C7\u03B5\u03C4\u03B5.
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 9e1cb02d2a2..331457a9694 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
@@ -24,15 +24,11 @@ learning.header=Learning groups
learning.intro=The following list shows all learning groups you participate in.
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 groups
menu.opengroups=Published groups
menu.opengroups.alt=Groups that are published and bookable.
merge.group=Merge
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 407a8b2a1c8..3b41b5ab2ea 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
@@ -8,12 +8,8 @@ index.table.nogroup=No est\u00E1s registrado en ning\u00FAn grupo.
info.group.deleted=Este grupo de colaboraci\u00F3n se ha eliminado
learning.header=Grupos de estudios
learning.intro=La lista siguiente muestra todos los grupos de estudios en los que participas.
-menu.buddygroups=Mis grupos de colaboraci\u00F3n
-menu.buddygroups.alt=Trabaja con tus grupos de colaboraci\u00F3n personales
menu.index=Grupos
menu.index.alt=Trabaja con tus grupos
-menu.learninggroups=Mis grupos de estudios
-menu.learninggroups.alt=Trabaja con tus grupos de estudios personales
msg.atleastone=Al menos debe haber un propietario en el grupo de colaboraci\u00F3n.
right.header=Grupos de permisos
right.intro=La lista siguiente muestra todos los grupos de permisos en los que participas.
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 7f39a30a294..7a39871ceb7 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
@@ -7,12 +7,8 @@ index.intro=\u0644\u064A\u0633\u062A \u067E\u0627\u064A\u064A\u0646 \u062A\u0645
index.table.nogroup=\u0634\u0645\u0627 \u062F\u0631 \u0627\u06CC\u0646 \u06AF\u0631\u0648\u0647 \u062B\u0628\u062A \u0646\u0627\u0645 \u0646\u06A9\u0631\u062F\u0646 \u0627\u06CC\u062F
learning.header=\u06AF\u0631\u0648\u0647 \u0622\u0645\u0648\u0632\u0634\u06CC
learning.intro=\u062F\u0646\u0628\u0627\u0644 \u06A9\u0631\u062F\u0646 \u0644\u06CC\u0633\u062A \u0646\u0645\u0627\u06CC\u0634 \u062A\u0645\u0627\u0645 \u06AF\u0631\u0648\u0647 \u0647\u0627\u06CC \u0622\u0645\u0648\u0632\u0634\u06CC \u0648 \u0634\u0631\u06CC\u06A9 \u0634\u062F\u0646 \u062F\u0631 \u0627\u0646\u0647\u0627
-menu.buddygroups=\u06AF\u0631\u0648\u0647 \u06A9\u0627\u0631\u06CC \u0645\u0646
-menu.buddygroups.alt=\u0641\u0639\u0627\u0644\u06CC\u062A \u062F\u0631\u06AF\u0631\u0648\u0647 \u06A9\u0627\u0631\u06CC \u0634\u062E\u0635\u06CC
menu.index=\u06AF\u0631\u0648\u0647 \u0647\u0627
menu.index.alt=\u0641\u0639\u0627\u0644\u06CC\u062A \u062F\u0631 \u0627\u06CC\u0646 \u06AF\u0631\u0648\u0647
-menu.learninggroups=\u06AF\u0631\u0648\u0647 \u0622\u0645\u0648\u0632\u0634\u06CC \u0645\u0646
-menu.learninggroups.alt=\u0641\u0639\u0627\u0644\u06CC\u062A \u062F\u0631 \u06AF\u0631\u0648\u0647 \u06A9\u0627\u0631\u06CC \u0634\u062E\u0635\u06CC \u0634\u0645\u0627
msg.atleastone=\u0634\u0645\u0627 \u062D\u062F\u0627\u0642\u0644 \u0628\u0627\u06CC\u062F \u062F\u0631 \u0627\u06CC\u0646 \u06AF\u0631\u0648\u0647 \u06A9\u0627\u0631\u06CC \u0645\u0634\u0627\u0631\u06A9\u062A \u062F\u0627\u0634\u062A\u0647 \u0628\u0627\u0634\u06CC\u062F
right.header=\u06AF\u0631\u0648\u0647\u0647\u0627\u06CC \u062F\u0631\u0633\u062A
right.intro=\u0644\u064A\u0633\u062A \u067E\u0627\u064A\u064A\u0646 \u062A\u0645\u0627\u0645\u064A \u0631\u0627\u064A\u062A \u06AF\u0631\u0648\u0647 \u0647\u0627\u064A\u064A \u0631\u0627 \u06A9\u0647 \u062F\u0631 \u0622\u0646 \u0645\u0634\u0627\u0631\u06A9\u062A \u062F\u0627\u0634\u062A\u0647 \u0627\u064A\u062F \u0646\u0645\u0627\u064A\u0634 \u0645\u064A \u062F\u0647\u062F
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 0f71c7ac3b4..2e52d54ba59 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
@@ -24,15 +24,11 @@ learning.header=Groupes d'\u00E9tudes
learning.intro=Dans la liste ci-dessus, vous trouvez tous les groupes d'\u00E9tude dont vous faites partie.
main.menu.title=Groupes
marked.groups=Favoris
-menu.buddygroups=Mes groupes de travail
-menu.buddygroups.alt=Travaillez avec vos groupes de travail
menu.group.admin=Gestion des groupes
menu.groups=Mes groupes
menu.groups.alt=Travaillez avec vos groupes
menu.index=Groupes
menu.index.alt=Travaillez avec vos groupes
-menu.learninggroups=Mes groupes d'\u00E9tude
-menu.learninggroups.alt=Travaillez avec vos groupes d'\u00E9tude
menu.opengroups=Groupes publi\u00E9s
menu.opengroups.alt=Les groupes qui ont \u00E9t\u00E9 publi\u00E9s et auxquels je peux prendre part.
merge.group=R\u00E9unir
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 00d8c243a36..b8cb745765a 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
@@ -8,12 +8,8 @@ index.table.nogroup=Lei non \u00E8 registrata/o in alcun gruppo.
info.group.deleted=Il gruppo di lavoro \u00E8 stato eliminato
learning.header=Gruppi di studio
learning.intro=Nella lista sottostante trova tutti i gruppi di studio a cui partecipa.
-menu.buddygroups=I miei gruppi di lavoro
-menu.buddygroups.alt=Lavori con i Suoi gruppi di lavoro.
menu.index=Gruppi
menu.index.alt=Lavori con i Suoi gruppi.
-menu.learninggroups=I miei gruppi di studio
-menu.learninggroups.alt=Lavori con i Suoi gruppi di studio.
msg.atleastone=Nel gruppo di lavoro deve essere registrato almeno una/un proprietaria/o.
right.header=Gruppi con diritti
right.intro=In questa lista trova tutti i gruppi con diritti a cui partecipa.
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 d151d67dad6..131780bbc52 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
@@ -7,9 +7,7 @@ index.table.nogroup=\u3042\u306A\u305F\u306F\u3001\u3069\u306E\u30B0\u30EB\u30FC
info.group.deleted=\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u3001\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
learning.header=\u5B66\u7FD2\u30B0\u30EB\u30FC\u30D7
learning.intro=\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u3067\u306F\u3001\u3042\u306A\u305F\u304C\u53C2\u52A0\u3057\u3066\u3044\u308B\u3001\u3059\u3079\u3066\u306E\u5B66\u7FD2\u30B0\u30EB\u30FC\u30D7\u304C\u8868\u793A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-menu.buddygroups=\u30DE\u30A4\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B0\u30EB\u30FC\u30D7
menu.index=\u30B0\u30EB\u30FC\u30D7
-menu.learninggroups=\u30DE\u30A4\u5B66\u7FD2\u30B0\u30EB\u30FC\u30D7
right.header=\u6A29\u5229\u30B0\u30EB\u30FC\u30D7
right.intro=\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u3067\u306F\u3001\u3042\u306A\u305F\u304C\u53C2\u52A0\u3057\u3066\u3044\u308B\u3001\u3059\u3079\u3066\u306E\u6A29\u5229\u30B0\u30EB\u30FC\u30D7\u304C\u8868\u793A\u3055\u308C\u3066\u3044\u307E\u3059\u3002
table.header.bgname=\u540D\u79F0
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 43ce0ffb9e7..ca0821ad064 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
@@ -7,12 +7,8 @@ index.intro=\u0160is s\u0105ra\u0161as parodo visus projektus, mokymosi ir teisi
index.table.nogroup=J\u016Bs nesate priregistruotas jokioje grup\u0117je.
learning.header=Mokymosi grup\u0117s
learning.intro=\u0160is s\u0105ra\u0161as parodo visas mokymo grupes, kuriose j\u016Bs dalyvaujate.
-menu.buddygroups=Mano projekto grup\u0117s
-menu.buddygroups.alt=Dirbti su mano asmenin\u0117mis projekto grup\u0117mis
menu.index=Grup\u0117s
menu.index.alt=Dirbti su savo grup\u0117mis
-menu.learninggroups=Mano mokymo grup\u0117s
-menu.learninggroups.alt=Dirbti su mano asmenin\u0117mis mokymo grup\u0117mis
msg.atleastone=Turi b\u016Bti ma\u017Eiausiai vienas savininkas \u0161ioje projekto grup\u0117je.
right.header=Teisi\u0173 grup\u0117s
right.intro=\u0160is s\u0105ra\u0161as parodo visas teisi\u0173 grupes, kuriose j\u016Bs dalyvaujate.
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 f179ec89a88..40aaf0203e8 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
@@ -8,12 +8,8 @@ index.table.nogroup=Je bent in geen enkele groep ingeschreven.
info.group.deleted=Deze werkgroep werd verwijderd.
learning.header=Leergroepen
learning.intro=Volgende lijst toont alle leergroepen waaraan je deelneemt.
-menu.buddygroups=Mijn project groepen
-menu.buddygroups.alt=Werk met jouw persoonlijke werkgroepen
menu.index=Groepen
menu.index.alt=Werk met jouw groepen
-menu.learninggroups=Mijn leergroepen
-menu.learninggroups.alt=Werk met jouw persoonlijke leergroepen
msg.atleastone=Er moet minstens een eigenaar zijn in deze werkgroep.
right.header=Rechtgroepen
right.intro=Volgende link toont alle rechtgroepen waaraan je deelneemt.
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 ccb7f1490ad..d330778e6b7 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
@@ -8,12 +8,8 @@ index.table.nogroup=Nie jeste\u015B w \u017Cadnej grupie.
info.group.deleted=Grupa projektu zosta\u0142a usuni\u0119ta.
learning.header=Grupy edukacyjne
learning.intro=Poni\u017Csza lista pokazuje wszystkie grupy edukacyjne, w kt\u00F3rych uczestniczysz.
-menu.buddygroups=Moje grupy projektu
-menu.buddygroups.alt=Pracuj ze swoimi grupami projektu
menu.index=Grupy
menu.index.alt=Pracuj ze swoimi grupami
-menu.learninggroups=Moje grupy edukacyjne
-menu.learninggroups.alt=Pracuj ze swoimi grupami edukacyjnymi
menu.opengroups=Grupy "opublikowane"
menu.opengroups.alt=Grupy projektu, kt\u00F3re s\u0105 opublikowane i mo\u017Cna si\u0119 do nich zapisywa\u0107
msg.atleastone=W grupie projektu musi by\u0107 co najmniej jeden w\u0142a\u015Bciciel.
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 67efaaf3f6b..d868d3d677b 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
@@ -15,12 +15,8 @@ index.table.nogroup=Voc\u00EA n\u00E3o est\u00E1 registrado em nenhum grupo.
info.group.deleted=Esse grupo de projeto foi removido.
learning.header=Grupos de estudo
learning.intro=A seguinte lista mostra todos os grupos de estudo que voc\u00EA participa.
-menu.buddygroups=Meus grupos de projeto
-menu.buddygroups.alt=Trabalhar com seus grupos de projeto pessoais
menu.index=Grupos
menu.index.alt=Trabalhar com seus grupos
-menu.learninggroups=Meus grupos de estudo
-menu.learninggroups.alt=Trabalhar com seus grupos de estudo pessoais
menu.opengroups=Grupos publicados
menu.opengroups.alt=Grupos de projetos que s\u00E3o publicados e reservados.
msg.atleastone=Deve haver no m\u00EDnimo um propriet\u00E1rio neste grupo de projeto.
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 e37f71a3647..4d1f8922dba 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
@@ -7,12 +7,8 @@ index.intro=A seguinte lista mostra todos os grupos de projeto, estudo e direito
index.table.nogroup=Voc\u00EA n\u00E3o est\u00E1 registrado em nenhum grupo.
learning.header=Grupos de estudo
learning.intro=A seguinte lista mostra todos os grupos de estudo que voc\u00EA participa.
-menu.buddygroups=Meus grupos de projeto
-menu.buddygroups.alt=Trabalhar com seus grupos de projeto pessoais
menu.index=Grupos
menu.index.alt=Trabalhar com seus grupos
-menu.learninggroups=Meus grupos de estudo
-menu.learninggroups.alt=Trabalhar com seus grupos de estudo pessoais
msg.atleastone=Deve haver no m\u00EDnimo um propriet\u00E1rio neste grupo de projeto.
right.header=Grupos de direitos
right.intro=A seguinte lista mostra todos os grupos de direitos que voc\u00EA participa.
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 c3cc76c2a14..a0aa18f9cc0 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
@@ -8,12 +8,8 @@ index.table.nogroup=\u0412\u044B \u043D\u0435 \u0437\u0430\u043D\u0435\u0441\u04
info.group.deleted=\u0420\u0430\u0431\u043E\u0447\u0430\u044F \u0433\u0440\u0443\u043F\u043F\u0430 \u0431\u044B\u043B\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u0430
learning.header=\u0413\u0440\u0443\u043F\u043F\u044B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F
learning.intro=\u0412 \u043D\u0438\u0436\u0435\u0443\u043A\u0430\u0437\u0430\u043D\u043D\u043E\u043C \u0441\u043F\u0438\u0441\u043A\u0435 \u043D\u0430\u0445\u043E\u0434\u044F\u0442\u0441\u044F \u0432\u0441\u0435 \u0433\u0440\u0443\u043F\u043F\u044B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F, \u0432 \u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0432\u044B \u0443\u0447\u0430\u0441\u0442\u0432\u0443\u0435\u0442\u0435.
-menu.buddygroups=\u041C\u043E\u0438 \u0440\u0430\u0431\u043E\u0447\u0438\u0435 \u0433\u0440\u0443\u043F\u043F\u044B
-menu.buddygroups.alt=\u0420\u0430\u0431\u043E\u0442\u0430 \u0441 \u0412\u0430\u0448\u0438\u043C\u0438 \u0440\u0430\u0431\u043E\u0447\u0438\u043C\u0438 \u0433\u0440\u0443\u043F\u043F\u0430\u043C\u0438
menu.index=\u0413\u0440\u0443\u043F\u043F\u044B
menu.index.alt=\u0420\u0430\u0431\u043E\u0442\u0430 \u0441 \u0412\u0430\u0448\u0438\u043C\u0438 \u0433\u0440\u0443\u043F\u043F\u0430\u043C\u0438
-menu.learninggroups=\u041C\u043E\u0438 \u0433\u0440\u0443\u043F\u043F\u044B \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F
-menu.learninggroups.alt=\u0420\u0430\u0431\u043E\u0442\u0430 \u0441 \u0412\u0430\u0448\u0438\u043C\u0438 \u0433\u0440\u0443\u043F\u043F\u0430\u043C\u0438 \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u044F
msg.atleastone=\u041F\u043E \u043A\u0440\u0430\u0439\u043D\u0435\u0439 \u043C\u0435\u0440\u0435 \u043E\u0434\u0438\u043D \u0432\u043B\u0430\u0434\u0435\u043B\u0435\u0446 \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C \u0437\u0430\u043D\u0435\u0441\u0451\u043D \u0432 \u0440\u0430\u0431\u043E\u0447\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443.
right.header=\u0413\u0440\u0443\u043F\u043F\u044B \u043F\u0440\u0430\u0432 \u0434\u043E\u0441\u0442\u0443\u043F\u0430
right.intro=\u0412 \u043D\u0438\u0436\u0435\u0443\u043A\u0430\u0437\u0430\u043D\u043D\u043E\u043C \u0441\u043F\u0438\u0441\u043A\u0435 \u043D\u0430\u0445\u043E\u0434\u044F\u0442\u0441\u044F \u0432\u0441\u0435 \u0433\u0440\u0443\u043F\u043F\u044B \u043F\u0440\u0430\u0432 \u0434\u043E\u0441\u0442\u0443\u043F\u0430, \u0432 \u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0432\u044B \u0443\u0447\u0430\u0441\u0442\u0432\u0443\u0435\u0442\u0435.
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 54309def1e7..4e5b7237a7e 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
@@ -6,13 +6,9 @@ index.header=Grupet
index.intro=Lista n\u00EB vijim shfaq t\u00EB gjitha grupet e projekteve, t\u00EB m\u00EBsimit dhe t\u00EB t\u00EB drejtave q\u00EB ju i p\u00EBrkisni.
index.table.nogroup=Ju nuk jeni t\u00EB regjistruar n\u00EB ndonj\u00EB grup.
learning.header=Grupe m\u00EBsimit
-learning.intro=Lista n\u00EB vijim shfaq t\u00EB gjitha grupet e m\u00EBsimi n\u00EB t\u00EB cilat ju merrni pjes\u00EB.
-menu.buddygroups=Grupet e mia t\u00EB projektit
-menu.buddygroups.alt=Puno me grupet e projektit personal
+learning.intro=Lista n\u00EB vijim shfaq t\u00EB gjitha grupet e m\u00EBsimi n\u00EB t\u00EB cilat ju merrni pjes\u00EB.
menu.index=Grupet
menu.index.alt=Puna me grupet tuaja
-menu.learninggroups=Grupe e mia t\u00EB m\u00EBsimit
-menu.learninggroups.alt=Puno me grupet tuaja personale t\u00EB m\u00EBsimit
msg.atleastone=Duhet t\u00EB ket\u00EB t\u00EB pakt\u00EBn nj\u00EB pronar n\u00EB grup projekti.
right.header=Grupet e t\u00EB t\u00EB drejtave
right.intro=Lisa n\u00EB vijim shfaq t\u00EB gjitha grupet e t\u00EB drejtave n\u00EB t\u00EB cilat ju i p\u00EBrkisni.
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 3915f79f4ff..9ce01a7b2bc 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
@@ -8,12 +8,8 @@ index.table.nogroup=\u4F60\u6CA1\u6709\u6CE8\u518C\u4EFB\u4F55\u7FA4\u7EC4
info.group.deleted=\u6B64\u9879\u76EE\u5DF2\u88AB\u5220\u9664\u3002
learning.header=\u5B66\u4E60\u7EC4
learning.intro=\u4E0B\u8868\u662F\u6240\u6709\u4F60\u53C2\u52A0\u7684\u5B66\u4E60\u7EC4
-menu.buddygroups=\u6211\u7684\u9879\u76EE\u7EC4
-menu.buddygroups.alt=\u4E0E\u4F60\u7684\u9879\u76EE\u7EC4\u6210\u5458\u534F\u4F5C
menu.index=\u7FA4\u7EC4
menu.index.alt=\u5C0F\u7EC4\u534F\u4F5C
-menu.learninggroups=\u6211\u7684\u5B66\u4E60\u7EC4
-menu.learninggroups.alt=\u4E0E\u4F60\u7684\u5B66\u4E60\u7EC4\u6210\u5458\u534F\u4F5C
msg.atleastone=\u8BE5\u9879\u76EE\u7EC4\u4E2D\u81F3\u5C11\u8981\u6709\u4E00\u4E2A\u6240\u6709\u8005\u3002
right.header=\u6743\u9650\u7EC4
right.intro=\u4E0B\u8868\u662F\u6240\u6709\u4F60\u53C2\u52A0\u7684\u6743\u9650\u7EC4
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 2ef6d253886..cbc59527a44 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
@@ -8,12 +8,8 @@ index.table.nogroup=\u60A8\u5C1A\u672A\u8A3B\u518A\u5230\u4EFB\u4F55\u7FA4\u7D44
info.group.deleted=\u9019\u500B\u5C08\u6848\u7FA4\u7D44\u5DF2\u88AB\u522A\u9664\u4E86\u3002
learning.header=\u5B78\u7FD2\u7FA4\u7D44
learning.intro=\u4E0B\u5217\u7684\u6E05\u55AE\u986F\u793A\u6240\u6709\u60A8\u53C3\u8207\u7684\u5B78\u7FD2\u7FA4\u7D44\u3002
-menu.buddygroups=\u6211\u7684\u5C08\u6848\u7FA4\u7D44
-menu.buddygroups.alt=\u8207\u60A8\u7684\u500B\u4EBA\u5C08\u6848\u7FA4\u7D44\u5DE5\u4F5C
menu.index=\u7FA4\u7D44
menu.index.alt=\u8207\u60A8\u7684\u7FA4\u7D44\u5DE5\u4F5C
-menu.learninggroups=\u6211\u7684\u5B78\u7FD2\u7FA4\u7D44
-menu.learninggroups.alt=\u8207\u60A8\u7684\u500B\u4EBA\u5B78\u7FD2\u7FA4\u7D44\u5DE5\u4F5C
msg.atleastone=\u9019\u500B\u5C08\u6848\u7FA4\u7D44\u81F3\u5C11\u8981\u6709\u4E00\u540D\u64C1\u6709\u8005\u3002
right.header=\u6B0A\u9650\u7FA4\u7D44
right.intro=\u4E0B\u5217\u7684\u6E05\u55AE\u986F\u793A\u6240\u6709\u60A8\u53C3\u8207\u7684\u6B0A\u9650\u7FA4\u7D44\u3002
diff --git a/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_de.properties
index fa72f2c656a..9a662a950c3 100644
--- a/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/group/ui/wizard/_i18n/LocalStrings_de.properties
@@ -1,6 +1,6 @@
#Mon Mar 02 09:54:04 CET 2009
backLink=Zur\u00FCck
-bgcopywizard.copyform.courses=Kurse verbindungen
+bgcopywizard.copyform.courses=Kursverbindungen
bgcopywizard.copyform.areas=Konfiguration Lernbereiche
bgcopywizard.copyform.membersvisibility=Konfiguration Anzeige Mitglieder
bgcopywizard.copyform.name.copy=Kopie
@@ -49,19 +49,19 @@ config.tools.on=ein
config.tools.off=aus
config.resources.title=Kurse
config.resources.desc=Kurse
-config.resources.noresources=Bitte wählen Sie "Kurs hinzufügen", um diese Gruppe in einem Kurs zu verwenden.
+config.resources.noresources=Bitte w\u00E4hlen Sie "Kurs hinzuf\u00FCgen", um diese Gruppe(n) in einem Kurs zu verwenden.
copy.wizard.bgstep=Kopieren "{0}"
-merge.wizard.title=Gruppe zusammenführen
-merge.confirmation=Diese Gruppe werden nach der Zusammenführung gel\u00F6scht: "{0}".
+merge.wizard.title=Gruppe zusammenf\u00FChren
+merge.confirmation=Diese Gruppe werden nach der Zusammenf\u00FChrung gel\u00F6scht: "{0}".
merge.confirmation.title=Best\u00E4tigung
merge.confirmation.description=$merge.confirmation.description
-merge.description=Wählen Sie die Gruppe zu der alle Gruppen zusammen gelegt werden.
+merge.description=W\u00E4hlen Sie die Gruppe zu der alle Gruppen zusammen gelegt werden.
merge.target.group=Zielgruppe
merge.target.title=Zielgruppe ausw\u00E4hlen
merge.target.description=Zielgruppe ausw\u00E4hlen
-email.select.receivers.desc=W\u00E4hlen Sie den Empfänger: Besitzer, Teilnehmer oder alle.
-email.select.receiver.title=Empfänger
-email.select.receiver.description=Empfänger
+email.select.receivers.desc=W\u00E4hlen Sie den Empf\u00E4nger: Besitzer, Teilnehmer oder alle.
+email.select.receiver.title=Empf\u00E4nger
+email.select.receiver.description=Empf\u00E4nger
email.write.title=Email schreiben
email.write.description=Email schreiben
email.select.receivers=E-Mail verschicken
@@ -71,8 +71,8 @@ users.manage.title=Benutzer verwalten
users.manage.desc=Benutzer verwalten
users.email.title=Email versenden
users.email.desc=Email versenden
-users.addowner=Besitzer hinzufügen
-users.addparticipant=Teilnehmer hinzufügen
+users.addowner=Besitzer hinzuf\u00FCgen
+users.addparticipant=Teilnehmer hinzuf\u00FCgen
users.addwaiting=Auf Warteliste setzen
action.general=Aktion
remove=Entfernen
diff --git a/src/main/java/org/olat/repository/RepositoryManager.java b/src/main/java/org/olat/repository/RepositoryManager.java
index e827fe8c1f5..87e36cc0f1b 100644
--- a/src/main/java/org/olat/repository/RepositoryManager.java
+++ b/src/main/java/org/olat/repository/RepositoryManager.java
@@ -1628,14 +1628,10 @@ public class RepositoryManager extends BasicManager {
sb.append("select v from ").append(RepositoryEntry.class.getName()).append(" v ")
.append(" inner join fetch v.olatResource as res")
.append(" left join fetch v.ownerGroup as ownerGroup")
- .append(" left join fetch v.participantGroup as participantGroup")
+ .append(" inner join fetch v.participantGroup as participantGroup")
.append(" left join fetch v.tutorGroup as tutorGroup")
- .append(" where ")
- .append(" v.access>=").append(RepositoryEntry.ACC_USERS)
- .append(" or (")
- .append(" v.access=").append(RepositoryEntry.ACC_OWNERS).append(" and v.membersOnly=true and ")
- .append(" v.key in (select distinct(vmember.key) from ").append(RepositoryEntryStrictParticipant.class.getName()).append(" vmember")
- .append(" where (vmember.repoParticipantKey=:identityKey or vmember.groupParticipantKey=:identityKey)")
+ .append(" where v.key in (select distinct(vmember.key) from ").append(RepositoryEntryStrictParticipant.class.getName()).append(" vmember")
+ .append(" where (vmember.repoParticipantKey=:identityKey or vmember.groupParticipantKey=:identityKey)")
.append(" ))");
appendOrderBy(sb, "v", orderby);
@@ -1666,13 +1662,9 @@ public class RepositoryManager extends BasicManager {
.append(" left join fetch v.ownerGroup as ownerGroup")
.append(" left join fetch v.participantGroup as participantGroup")
.append(" left join fetch v.tutorGroup as tutorGroup")
- .append(" where ")
- .append(" v.access>=").append(RepositoryEntry.ACC_USERS)
- .append(" or ")
- .append(" v.access=").append(RepositoryEntry.ACC_OWNERS).append(" and v.membersOnly=true")
- .append(" and v.key in (select distinct(vmember.key) from ").append(RepositoryEntryStrictTutor.class.getName()).append(" vmember")
- .append(" where (vmember.repoOwnerKey=:identityKey or vmember.repoTutorKey=:identityKey or vmember.groupOwnerKey=:identityKey)")
- .append(" )")
+ .append(" where v.key in (select distinct(vmember.key) from ").append(RepositoryEntryStrictTutor.class.getName()).append(" vmember")
+ .append(" where (vmember.repoOwnerKey=:identityKey or vmember.repoTutorKey=:identityKey or vmember.groupOwnerKey=:identityKey)")
+ .append(" )")
.append(" or ")
.append(" res in (select groupRelation.resource from ").append(BGResourceRelation.class.getName()).append(" as groupRelation, ")
.append(" ").append(SecurityGroupMembershipImpl.class.getName()).append(" as sgmsi,")
diff --git a/src/main/resources/database/mysql/alter_8_1_x_to_8_2_0.sql b/src/main/resources/database/mysql/alter_8_1_x_to_8_2_0.sql
index 03b3bd9a224..b54ae61fd49 100644
--- a/src/main/resources/database/mysql/alter_8_1_x_to_8_2_0.sql
+++ b/src/main/resources/database/mysql/alter_8_1_x_to_8_2_0.sql
@@ -81,7 +81,7 @@ create or replace view o_re_strict_participant_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_part_member on (bg_part_member.secgroup_id = bgroup.fk_partipiciantgroup)
- where re.membersonly=1 and re.accesscode=1
+ where (re.membersonly=1 and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_strict_tutor_v as (
@@ -96,7 +96,7 @@ create or replace view o_re_strict_tutor_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_owner_member on (bg_owner_member.secgroup_id = bgroup.fk_ownergroup)
- where re.membersonly=1 and re.accesscode=1
+ where (re.membersonly=1 and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_membership_v as (
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index 6a822833af2..e97ce13a6e1 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -1230,7 +1230,7 @@ create or replace view o_re_strict_participant_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_part_member on (bg_part_member.secgroup_id = bgroup.fk_partipiciantgroup)
- where re.membersonly=1 and re.accesscode=1
+ where (re.membersonly=1 and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_strict_tutor_v as (
@@ -1245,7 +1245,7 @@ create or replace view o_re_strict_tutor_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_owner_member on (bg_owner_member.secgroup_id = bgroup.fk_ownergroup)
- where re.membersonly=1 and re.accesscode=1
+ where (re.membersonly=1 and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_membership_v as (
diff --git a/src/main/resources/database/postgresql/alter_8_1_x_to_8_2_0.sql b/src/main/resources/database/postgresql/alter_8_1_x_to_8_2_0.sql
index e31a41a8483..a5e512ad85a 100644
--- a/src/main/resources/database/postgresql/alter_8_1_x_to_8_2_0.sql
+++ b/src/main/resources/database/postgresql/alter_8_1_x_to_8_2_0.sql
@@ -81,7 +81,7 @@ create or replace view o_re_strict_participant_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_part_member on (bg_part_member.secgroup_id = bgroup.fk_partipiciantgroup)
- where re.membersonly=true and re.accesscode=1
+ where (re.membersonly=true and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_strict_tutor_v as (
@@ -96,7 +96,7 @@ create or replace view o_re_strict_tutor_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_owner_member on (bg_owner_member.secgroup_id = bgroup.fk_ownergroup)
- where re.membersonly=true and re.accesscode=1
+ where (re.membersonly=true and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_membership_v as (
diff --git a/src/main/resources/database/postgresql/setupDatabase.sql b/src/main/resources/database/postgresql/setupDatabase.sql
index 060cb409927..e9cb8d0fa94 100644
--- a/src/main/resources/database/postgresql/setupDatabase.sql
+++ b/src/main/resources/database/postgresql/setupDatabase.sql
@@ -1227,7 +1227,7 @@ create or replace view o_re_strict_participant_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_part_member on (bg_part_member.secgroup_id = bgroup.fk_partipiciantgroup)
- where re.membersonly=true and re.accesscode=1
+ where (re.membersonly=true and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_strict_tutor_v as (
@@ -1242,7 +1242,7 @@ create or replace view o_re_strict_tutor_v as (
left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
left join o_bs_membership as bg_owner_member on (bg_owner_member.secgroup_id = bgroup.fk_ownergroup)
- where re.membersonly=true and re.accesscode=1
+ where (re.membersonly=true and re.accesscode=1) or re.accesscode>=3
);
create or replace view o_re_membership_v as (
--
GitLab