diff --git a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
index a0edc35c75b248b314b35c4142fff4df3358beef..f3fe7100b3d81d3b5787a4ce1501cb5f7eef3296 100644
--- a/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Wed Aug 28 22:04:15 CEST 2013
+#Mon Mar 14 09:42:39 CET 2016
 allow.dmz.requests.done=All requests on DMZ will be allowed again from now on
 allow.login.done=Blocking of login cancelled.
 block.login.done=New logins blocked from now on.
@@ -33,6 +33,25 @@ filesystemtest.nbrCharInFile.label=Number of characters within a file, rounded u
 filesystemtest.on=Activate file-system test
 filesystemtest.reload=Reload
 filesystemtest.start=Start test
+hibernate.entities=JPA Entities
+hibernate.entity.delete=\# Delete
+hibernate.entity.entity=Entity
+hibernate.entity.fetch=\# Fetch
+hibernate.entity.insert=\# Insert
+hibernate.entity.load=\# Load
+hibernate.entity.optimisticFailure=\# Optimistic failure
+hibernate.entity.update=\# Update
+hibernate.queries=JPA Queries
+hibernate.query.average=Avg.
+hibernate.query.count=\#
+hibernate.query.hits=\# Hits
+hibernate.query.max=Max.
+hibernate.query.min=Min.
+hibernate.query.miss=\# Miss
+hibernate.query.puts=\# Put
+hibernate.query.query=Query
+hibernate.query.row=Rows
+hibernate.statistics=Statistics
 infomsg=Message
 infomsg.nomsg=No message available
 infomsg.preview=Preview
@@ -101,7 +120,6 @@ runtime.users.lastmonth=Last month
 runtime.users.lastweek=Last 7 days
 runtime.users.lastyear=Last year
 sess.access=Last access
-sess.lastClick=Last click
 sess.active=Active users
 sess.and.clicks=$\:sess.active
 sess.attributes.title=Attributes
@@ -124,6 +142,7 @@ sess.kill.sure=Are you sure you would like to invalidate this user session?
 sess.last=Last name
 sess.last.1.minute=Last minute
 sess.last.5.minutes=Last 5 minutes
+sess.lastClick=Last click
 sess.locale=Language
 sess.locks.hold=Identity disables the following objects\:
 sess.locks.nolock=Identity does currently not hold any disabled objects.
@@ -162,5 +181,6 @@ sysinfo.startuptime=Server startup time
 sysinfo.version=Version
 sysinfo.version.date=Build date
 sysinfo.version.hg=Mercurial version
+title.connection.statistics=Database connections statistics
 title.hibernate.statistics=Hibernate database access statistics
 usersession.title=Information on user sessions
diff --git a/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties
index 8ab6a34e59fcb34187fe853db589a67e12430158..9c5661896b9daef1a19c86ed5793ffd1a4f2038a 100644
--- a/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties
@@ -1,4 +1,4 @@
-#Sun Nov 29 17:18:08 CET 2015
+#Mon Mar 14 09:48:56 CET 2016
 cal.add.event=Ajouter rendez-vous
 cal.add.readonly=(lecture uniquement)
 cal.color.choose=Choisir la couleur
@@ -120,6 +120,7 @@ cal.notifications.location=dans {0}
 cal.notifications.title=
 cal.previousweek=<< Semaine pr\u00E9c\u00E9dante
 cal.print.desc=S\u00E9lectionnez la date de d\u00E9but et de fin.
+cal.print.title=Ev\u00E9nements
 cal.sat=Samedi
 cal.search.beginPeriod=De (Date)
 cal.search.button=Recherche de rdv
diff --git a/src/main/java/org/olat/core/util/i18n/devtools/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/util/i18n/devtools/_i18n/LocalStrings_en.properties
index e0c43abf9885d025daca177b10502265038858f2..319e6050cb3062bcb520cd9db9d469286d26274b 100644
--- a/src/main/java/org/olat/core/util/i18n/devtools/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/core/util/i18n/devtools/_i18n/LocalStrings_en.properties
@@ -1,18 +1,66 @@
-#Fri Sep 25 09:11:16 CEST 2015
+#Mon Mar 14 09:46:27 CET 2016
 caching.enabled=Cache is activated. In order to be able to use developer tools it has to be deactivated first.
 coreasjar=The olatcore framework is loaded as Jar. Therefore you cannot make modifications.
 devtools.title=Developer tools for translation purposes
