Merge OpenOLAT default branch to OO377 development branch with...

Merge OpenOLAT default branch to OO377 development branch with ebb75f92613e81449df0fff520426f017b27b33c

.hgtags

@@ -24,3 +24,4 @@ b7a66eba6956d8af9e6159d21058a3cfb968cf75 OpenOLAT 8.1.2
 2dae3d39fe5a7264e7b2d10f24ed631376102873 OpenOLAT 8.1.3
 0dab711bddc8be4198528b3c20d49ca57f3096ce OpenOLAT 8.1.3
 96f9bf85cadb84b0ecdd805bed99f52038f7cd14 OpenOLAT 8.1.4
+17bb7d9400ffb39d74a8f20b287ae0b2c26ba422 OpenOLAT 8.2.0beta

src/main/java/org/olat/_i18n/LocalStrings_de_FX_business.properties

-#Fri Aug 13 15:19:14 CEST 2010
-

src/main/java/org/olat/_i18n/LocalStrings_de_FX_school.properties

-#Fri Aug 13 15:36:00 CEST 2010

src/main/java/org/olat/_i18n/LocalStrings_en_FX_business.properties

-#Fri Aug 13 15:48:22 CEST 2010

src/main/java/org/olat/_i18n/LocalStrings_en_FX_school.properties

-#Fri Aug 13 15:52:22 CEST 2010

src/main/java/org/olat/admin/user/_i18n/LocalStrings_en.properties

-#Mon Apr 02 14:41:09 CEST 2012
+#Wed Oct 24 16:41:40 CEST 2012
 action.bulkedit=Edit these users' attributes
 action.choose=Choose
 action.choose.finish=Choose and finish
@@ -34,6 +34,7 @@ error.search.form.no.valid.datechooser=Please indicate a valid date.
 error.search.form.no.wildcard.dublicates=Search terms including `**` are not allowed.
 error.search.form.notempty=Please fill in at least one field.
 error.search.form.to.short=Search term too short.
+error.search.maxResults=To many results found. Only the first {0} are displayed.
 form.password.new1=New password
 form.password.new2=Confirm password
 form.please.enter.new=Please enter a new password for this user

src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_de_FX_business.properties

-#Thu Sep 02 10:10:35 CEST 2010
-delete.list.example=Einen Benutzername (Login) pro Zeile eingeben\:<br>hansmuster2<br>lenalogik@muster.de<br />usw.<br />

src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_de_FX_school.properties

-#Thu Sep 02 14:49:16 CEST 2010
-delete.list.example=Einen Benutzername (Login) pro Zeile eingeben\:<br>login1<br>login2@tu-dresden.de<br />usw.<br />

src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_en_FX_business.properties

-#Thu Sep 02 12:13:12 CEST 2010
-delete.list.example=Type one user name (login) per line\:<br>johndoe1<br>alansmithee@mycompany.com<br />etc.<br />

src/main/java/org/olat/admin/user/delete/_i18n/LocalStrings_en_FX_school.properties

-#Thu Sep 02 15:27:17 CEST 2010
-delete.list.example=Type one user name (login) per line\:<br>johndoe1<br>alansmithee@myuniversity.edu<br />etc.<br />

src/main/java/org/olat/admin/user/groups/_i18n/LocalStrings_en.properties

-#Tue Jul 14 11:57:09 CEST 2009
+#Wed Oct 24 16:41:50 CEST 2012
+add.groups=Add to group
+add.groups.title=Groups of which this user is a member
 attende=Participants
 attende.and.owner=Owners and participants
+description=Description
+error.choose.one=Please choose at least one group.
+group.add.as=Add as {0}
+group.add.result=Added user to group(s). As owner in "{0}" and as participant in "{1}".
+group.add.result.none=Did not add user to any group. Either none was selected or the user was already member of them.
+group.delete.confirmation=Do you really want to delete the group?
 group.removed=This group does no longer exist\!
+group.result.course=Course\: {0}, {1}
+group.result.desc=Description\: {0}
+group.result.group=Group\: {0}
+group.search.description=Choose the group(s) to which the user should be added as coach or participant.
+no.results=Couldn't find any groups for this search term(s).
 owner=Owners