+devtools.warning=The i18nModul muss be activated. Configure the following line in your olat.local.properties\:<br/><br/>is.translation.server\=enabled<br/>i18n.application.src.dir\=${project.build.home.directory}/src/main/java
 menu.i18nDev=i18n maintenance
 menu.i18nDev.alt=i18n maintenance
+submitAddKey=Add key\!
+submitGetDupKeys=Get duplicate keys
+submitGetDupVals=Get duplicate values
+submitMerge=Merge it
+submitMove=Move it
+submitMoveKey=Move key
+submitMoveKeyToBundle=Move key
+submitRemoveDeleted=Remove deleted keys
+submitRemoveEmpty=Remove empty keys
+submitRemoveKey=Remove key
+submitRemovePackage=Remove package
+submitRemoveTodo=Remove todo keys
+submitRenameKey=Rename key
+submitRenameLanguage=Rename language
+submitSort=Sort it
+task.add.key=Add new key
+task.add.key.bundle=Bundle
+task.add.key.key=Key
+task.add.key.locale=Locale
+task.add.key.value=Value
 task.delete.key=Delete key
 task.delete.package=Delete package
 task.find.douplicates=Find duplicates
 task.find.unreferenced.keys=Find keys not referenced yet
 task.merge.package=Assemble packages
 task.move.key=Move keys
+task.move.key.key=Key
+task.move.key.to.bundle=Move key
 task.move.language=Move language
 task.move.package=Move package
+task.move.package.source=Source
+task.move.package.target=Target
+task.remove.deletedKeys=Remove deleted keys
+task.remove.deletedKeysCheck=Dry run
+task.remove.emptyKeys=Remove empty keys
+task.remove.emptyKeysCheck=Dry run
+task.remove.key=Remove key
+task.remove.key.bundle=Bundle
+task.remove.key.key=Key
+task.remove.key.locale=Locale
+task.remove.package=Remove package
+task.remove.package.bundle=Bundle
+task.remove.todoKeys=Remove todo keys
+task.remove.todoKeysCheck=Dry run
+task.remove.xKeys=Remove x keys
+task.remove.xKeysCheck=Dry run
 task.remove.xkeys=Delete x-keys
 task.rename.key=Rename key
+task.rename.key.bundle=Bundle
+task.rename.key.orig=Original key name
+task.rename.key.origBundle=Original bundle
+task.rename.key.target=Target key name
+task.rename.key.targetBundle=Target bundle
 task.rename.language=Rename language
+task.rename.language.source=Source language
+task.rename.language.target=Target language
+task.sort.check=Dry run
+task.sort.keys=Sort all keys
 task.unknown.keys=Show/delete wrong keys
diff --git a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties
index 83b4ad77fa8440009ab3c0bd33dba6d34bb0af23..14bf5fb24fbcf83694480139fcb76e7a702d7fba 100644
--- a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_en.properties
@@ -1,39 +1,5 @@
-#Tue Dec 16 09:01:11 CET 2014
+#Mon Mar 14 09:37:22 CET 2016
 checklist=Checklists
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 cl=Checklists
 cmd.download=Download
 cmd.start=Start
@@ -68,7 +34,6 @@ course.res.title=Course results
 dialog=File dialogs
 fo=Forums
 gta=Tasks and group tasks
-
 index.intro=By means of this tool you can archive various data from your OLAT course.<p> Choose a topic from the menu on the left to start.
 index.title=Data archiving tool
 legend=Legende
@@ -107,6 +72,7 @@ menu.wikis.alt=Archive Wikis
 nodechoose.intro.cl=Please select the checklist element you wish to archive.
 nodechoose.intro.dialog=Select a course element to archive its file dialog.
 nodechoose.intro.fo=Select a course element to archive its forum.
+nodechoose.intro.gta=Choose a course element to archive the group tasks.
 nodechoose.intro.projectbroker=Please select a course element to archive its topic assignment.
 nodechoose.intro.scorm=In the following dialog please select the SCORM element to be assessed.
 nodechoose.intro.ta=Select a course element in order to archive its tasks/solutions.
diff --git a/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties
index 286e8c34d67c2801088390f47069c130d75307bc..b22711dcafdbeafd9565408fe984d2f0a64e9156 100644
--- a/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Wed Sep 09 09:42:41 CEST 2015
+#Mon Mar 14 09:40:12 CET 2016
 add.mode=Create exam setting
 admin.menu.title=Assessment mode
 admin.menu.title.alt=$\:admin.menu.title
@@ -10,6 +10,7 @@ assessment.mode.enabled=Enable assessment mode
 assessment.mode.enabled.on=on
 assessment.mode.id=ID
 assessment.mode.name=Name
+assessment.mode.title=Configuration of the assessment mode
 choose.areas=Select learning areas
 choose.elements=Select course element
 choose.groups=Select groups
@@ -23,6 +24,7 @@ confirm.status.change.assessment=The exam will be started.
 confirm.status.change.end=The exam will be ended.
 confirm.status.change.followup=The exam is in follow-up time.
 confirm.status.change.leadtime=The exam is in preparation time.
+confirm.status.change.none=Assessment will set as "not started"
 confirm.status.change.title=The state of the exam setting will be changed.
 confirm.stop.text=Do you want to end the exam now?
 confirm.stop.title=End the exam
@@ -44,6 +46,7 @@ error.atleastone=Please, choose at least one exam setting.
 error.begin.after.end=The start date must be before the end date.
 error.course.element.mandatory=Please select the relevant course elements.
 error.group.missing=You must choose at least one group.
+error.in.assessment=You cannot delete an assessment which is running.
 error.ip.range=You are not in the right network.
 error.safe.exam=Please, use the Safe Exam Browser.
 form.mode.description=Create a new exam setting in order to run this course or a single course elements in a safe mode with restricted options.
@@ -91,4 +94,5 @@ target.course=Course participants only
 target.courseAndGroups=Participants from course and groups
 target.groups=Group participants only
 time.formatted={0}m
+warning.missing.element=One or more configured course elements cannot be found in course. Please check the restrictions of the course element.
 warning.missing.start.element=The defined start course element was not found in course.
diff --git a/src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_en.properties
index 8161f47ffce8b2d33309bc7f749ca822897963c5..a4886002c166afd052754649c88422e2a0e5b685 100644
--- a/src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/bc/_i18n/LocalStrings_en.properties
@@ -1,14 +1,23 @@
-#Mon Sep 29 10:58:35 CEST 2014
+#Mon Mar 14 09:40:50 CET 2016
+chooseFolder=Choose Folder
 condition.accessDownloaders.title=Read only (download)
 condition.accessUploaders.title=Write (upload)
-folder.view=Open folder
-chooseFolder=Choose folder
+createButton=Create folder
 createFolder=Create folder
+createPath=Path to create
+error.missingfolder.long=Incomplete folder configuration
+error.missingfolder.short=Incomplete folder configuration
+folder.view=Open folder
 info.folder=Transfer files
-info.select=Select folder
 info.quota=Modify quota of this folder
+info.select=Select folder
+info.sharedfolder=No uploads are allowed into a configured resource folder, all course members are granted reading rights (Downloads) only.
+noFolder=The pre-configured folder has been removed. Please contact your course administrator.
 pane.tab.accessibility=Access
 pane.tab.folder=Folder configuration
+pathChoose=File destination
+pathChoose.auto=Automatically generated folder
+pathChoose.custom=Choose folder from course storage
 peekview.allItemsLink=All documents
 preview.canDownload=Download allowed
 preview.canUpload=Upload allowed 
@@ -17,17 +26,8 @@ preview.downloadfile=Download files
 preview.header=Configuration folder for simulated user
 preview.info=The content of this folder is shown below (read only for preview\!)
 preview.quotaKB=Quota in KB