+result=Found Groups
+search.field=Search a group\:
+send.email=Send invitational email
+send.email.notif=Do you want to send a notification to the user? 
+table.group.add.participant=Add as participant
+table.group.add.tutor=Add as coach
 table.group.name=Group name
 table.group.type=Type of group
+table.header.resources=$org.olat.group.ui.main\:table.header.resources
 table.user.joindate=Time of entry
 table.user.role=User role
-add.groups.title=Groups of which this user is a member
-waiting=On waiting list in position {0}
 table.user.unsubscribe=Unsubscribe
-table.header.resources=$org.olat.group.ui.main\:table.header.resources
-table.group.add.tutor=Add as coach
-table.group.add.participant=Add as participant
-add.groups=Add to group
+unsubscribe.group.del=This user is the alone owner of this group. This group will therefore be deleted forever by this step.
 unsubscribe.successful=You successfully unsubscribed the user from group "{0}".
-unsubscribe.title=Unsubscribe user from group
 unsubscribe.text=Do you really want to unsubscribe the user "{0}" from the group "{1}" ?
-unsubscribe.group.del=This user is the alone owner of this group. This group will therefore be deleted forever by this step.
-group.add.as=Add as {0}
-group.search.description=Choose the group(s) to which the user should be added as coach or participant.
-group.add.result=Added user to group(s). As owner in "{0}" and as participant in "{1}".
-group.add.result.none=Did not add user to any group. Either none was selected or the user was already member of them.
-group.result.desc=Description: {0}
-group.result.course=Course: {0}, {1}
-group.result.group=Group: {0}
-search.field=Search a group:
-result=Found Groups
-send.email=Send invitational email
-send.email.notif=Do you want to send a notification to the user? 
-description=Description
-error.choose.one=Please choose at least one group.
-no.results=Couldn't find any groups for this search term(s).
+unsubscribe.title=Unsubscribe user from group
+waiting=On waiting list in position {0}
\ No newline at end of file

src/main/java/org/olat/core/_i18n/LocalStrings_de_FX_business.properties

-#Fri Aug 13 15:19:14 CEST 2010
-this.language.in.english=German
-this.language.translated=Deutsch
-this.language.translator.names=frentix

src/main/java/org/olat/core/_i18n/LocalStrings_de_FX_school.properties

-#Fri Aug 13 15:36:00 CEST 2010
-this.language.in.english=German
-this.language.translated=Deutsch
-this.language.translator.names=frentix

src/main/java/org/olat/core/_i18n/LocalStrings_en_FX_business.properties

-#Fri Aug 13 15:48:22 CEST 2010
-this.language.in.english=English
-this.language.translated=English
-this.language.translator.names=frentix

src/main/java/org/olat/core/_i18n/LocalStrings_en_FX_school.properties

-#Fri Aug 13 15:52:22 CEST 2010
-this.language.in.english=English
-this.language.translated=English
-this.language.translator.names=frentix

src/main/java/org/olat/core/util/i18n/ui/TranslationToolStartCrumbController.java