-title_bc=Folder
-pathChoose=File destination
-pathChoose.auto=Automatically generated folder
-pathChoose.custom=Choose folder from course storage
-subPathLab.label=File path
 subPathLab.dummy=There is no folder configured yet
-error.missingfolder.short=Incomplete folder configuration
-error.missingfolder.long=Incomplete folder configuration
-noFolder=The pre-configured folder has been removed. Please contact your course administrator.
-createPath=Path to create
-createButton=Create folder
-warning.no.sharedfolder=The configured resourcefolder is not available anymore!
-info.sharedfolder=No uploads are allowed into a configured resource folder, all course members are granted reading rights (Downloads) only.
-chooseFolder=Choose Folder
\ No newline at end of file
+subPathLab.label=File path
+title_bc=Folder
+warn.folderdelete=Warning\: all the files of the folder will be deleted.
+warning.no.sharedfolder=The configured resourcefolder is not available anymore\!
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
index bdb2aa6fe2f911378c967980dd997bf625a074b9..f68b45694a276cd7831fda334dca875fc2a76632 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Wed Jun 17 14:57:53 CEST 2015
+#Mon Mar 14 09:41:44 CET 2016
 add.solution=Add solution
 add.task=Add task
 assessment.group.tool=Grade group
@@ -7,10 +7,10 @@ assignment.deadline=Assignment deadline
 before=beforehand
 bulk.download.title=Download all submitted files
 bulk.review=Download review
+bulk.revisions=Download revised documents
 bulk.solutions=Download solutions
 bulk.submitted.documents=Download submitted documents
 bulk.submitted.revisions=Download submitted corrections
-bulk.revisions=Download revised documents
 change.group=Change active group
 change.group.description=You are participating in multiple groups.
 choose.areas=Select areas
@@ -19,8 +19,8 @@ choosed.areas=Areas
 choosed.groups=Groups
 coach.assessment=Grade
 coach.close.revision.button=Revision accepted
-coach.corrections.description=You have returned the following documents.
 coach.corrections.closed=The submission has been accepted for grading
+coach.corrections.description=You have returned the following documents.
 coach.corrections.rejected=The submission has been rejected for revision.
 coach.corrections.waiting=The submission is waiting to be reviewed
 coach.document=Documents
@@ -30,11 +30,11 @@ coach.need.revision.button=Needs revision
 coach.reviewed.button=Submission accepted
 coach.reviewed.confirm.text=Please confirm your acceptance of the submitted documents. The task is now closed for the user, and there is no revision option available.
 coach.reviewed.confirm.title=Confirm acceptance of submitted documents
-coach.revisions.description=You have received the following revised documents
-coach.revisions.nofiles=The revision was submitted without documents
 coach.revisions.confirm.text=Please confirm the request for a revision. The user is now allowed to submit more documents.
 coach.revisions.confirm.text.warn=This will close the return box. If you wish to upload or create a feedback for this user, click "Cancel".
 coach.revisions.confirm.title=Revision needed
+coach.revisions.description=You have received the following revised documents
+coach.revisions.nofiles=The revision was submitted without documents
 coach.submit.corrections.to.revision.button=$\:coach.need.revision.button
 coach.submitted.documents.description=These documents have been submitted
 coach.submitted.nofiles=The submission was done without documents
@@ -126,6 +126,7 @@ process.graded=Graded
 process.grading=Grading
 process.grading.explanation=The coach is grading the task.
 process.no=Assignment
+process.no.explanation=The user choose now a task.
 process.review=Review
 process.review.explanation=The coach is reviewing the submitted documents.
 process.revision=Revision
@@ -151,7 +152,7 @@ run.assignment.title=Task assignment
 run.coach=Correct
 run.coach.corrections.description=You have set the following correction request.
 run.corrections.description=Your coach attached the following files for you\:
-run.corrections.rejected=$:\coach.corrections.rejected
+run.corrections.rejected=$\:coach.corrections.rejected
 run.documents.successfully.submitted=Your document(s) have been successfully submitted.
 run.grading=Grading
 run.pick.task.description=Please select a task from the list below.
@@ -195,8 +196,8 @@ submission=Submission
 submission.confirmation=The submission of $numberOfFiles file(s) ($filename) for $first $last ($email) at $date, $time has been confirmed.
 submission.email.confirmation=Send text additionally as email
 submission.enabled=Enable solution drop box for participants
-submission.nofile=No file uploaded
 submission.mail.subject=OpenOLAT-confirmation-E-Mail
+submission.nofile=No file uploaded
 submission.text=Text after handing in
 submit.deadline=Submission deadline
 table.header.author=Author
@@ -237,11 +238,9 @@ wait.for.solutions=The sample solution will be displayed at the date specified a
 warning.group.pick.task=This is a group task\! The selection made here is valid for all members of the group "{0}"\! Make sure you discussed this selection within the group prior to selecting a task\! Only one member of the group can select the task for the group.
 warning.group.submit=This is a group task\! The submitted document is valid for all members of the group "{0}"\! Make sure you discussed this solution document prior to uploading it here\! Only one member of the group can submit a solution on behalf of all group members.
 warning.group.task=This is a group task\! The task assignment, submission of documents and grading are performed as a group. Contact your group peers on how to proceed on deciding for a task and to collaboratively solve the task.
-warning.no.task.choosed=It seems that due to a change in the course element configuration, you weren't able to choose a task for this task element.
-warning.no.task.choosed.coach=It seems that due to a change in the course element configuration, the assignee wasn't able to choose a task for this task element.
-warning.tasks.in.process.title=Task already started
-warning.tasks.in.process.text=There are already users who have started the task process. Changing the workflow configuration could result in problems for these users.
-warning.tasks.in.process.delete.title=$\:warning.tasks.in.process.title
+warning.no.task.choosed=It\u00A0seems\u00A0that\u00A0due\u00A0to\u00A0a\u00A0change in the course element configuration, you\u00A0weren't\u00A0able\u00A0to\u00A0choose a\u00A0task\u00A0for\u00A0this\u00A0task element.
+warning.no.task.choosed.coach=It\u00A0seems\u00A0that\u00A0due\u00A0to\u00A0a\u00A0change in the course element configuration, the assignee\u00A0wasn't\u00A0able\u00A0to\u00A0choose a\u00A0task\u00A0for\u00A0this\u00A0task element.
 warning.tasks.in.process.delete.text=Do you really wan to delete this task? There are already users who have started the task process. It could result in problems for these users.
-
-
+warning.tasks.in.process.delete.title=$\:warning.tasks.in.process.title
+warning.tasks.in.process.text=There are already users who have started the task process. Changing the workflow configuration could result in problems for these users.
+warning.tasks.in.process.title=Task already started
diff --git a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_fr.properties
index 75647ac1c613d5e94f0f08ba69d520981c0ab165..ed612baa992e23e304f1741d5b2ff18dd1679c42 100644
--- a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_fr.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Mon Mar 14 09:48:22 CET 2016
 advance.score.label=Emp\u00EAcher le nombre de points d'\u00EAtre diminu\u00E9 apr\u00E8s une nouvelle tentative
 assessable.label=Transmettre points de SCORM
 assessable.type.none=Ne pas reporter
@@ -10,27 +10,6 @@ attempts.max.reached=Le nombre maximum de tentatives a \u00E9t\u00E9 atteint.
 attempts.noLimit=illimit\u00E9
 attempts.nomoreattempts=Vous ne disposez pas d'essais suppl\u00E9mentaires
 attempts.yourattempts=Nombre d'essais effectu\u00E9s
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 chosencp=Contenu didactique SCORM
 closeonfinish.label=Ferm\u00E9 le module automatiquement si termin\u00E9
 command.changecp=Remplacer contenu didactique SCORM
@@ -43,6 +22,7 @@ condition.accessibility.title=Acc\u00E8s
 cutvalue.label=Nombre de points n\u00E9cessaire pour 'R\u00E9ussi'
 cutvalue.validation=Introduisez un nombre entier
 error.cprepoentrymissing=Le contenu didactique SCORM que vous voulez afficher a \u00E9t\u00E9 effac\u00E9 entre-temps du dossier des contenus didactiques.