@@ -179,7 +179,7 @@ class TranslationToolStartCrumbController extends CrumbFormBasicController {
 		ArrayHelper.sort(referencelangKeys, referenceLangValues, false, true, false);
 		// Build css classes for reference languages
 		String[] referenceLangCssClasses = i18nMgr.createLanguageFlagsCssClasses(referencelangKeys, "b_with_small_icon_left");
-		// fxdiff: FXOLAT-213 Use first reference locale as default
+		// Use first reference locale as default
 		referenceLocale = i18nMgr.getLocaleOrNull(referenceLangs.get(0));
 		// Override with user preset
 		Preferences guiPrefs = usess.getGuiPreferences();
@@ -201,15 +201,8 @@ class TranslationToolStartCrumbController extends CrumbFormBasicController {
 			// Use all enabled languages in customizing mode
 			translatableKeys = I18nModule.getOverlayLanguageKeys();
 		} else {
-			// Since 6.2 the user can only translate the language he has set in his preferences
-			translatableKeys = new HashSet<String>();
-			if (I18nModule.getTranslatableLanguageKeys().contains(i18nMgr.getLocaleKey(getLocale()))){
-				translatableKeys.add(i18nMgr.getLocaleKey(getLocale()));
-			} else {
-				// ups, user language is not translatable, give user choice to
-				// select one of the translatable languages
-				translatableKeys = I18nModule.getTranslatableLanguageKeys();
-			}
+			// Allow translators to also translate other languages if they really desire. Show all languages.
+			translatableKeys = I18nModule.getTranslatableLanguageKeys();
 		}
 		String[] targetlangKeys = ArrayHelper.toArray(translatableKeys);
 		String[] targetLangValues = new String[targetlangKeys.length];

src/main/java/org/olat/course/area/_i18n/LocalStrings_en.properties

+#Wed Oct 24 16:32:07 CEST 2012
 action=Action
-course.areas.title=Learning areas within course
 course.areas.description=Create a new learning area with the button below. You can then use the learning area in the course editor to limit course element across and assign groups to learning areas.
-table.header.name=Name
-table.header.description=Description
+course.areas.title=Learning areas within course
+create.area=Create learning area
 delete=Delete
+delete.area.description=Do you really want to delete the learning area "{0}"?
+delete.area.title=Delete learning area
 edit=Edit
-create.area=Create learning area
+resources.noresources=No learning areas have been created in this course so far.
\ No newline at end of file
+table.header.description=Description
+table.header.name=Name

src/main/java/org/olat/course/assessment/_i18n/LocalStrings_de_FX_business.properties

-#Thu Sep 02 09:51:23 CEST 2010
-institutionalname=Firma\:
-institutionaluseridentifier=Personalnummer\:

src/main/java/org/olat/course/assessment/_i18n/LocalStrings_de_FX_school.properties

-#Thu Sep 02 14:34:25 CEST 2010
-institutionalname=Lehranstalt\:
-institutionaluseridentifier=Identifikation\:
-lastname=Name\:

src/main/java/org/olat/course/assessment/_i18n/LocalStrings_en.properties

-#Mon Apr 02 14:40:27 CEST 2012
+#Wed Oct 24 16:40:34 CEST 2012
 action.choose=Select 
 artefact.title=Evidence of achievement for course {0}
 assessmentLock=This assessment is currently modified by user {0} ({1}) and is therefore locked. Please try again later.
@@ -48,7 +48,17 @@ efficiencyStatementsPortlet.description=Fast access to the evidences of achievem
 efficiencyStatementsPortlet.nostatements=There is no evidence of achievement available for you
 efficiencyStatementsPortlet.showAll=Show all
 efficiencyStatementsPortlet.title=My evidence of achievement
+efficiencystatement.config=Change configuration
+efficiencystatement.config.off=disabled
+efficiencystatement.config.on=enabled
+efficiencystatement.intro.1=Courses with course elements that have assessment information (score/passed) will generate an efficiency statement for each user. This efficiency statement is automatically updated whenever the assessment data changes, either manually by a coach or by a test execution. The efficiency statement can be accessed by the user in the course toolbox or in the users home area.
+efficiencystatement.intro.2=The efficiency statement feature can be enabled/disable in the course configuration as desired. At this time, the generation of the efficiency statement is <strong>{0}</strong>.
+efficiencystatement.intro.3=When you change the assessment rules or add assessable course elements in a course while the course is already being used by learnings the efficiency statements should be recalculated.
+efficiencystatement.intro.4=Select the button below to recalculate the efficiency statements for this course now. This action can take a moment.
 efficiencystatement.nodata=There are no assessment results to be displayed
+efficiencystatement.recalculate=Recalculate efficiency statements
+efficiencystatement.recalculate.finished=The efficiency statements have been recalculated.
+efficiencystatement.recalculate.warning=With this selection the efficiency statements for this course will be recalculated. This can take a while. Do you want to proceed now?
 efficiencystatement.title=Evidence of achievement
 email=E-mail\:
 finished=Close
@@ -102,6 +112,8 @@ lastname=Last name\:
 log.title=Modification log
 menu.bulkfocus=Bulk assessment
 menu.bulkfocus.alt=Bulk assessment of course elements regarding assessment and tasks.
+menu.efficiency.statment=Efficiency statements
+menu.efficiency.statment.alt=$\:menu.efficiency.statment
 menu.groupfocus=As per group
 menu.groupfocus.alt=Select a group to obtain a survey of the participants' assessments
 menu.index=Assessment