+error.cprepoentrymissing.user=La ressource didactique SCORM auquel vous essayez d'acc\u00E9der n'existe plus. Contactez s'il vous pla\u00EEt le coach de votre cours.
 error.launch=Contenu didactique SCORM n'a pas pu \u00EAtre lanc\u00E9.
 error.noreference.long=Pour "{0}", il faut s\u00E9lectionner, dans la configuration, un contenu didactique SCORM dans l'onglet "contenu didactique".
 error.noreference.short=Aucun contenu didactique SCORM n'a \u00E9t\u00E9 s\u00E9lectionn\u00E9 pour "{0}" .
@@ -51,8 +31,6 @@ form.scormmode.normal=normal
 fullwindow.label=Afficher le module seul, masquer le LMS
 header=S\u00E9lectionner contenu didactique SCORM
 headerform=R\u00E8glages
-
-
 no.cp.chosen=<i>Aucun contenu didactique SCORM s\u00E9lectionn\u00E9</i>
 pane.tab.accessibility=Acc\u00E8s
 pane.tab.cpconfig=Contenu didactique
diff --git a/src/main/java/org/olat/ldap/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/ldap/ui/_i18n/LocalStrings_en.properties
index ddfe7d7ab792a841c489e7de6a428e438e600e91..3da702b021b3969b2f48cf0f9b920090b8782e9f 100644
--- a/src/main/java/org/olat/ldap/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/ldap/ui/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Thu May 26 10:41:06 CEST 2011
+#Mon Mar 14 09:45:03 CET 2016
 admin.deleteUser.intro=Delete all users who were deleted from the LDAP directory
 admin.deleteUser.title=Delete users
 admin.logview.title=Logging
@@ -16,9 +16,9 @@ authentication.provider.description=Do you have an account on the central LDAP s
 authentication.provider.linkText=Login with LDAP account
 checkall=Select all
 delete.button.start=Start
-delete.error.lock=Another adminisstration process is still running. Please try again later.
-delete.error.connection = An error occured during connection with LDAP server. Please check your LDAP settings and try it again later.
+delete.error.connection=An error occured during connection with LDAP server. Please check your LDAP settings and try it again later.
 delete.error.connection.close=The LDAP connection could not be closed after manual sync process.
+delete.error.lock=Another adminisstration process is still running. Please try again later.
 delete.setp1.content.confirm=The following users will be deleted\:
 delete.step.cancel=Abort; no users deleted\!
 delete.step.finish.noUsers=No users deleted\!
@@ -28,7 +28,9 @@ delete.step0.content=Select users to be deleted.
 delete.step0.description=Select users
 delete.step1.content.nothingToDelete=No users selected. Please go back to select some users or click on "Finish" to abort deletion.
 delete.step1.description=Confirm
+error.password.change.not.allow=You are registrated in OpenOLAT with a LDAP account. To change your password, please contact your system administrator.
 full.sync.button.start=Start full sync
+ldap.maintenance=Maintenance
 lf.error.loginempty=Please insert your LDAP user name.
 lf.error.passempty=Please insert your LDAP password.
 lf.login=LDAP user name
@@ -38,8 +40,7 @@ login.form=OLAT login via LDAP
 login.intro=Please log in with your LDAP user name and password.
 login.notauthenticated=<b>Not authenticated for OLAT</b><p>You are not allowed to log in to OLAT.</p><p>Contact user administration to gain access.</p>
 one.user.sync.button.start=Synchronize user account
-sync.button.start=Start incremental sync
-uncheckall=Deselect all
 remove.fallback.auth=Delete cached fallback-authentications
 remove.fallback.auth.info=By removing the fallback-authentications a login is not possible anymore should the connection to the LDAP-server fail. The cache works again after a successful login.
-ldap.maintenance=Maintenance
\ No newline at end of file
+sync.button.start=Start incremental sync
+uncheckall=Deselect all