diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 892a97d28b329a0ff91ed5abb93a33b73c027658..d2b3826c7b2aca9980758cea8aa4151c4b8edb11 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4833,13 +4836,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index c567ddee3d29c7cceb3d0de26c9a1d4ac44c1db4..b048ae5ae55dbb87fec17fc9b51f3c122376582a 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Canceŀla-ho tot"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Especifiqueu un nom d'usuari vàlid."
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Especifiqueu la vostra contrasenya."
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "El compte és blocat. Contacteu el vostre administrador de sistemes."
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Només lectura"
 
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index eb353b808589e62d56f5cd4a3b907988065ce554..c84e0db1ace8be66fe7a2d9580d17d20ac5e3504 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Této skupině umožnit připojení pouze na počítače z tohoto seznamu"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Oprávnění"
 
@@ -2185,7 +2185,7 @@ msgstr "Vybrat vše"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Vybrat vše"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Vyjmout"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Vložit"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr "Filtr je neúplný!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Chyba oprávnění"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Nejste oprávněn(a) vytvořit snímek %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Nejste oprávněni obnovit zachycený stav %s."
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "Výkonnost LDAPu je špatná: poslední dotaz trval celých %.2fs!"
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr "%s nejsou dovolené!"
 msgid "Missing %s PHP extension!"
 msgstr "Chybějící rozšíření PHP %s!"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr "Nedaří se vytvořit informaci o zamykání ve stromu LDAP. Kontaktujte
 msgid "LDAP server returned: %s"
 msgstr "LDAP server odpověděl: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Při pokusu o vyhrazení přístupu k objektu bylo nalezeno několik již existujících zámků. To by se nemělo stávat – probíhá jejich odstraňování."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit velikosti položek %d je překročen!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "nastavit novou hodnotu limitu %s a v případě, že ani to nebude stačit, zobrazit toto hlášení znovu"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Nastavit"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "neúplné"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Přesto pokračovat"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Přesto upravit"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "chystáte se upravit položky LDAPu %s"
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr "Panel %s"
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Zrušit vše"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Nelze vložit"
 
@@ -3829,52 +3828,56 @@ msgstr "Neplatný parametr %s pro zásuvný modul!"
 msgid "No session found!"
 msgstr "Nebyla nalezena žádná relace!"
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr "Chyby nahlášené při kontrole LDAP schématu:"
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Zadejte platné uživatelské jméno!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Zadejte své heslo!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Zkontrolujte prosím správnost kombinace zadaného uživatelského jména a hesla."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Účet je uzamčen. Kontaktujte svého správce systémů!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4812,13 +4815,17 @@ msgid "Locking conflict detected"
 msgstr "Zjištěn konflikt při vyhrazování prostředků."
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Pokud se domníváte, že položku nikdo jiný v tuto chvíli neupravuje a proto by neměla být uzamčena, došlo k tomu nejspíš tak, že někdo zavřel okno prohlížeče ve chvíli, kdy ji upravoval. V takovém případě zamčení překonejte kliknutím na 'přesto upravit'."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Pouze pro čtení"
 
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index ac1399ed4c11206790238674d27f5c07b44c5f70..7c2c57f75ea43823eca9e29703fc5a90f6c1f8ee 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Nur dieser Gruppe erlauben, dieser Liste von Hosts zu verbinden"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Berechtigung"
 
@@ -2185,7 +2185,7 @@ msgstr "Alle auswählen"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Alle auswählen"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Ausschneiden"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Einfügen"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr "Der Filter ist unvollständig!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f S
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr "'%s' sind nicht erlaubt!"
 msgid "Missing %s PHP extension!"
 msgstr "Fehlenden %s PHP-Erweiterung!"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sie bearbeiten gerade den/die LDAP Eintrag/Einträge %s"
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Alle abbrechen"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Kann nicht einfügen"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr "Keine Sitzung gefunden!"
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr "Ein Zugriffskonflikt wurde festgestellt"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Wenn diese Anzeige eines Zugriffskonflikts fehlerhaft ist, hat eine andere Person offenbar während der Bearbeitung eines Eintrages einfach den Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch einen Klick auf Trotzdem bearbeiten übergehen."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Nur Lesen"
 
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 09c799968b04b1c29bf61b6e5c7861aa652b6099..84f772c0e63c6fd8c7bdf51b5f0b82f10d63785c 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -207,9 +207,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Επιτρέπεται σ'αυτή την ομάδα να συνδέεται στην ακόλουθη λίστα διακομιστών"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -637,10 +637,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Άδεια"
 
@@ -2191,7 +2191,7 @@ msgstr "Επιλογή όλων"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2204,8 +2204,8 @@ msgstr "Επιλογή όλων"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2253,7 +2253,7 @@ msgid "Cut"
 msgstr "Αποκοπή"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Επικόλληση"
 
@@ -2294,19 +2294,19 @@ msgid "The filter is incomplete!"
 msgstr "Το φίλτρο είναι μη ολοκληρωμένο!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Σφάλμα άδειας"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για %s."
@@ -2343,15 +2343,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2399,7 +2398,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2730,7 +2729,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3096,41 +3095,41 @@ msgstr "Αποτυχία δημιουργίας κλειδώματος στο δ
 msgid "LDAP server returned: %s"
 msgstr "Ο διακομιστής LDAP επίστρεψε: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Έχει ξεπεραστεί το όριο %d καταχωρίσεων!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "ελλιπής"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Συνέχεια οπωσδήποτε"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Επεξεργασία οπωσδήποτε"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3478,12 +3477,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Ακύρωση όλων"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Αδυναμία επικόλλησης"
 
@@ -3835,52 +3834,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Παρακαλώ καθορίστε ένα έγκυρο όνομα χρήστη!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Παρακαλώ ελέγξτε το συνδυασμό όνομα χρήστη/κωδικός πρόσβασης."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4811,13 +4814,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Μόνο για ανάγνωση"
 
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index de7e876cc064e481e2bf04ea69dc2db4c5b0266c..b05e0408f8f4acc012dd1163ceb19e2649fa42fe 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -202,9 +202,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -632,10 +632,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2338,15 +2338,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2394,7 +2393,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3088,41 +3087,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3469,12 +3468,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3828,52 +3827,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4804,13 +4807,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 384e9fa5350145a9b0caf7dba57474e1e5cd4181..9da9dd48ecdce0a722c1e8c6e559449bd76241a5 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Permisos"
 
@@ -2185,7 +2185,7 @@ msgstr "Seleccione todos"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Seleccione todos"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Mover"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Pegar"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Error de permisos"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr "¡'%s' no están permitidos!"
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor c
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje si se supera el límite máximo"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "¡Por favor introduzca un nombre de usuario válido!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "¡Por favor introduzca una contraseña!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Si esta detección de bloqueo es falsa, la otra persona cerro su navegador mientras estaba editando. Puede eliminar el archivo de bloqueo en ese caso, pulsando en el botón <i>Eliminar</i>."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Solo lectura"
 
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 3853339e76b5de3c0b01f1488e8fd44a370a1876..c409bc44398ace7261c3bdba9965238f7d601bdf 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Habilitar solamente a éste grupo para conectarse a ésta lista de equipos."
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -632,10 +632,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Permisos"
 
@@ -2186,7 +2186,7 @@ msgstr "Seleccionar todo"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2199,8 +2199,8 @@ msgstr "Seleccionar todo"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2248,7 +2248,7 @@ msgid "Cut"
 msgstr "Cortar"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Pegar"
 
@@ -2289,19 +2289,19 @@ msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Error de permisos"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Usted no tiene permitido crear un 'snashot' para %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Usted no tiene permitido restaurar un 'snapshot' para %s"
@@ -2338,15 +2338,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2394,7 +2393,7 @@ msgstr "LDAP tiene un desempeño lento: su última consulta tomó %.2fs!"
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2725,7 +2724,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3091,41 +3090,41 @@ msgstr "No se puede crear un bloqueo de información en el árbol de 'LDAP'. ¡P
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP respondió: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Se encontraron varios 'locks' en el objeto lo cual impide bloquearlo. Esto no debería suceder - borrando varias referencias."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Continuar de todos modos"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Editar de todos modos"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Usted está a punto de editar las entradas de LDAP: %s"
@@ -3473,12 +3472,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr "Pestaña \"%s\""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "No se puede pegar"
 
@@ -3830,52 +3829,56 @@ msgstr "¡Parámetro \"%s\" de plugin inválido!"
 msgid "No session found!"
 msgstr "¡No se encuentra la sesión!"
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "¡Por favor especifique un nombre de usuario válido!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "¡Por favor especifique su contraseña!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Por favor verifique su combinación de usuario/contraseña"
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. ¡Por favor contacte a su administrador!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4806,13 +4809,17 @@ msgid "Locking conflict detected"
 msgstr "Conflicto de bloqueo detectado"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Si la opción detección de bloqueo está deshabilitada, otra persona obviamente ha cerrado el navegador web durante la operación. Si usted desea tomar el bloqueo presione el botón 'Editar de todos modos'."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Solo lectura"
 
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index b4f061c2e027cbafd04d80bd788a72f39e89d97c..77e5072fe632c08e9cb96c13ee114a84cad9bf4a 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Permisos"
 
@@ -2185,7 +2185,7 @@ msgstr "Seleccione todos"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Seleccione todos"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Mover"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Pegar"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Error de permisos"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr "¡'%s' no están permitidos!"
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor c
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje si se supera el límite máximo"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "¡Por favor introduzca un nombre de usuario válido!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "¡Por favor introduzca una contraseña!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Si esta detección de bloqueo es falsa, la otra persona cerro su navegador mientras estaba editando. Puede eliminar el archivo de bloqueo en ese caso, pulsando en el botón <i>Eliminar</i>."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Solo lectura"
 
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index da4a2388696c16c5e0f5b180f80e10526fb9e64a..86593854432199b7d2f24276d01b3530613369c7 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "جواز"
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4798,13 +4801,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index c185b82c74cc8042a0d3f1ca4cba9ac2308d40e9..c6bb41afa0a8b2710b37262bdb37d2ff29af15e8 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Lupa"
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 0af0a4c972723cc55ab2eac237d4ef134a3c6c4a..bfe7108035946e5ccf26c863f17e0792f344489e 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:21+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 12:16+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -205,9 +205,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Autoriser ce groupe à se connecter uniquement sur cette liste d'hôtes"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -635,10 +635,10 @@ msgstr "Gérer les comptes utilisateurs et leurs propriétés"
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Permission"
 
@@ -2189,7 +2189,7 @@ msgstr "Sélectionner tout"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2202,8 +2202,8 @@ msgstr "Sélectionner tout"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2251,7 +2251,7 @@ msgid "Cut"
 msgstr "Couper"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Coller"
 
@@ -2292,19 +2292,19 @@ msgid "The filter is incomplete!"
 msgstr "Le filtre est incomplet !"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Erreur de permission"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à créer un nouvel instantané pour %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à restaurer un instantané de %s."
@@ -2341,15 +2341,14 @@ msgstr "Il semble que vous essayez de déchiffrer quelque chose qui n'est pas ch
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2397,7 +2396,7 @@ msgstr "La performance de votre annuaire est faible : la dernière requête a
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2728,7 +2727,7 @@ msgstr "'%s' ne sont pas autorisés !"
 msgid "Missing %s PHP extension!"
 msgstr "Extension PHP %s manquante !"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3094,41 +3093,41 @@ msgstr "Impossible d'obtenir les informations de verrouillage dans l'annuaire LD
 msgid "LDAP server returned: %s"
 msgstr "Le serveur LDAP a retourné : %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Verrou multiple pour un même objet détecté. Ceci ne devrait pas arriver. Effacement des références multiples."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "La taille limite de %d entrées est dépassée !"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Mettre la nouvelle limite à %s et m’afficher ce message si la limite est toujours dépassée"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Configurer"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Vous êtes sur le point d'éditer l'entrée(s) %s"
@@ -3476,12 +3475,12 @@ msgstr "Dépendance récursive dans les champs de modèle: \"%1$s\" ne peut pas
 msgid "Tab \"%s\""
 msgstr "Onglet \"%s\""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Tout annuler"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Impossible de coller"
 
@@ -3833,52 +3832,56 @@ msgstr "Paramètre de plugin «%s» invalide !"
 msgid "No session found!"
 msgstr "Aucune session trouvée !"
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr "La vérification des schémas LDAP a signalé des erreurs :"
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr "La vérification des schémas LDAP a signalé des erreurs :"
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Veuillez indiquer un nom d’utilisateur valide !"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Veuillez introduire votre mot de passe !"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verrouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Aucune valeur trouvée dans l'entête HTTP \"%s\""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr "L'utilisateur \"%s\" mentionné dans l’entête n'existe pas dans l'annuaire LDAP "
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr "L'utilisateur \"%s\" mentionné dans l’entête correspond à plusieurs personnes  dans l'annuaire LDAP "
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "L'utilisateur CAS \"%s\" n'existe pas dans l'annuaire LDAP "
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr "L'utilisateur CAS \"%s\" correspond à plusieurs personnes  dans l'annuaire LDAP "
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4809,13 +4812,17 @@ msgid "Locking conflict detected"
 msgstr "Conflit de verrou détecté"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr "\"%1\" est verrouille par \"%1\""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Si la détection de ce verrou est fausse, une autre personne a manifestement fermé la fenêtre de son navigateur durant une opération de modification d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur le bouton 'Éditer malgré tout'."
+"pressing the \"%1\" button."
+msgstr "Si la détection de ce verrou est fausse, une autre personne a manifestement fermé la fenêtre de son navigateur durant une opération de modification d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur le bouton \"%1%\"."
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Lecture seule"
 
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index feb389051ddb125947bc86bd8f7ce78c801094ae..af63f54445e7b11328ea7cd942fd57090dd8400b 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -632,10 +632,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2186,7 +2186,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2199,8 +2199,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2248,7 +2248,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2289,19 +2289,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2338,15 +2338,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2394,7 +2393,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2725,7 +2724,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3091,41 +3090,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3473,12 +3472,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3830,52 +3829,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4806,13 +4809,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 48b9ec18a74ea03e91ac4dea1536b224f4e908d8..f74be3dd75e02ec5ce127c7a2470777a1e9adbfe 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4798,13 +4801,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index 01cf2364437c89d1349c8d23fef1700a1b989570..d30410cbbc9d8085793e9eb98e16a59f6693bd25 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -204,9 +204,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host "
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -634,10 +634,10 @@ msgstr "Gestire gli account utente e le loro proprietà"
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Autorizzazioni"
 
@@ -2188,7 +2188,7 @@ msgstr "Seleziona tutto"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2201,8 +2201,8 @@ msgstr "Seleziona tutto"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2250,7 +2250,7 @@ msgid "Cut"
 msgstr "Taglia"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Incolla"
 
@@ -2291,19 +2291,19 @@ msgid "The filter is incomplete!"
 msgstr "Il filtro non è completo!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
@@ -2340,15 +2340,14 @@ msgstr "Sembra che si stia tentando di decodificare qualcosa che non è codifica
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2396,7 +2395,7 @@ msgstr "Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è dur
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2727,7 +2726,7 @@ msgstr "'%s' non è permesso !"
 msgid "Missing %s PHP extension!"
 msgstr "Estensione PHP %s  mancante !"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3093,41 +3092,41 @@ msgstr "Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta
 msgid "LDAP server returned: %s"
 msgstr "Il server LDAP ha risposto: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Il valore limite dell'entries %d è stato superato !"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo stesso valore è superato"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Configura"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Prosegui comunque"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Modifica malgrado l'avvertimento"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sei sul punto di modificare la/le voce/voci %s"
@@ -3475,12 +3474,12 @@ msgstr "La dipendenza riccorsiva nei campi di modello: \"%1$s\" non puo' dipende
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annulla tutto"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Impossibile incollare"
 
@@ -3832,52 +3831,56 @@ msgstr "Parametro \"%s\" di plugin invalido"
 msgid "No session found!"
 msgstr "Nessuna sessione trovata!"
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr "Lo schema LDAP verifica gli errori riportati:"
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Prego specifica un nome utente valido !"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Prego specifica la tua password !"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Verifica il nome utente e la password."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Nessun valore trovato nell'header HTTP \"%s\""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr "L'utente header \"%s\"  non è stato trovato nel LDAP"
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr "L'utente header \"%s\" corrisponde a più utenti in LDAP"
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "Impossibile trovare l'utente \"%s\" CAS nell'annuario LDAP"
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr "L'utente CAS \"%s\" corrisponde a più utenti nell'annuario LDAP"
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4808,13 +4811,17 @@ msgid "Locking conflict detected"
 msgstr "Rilevato un conflitto di chiusura"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Se questo conflitto di chiusura è falso, è evidente che un'altra persona abbia chiuso il suo navigatore web durante un'operazione di inserimento dati. In questo caso puoi togliere il blocco premendo il tasto 'Modifica comunque'."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Solo lettura"
 
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index 048bc0fd0f9939b48f6f615a48127febd7964028..f76e098cfc4738328519ee7b3e7b9149b0a2ee0b 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Atļauja"
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4812,13 +4815,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index 40e7c55ada70b0072680ceca1666a5b880f8d205..582da8ef02609ddbcca3180728b6f5f1506d1a8c 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 99e0ce1d786a1ee56d9215833ea1228cddf23af2..141681462a77185a1736ff02712783ef9a43d5dc 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Rechten"
 
@@ -2185,7 +2185,7 @@ msgstr "Selecteer alles"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Selecteer alles"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Knip"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Plakken"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr "Deze filter is niet compleet!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Permissiefout"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "U heeft geen toestemming om een snapshot te maken voor %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "U heeft geen toestemming om een snapshot te herstellen voor %s."
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "LDAP performantie is slecht: laatste query duurde ongeveer %.2fs!"
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr "'%s' zijn niet toegelaten!"
 msgid "Missing %s PHP extension!"
 msgstr "%s PHP extensie ontbreekt!"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr "Kan de locking informatie voor de LDAP tree niet aanmaken. Gelieve je sy
 msgid "LDAP server returned: %s"
 msgstr "LDAP server returned: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Verschillende locks zijn teruggevonden voor het object dat je wilt in lock plaatsen. Dit zou niet mogen gebeuren - Opschonen van meerdere referenties."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Instellen"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Je staat op het punt de LDAP inzending/inzendingen te wijzigen %s"
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annuleer alles"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Kan niet plakken"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr "Er is een blokkade conflict gedetecteerd"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "als deze blokkeer detectie vals is, de andere persoon heeft waarschijnkijk de webbrowser gesloten tijden de wijzig operatie. Je kan dit overmeesteren door op de 'Wijzig toch' knop te klikken."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Read only"
 
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 27734b358566870cf403ae8183116de1195eefa4..6196cd24682eda6587113da198873c060f1e3d04 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Uprawnienie"
 
@@ -2185,7 +2185,7 @@ msgstr "Wybierz wszystko"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Wybierz wszystko"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Wytnij"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Wklej"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit wielkości %d elementów został przekroczony!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest przekroczony"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Anuluj wszystko"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Nie można wkleić"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Proszę podać prawidłową nazwę użytkownika!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Proszę podać prawidłowe hasło!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4812,13 +4815,17 @@ msgid "Locking conflict detected"
 msgstr "Wykryto konflikt blokady"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Jeśli to wykrycie blokady jest błędne, inna osoba prawdopodobnie zamknęła okno przeglądarki podczas operacji edycji. Można przejąć blokadę naciskając Edytuj."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Tylko do odczytu"
 
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index abde541372ce6a5e4990c1ccafeae7b4c81a1be6..bf35d534ce126902ef5895f0e1a7edccf7610123 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Colar"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "A performance do LDAP está ruim: a última pesquisa levou cerca de %.2f
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Editar mesmo assim"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Impossível colar"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Por favor, especifique um nome de usuário válido!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Por favor, especifique sua senha!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique a combinação usuário / senha"
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr "Conflito de travamento detectado"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Se esta detecção for falsa, um usuário pode ter fechado o navegador durante a operação de edição. Você pode destravar pressionando o botão 'Editar mesmo assim'."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 5389eed8fe44b2103f95511a65b9adfa70302494..e16606bbb2abd6d9276db526f936c99d8e0986df 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -202,9 +202,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -632,10 +632,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Permissão"
 
@@ -2186,7 +2186,7 @@ msgstr "Selecionar tudo"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2199,8 +2199,8 @@ msgstr "Selecionar tudo"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2248,7 +2248,7 @@ msgid "Cut"
 msgstr "Recortar"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Colar"
 
@@ -2289,19 +2289,19 @@ msgid "The filter is incomplete!"
 msgstr "O filtro está incompleto!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Erro de permissão"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Você não tem permissões para criar um snapshot para %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Você não tem permissões para restaurar um snapshot para %s."
@@ -2338,15 +2338,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2394,7 +2393,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2725,7 +2724,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3091,41 +3090,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3473,12 +3472,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar tudo"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3830,52 +3829,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Por favor, especifique um nome de usuário válido!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Por favor, especifique sua senha!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique o usuário ou senha."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conta bloqueada. Entre em contato com o administrador do sistema!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4806,13 +4809,17 @@ msgid "Locking conflict detected"
 msgstr "Conflito de bloqueio detectado"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Se a detecção de bloqueio é falsa, a outra pessoa obviamente fechou o navegador durante o processo de edição. Você pode desbloquear ao clicar em 'Editar mesmo assim\"."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Somente leitura"
 
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index b12fd310ceeeb3538f8d89d7287f123e6394722c..727352b04260500f4ea126da1707af1ddf3309fc 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -203,9 +203,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Позволить подключаться этой группе только к хостам из списка"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -633,10 +633,10 @@ msgstr "Управление аккаунтами пользователей и
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Права"
 
@@ -2187,7 +2187,7 @@ msgstr "Выбрать все"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2200,8 +2200,8 @@ msgstr "Выбрать все"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2249,7 +2249,7 @@ msgid "Cut"
 msgstr "Вырезать"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Вставить"
 
@@ -2290,19 +2290,19 @@ msgid "The filter is incomplete!"
 msgstr "Фильтр неполный!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Ошибка доступа"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Вам не разрешено создавать снапшот для %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Вам не разрешено восстанавливать снапшот для %s."
@@ -2339,15 +2339,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2395,7 +2394,7 @@ msgstr "Низкая производительность LDAP: последни
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2726,7 +2725,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr "Пропущено %s PHP расширение!"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3092,41 +3091,41 @@ msgstr "Невозможно создать информацию о блокир
 msgid "LDAP server returned: %s"
 msgstr "LDAP сервер вернул: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Найдены множественные блокировки для заблокированного объекта. Это не должно было случиться - очистите их."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Установить новое значение лимита в %s и показать мне это сообщение если лимит будет исчерпан."
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Настроить"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Продолжить в любом случае"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Редактировать в любом случае"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Вы собираетесь редактировать LDAP запись/записи %s"
@@ -3474,12 +3473,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr "Вкладка \"%s\""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Отменить все"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Не могу вставить"
 
@@ -3831,52 +3830,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr "Проверка схемы LDAP сообщает об ошибке:"
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Введите корректное имя пользователя!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Введите свой пароль!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Учетная запись заблокирована. Пожалуйста свяжитесь с вашим системным администратором."
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "CAS пользователь \"%s\" не может быть найден в LDAP"
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr "CAS пользователь \"%s\" соответствует нескольким пользователям в LDAP"
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4821,13 +4824,17 @@ msgid "Locking conflict detected"
 msgstr "Конфликт блокировок"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Кто-то ещё редактирует эту запись. Если вы хотите пренебречь этим, нажмите \"Редактировать в любом случае\""
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Только для чтения"
 
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 840cb5a6e537a2b42a386b4516ce0ace1f9baeb6..8f8c236fadae713043028c857729a0de19082c28 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4819,13 +4822,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index d06e0105e8bd503343b55458d486a717b55ec64a..03fbf12a35caca7f1d3f963fea29b257f985f251 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Rättighet"
 
@@ -2185,7 +2185,7 @@ msgstr "Välj alla"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Välj alla"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Klipp ut"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Klistra in"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr "Filtret är inte komplett!"
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Rättighetsfel"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Du har inte tillåtelse att skapa en ögonblicksbild för %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Du är inte tillåten att återskapa en ögonblicksbild för %s."
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "LDAP-prestanda är låg: senaste frågan tog runt %.2fs!"
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr "'%s' är inte tillåtna!"
 msgid "Missing %s PHP extension!"
 msgstr "Saknar PHP-tillägget %s !"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr "Kan inte skapa låsinformation i LDAP-trädet. Vänligen kontakta din ad
 msgid "LDAP server returned: %s"
 msgstr "LDAP-server returnerade %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Hittade flera lås för objektet som ska låsas. Detta ska inte hända - rensar upp multipla referenser."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Storleksgränsen på %d poster har överskridits!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Sätt ny storleksgräns till %s och visa mig meddelandet om gränsen fortfarande överskrids"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "ofullständig"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Fortsätt ändå"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Redigera ändå"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Du kommer att redigera LDAP-posten/posterna %s"
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Avbryt allt"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Kan inte klistra in"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Ange ett giltigt användarnamn!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Ange ditt lösenord!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Kontrollera användarnamn/lösenord-kombinationen."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Kontot låst. Kontakta systemadministratören!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4805,13 +4808,17 @@ msgid "Locking conflict detected"
 msgstr "LÃ¥sningskonflikt detekterad"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Om den här låsningsdetekteringen är falsk, har en annan person förmodligen stängt webbläsaren under en redigering utan att ha sparat. Du kan vilja ta över låsningen genom att trycka på 'Redigera ändå'-knappen"
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr "Endast läsning"
 
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index dd36b465d343c6a14187a188e049a37afc045f26..5bd611ef9e852a427549fc57aecf615a2b4a35b4 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr ""
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr ""
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4798,13 +4801,17 @@ msgid "Locking conflict detected"
 msgstr ""
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"pressing the \"%1\" button."
 msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 6460ca4a7e1d4b06a029332b275b5b87a9627d98..4bed245368c09497b308d4abd26266d9aec0a0dc 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "Cho phép"
 
@@ -2185,7 +2185,7 @@ msgstr "Chọn tất"
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr "Chọn tất"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr "Cut"
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "Paste"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr "Lỗi về cấp phép"
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Bạn không được phép tạo ra snapshot cho %s."
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Bạn không được phép phục hồi một snapshot cho %s."
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr "Khả năng hoạt động của LDAP rất thấp: truy vấn lần cu
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr "'%s' không được cho phép!"
 msgid "Missing %s PHP extension!"
 msgstr "PHP mở rộng %s mất tích!"
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr "Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy l
 msgid "LDAP server returned: %s"
 msgstr "LDAP server trả về: %s"
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "Tìm thấy nhiều khóa khác nhau để khóa đối tượng. Điều này không nên xảy ra - hãy dọn sạch các tham chiếu."
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Đã vượt quá giới hạn kích cỡ của các entry %d!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn vượt quá tiêu chuẩn"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "chưa hoàn thành"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "Cứ tiếp tục"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "Cứ hiệu chỉnh"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Bạn sẽ hiệu chỉnh entry/các entry %s của LDAP"
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Hủy bỏ tất"
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr "Không thể paste"
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "Xin hãy xác định một tên người dùng hợp lệ!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "Xin hãy xác định mật mã của bạn!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "Xin hãy kiểm tra kết hợp tên người dùng/mật khẩu."
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Tài khoản bị khóa. Xin hãy liên lạc với admin quản trị hệ thống của bạn!"
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4798,13 +4801,17 @@ msgid "Locking conflict detected"
 msgstr "Phát hiện xung đột khóa"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "Nếu việc phát hiện khóa này sai, một người nào đó chắc hẳn đã đóng trình duyệt web trong quá trình thao tác hiệu chỉnh. Bạn có thể muốn tiếp quản việc khóa bằng các nhấn vào nút 'tiếp tục hiệu chỉnh'."
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""
 
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index c07a92a9f8b752657e5c038d19b0044c1cf37772..d59ac057d8d86300588f54f0ad5f57d92e15174e 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-09-20 18:20+0200\n"
-"PO-Revision-Date: 2016-09-20 16:16+0000\n"
+"POT-Creation-Date: 2016-09-22 13:56+0200\n"
+"PO-Revision-Date: 2016-09-22 11:53+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -201,9 +201,9 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:478 include/functions.inc:855
 #: include/functions.inc:2564 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:592
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:596
 #: html/main.php:158 setup/class_setupStep_Ldap.inc:198
 #: setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
@@ -631,10 +631,10 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:149
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
-#: include/simpleplugin/class_simpleManagement.inc:654
-#: include/simpleplugin/class_simpleManagement.inc:754
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:245
+#: include/simpleplugin/class_simpleManagement.inc:653
+#: include/simpleplugin/class_simpleManagement.inc:753
+#: include/simpleplugin/class_simpleManagement.inc:804
 msgid "Permission"
 msgstr "允许"
 
@@ -2185,7 +2185,7 @@ msgstr ""
 #: include/functions.inc:3234 include/functions.inc:3243
 #: include/functions.inc:3305 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:793
-#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1524 include/class_CopyPasteHandler.inc:275
 #: include/simpleplugin/class_attribute.inc:1594
 #: include/simpleplugin/class_attribute.inc:1597
 #: include/simpleplugin/class_attribute.inc:1600
@@ -2198,8 +2198,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:448 html/index.php:469
-#: html/index.php:479 html/index.php:541 html/index.php:551
+#: include/class_SnapshotHandler.inc:422 html/index.php:452 html/index.php:473
+#: html/index.php:483 html/index.php:545 html/index.php:555
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/breezy/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2247,7 +2247,7 @@ msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1604 include/class_listing.inc:1606
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:367
 msgid "Paste"
 msgstr "粘贴"
 
@@ -2288,19 +2288,19 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:406
-#: include/simpleplugin/class_simpleManagement.inc:720
+#: include/simpleplugin/class_simpleManagement.inc:719
 msgid "Permission error"
 msgstr ""
 
 #: include/class_management.inc:483
-#: include/simpleplugin/class_simpleManagement.inc:754
+#: include/simpleplugin/class_simpleManagement.inc:753
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:503 include/class_management.inc:521
 #: include/class_management.inc:570
-#: include/simpleplugin/class_simpleManagement.inc:805
+#: include/simpleplugin/class_simpleManagement.inc:804
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2337,15 +2337,14 @@ msgstr ""
 #: include/class_config.inc:322 include/class_ldap.inc:895
 #: include/class_ldap.inc:1281 include/functions.inc:541
 #: include/functions.inc:693 include/functions.inc:740
-#: include/functions.inc:801 include/functions.inc:856
-#: include/functions.inc:3029 include/functions.inc:3203
-#: include/simpleplugin/class_simplePlugin.inc:592
+#: include/functions.inc:840 include/functions.inc:3029
+#: include/functions.inc:3203 include/simpleplugin/class_simplePlugin.inc:592
 #: include/simpleplugin/class_attribute.inc:3027
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:366 html/class_passwordRecovery.inc:531
+#: html/index.php:370 html/class_passwordRecovery.inc:531
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -2393,7 +2392,7 @@ msgstr ""
 
 #: include/class_ldap.inc:846 include/class_ldap.inc:882
 #: include/functions.inc:583 include/functions.inc:668
-#: include/functions.inc:788 include/functions.inc:1207
+#: include/functions.inc:788 include/functions.inc:1206
 #: include/functions.inc:2290 include/functions.inc:2332
 #: include/functions.inc:2361 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
@@ -2724,7 +2723,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:14
+#: include/class_msgPool.inc:478 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/acl.tpl.c:53 ihtml/themes/breezy/acl.tpl.c:59
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17
@@ -3090,41 +3089,41 @@ msgstr ""
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:809
+#: include/functions.inc:855
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1127
+#: include/functions.inc:1126
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制!"
 
-#: include/functions.inc:1129
+#: include/functions.inc:1128
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:1146
+#: include/functions.inc:1145
 msgid "Configure"
 msgstr "配置"
 
-#: include/functions.inc:1151
+#: include/functions.inc:1150
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1556
+#: include/functions.inc:1555
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1558
+#: include/functions.inc:1557
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1560
+#: include/functions.inc:1559
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
@@ -3472,12 +3471,12 @@ msgstr ""
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:303
+#: include/class_CopyPasteHandler.inc:302
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:370
+#: include/class_CopyPasteHandler.inc:369
 msgid "Cannot paste"
 msgstr ""
 
@@ -3829,52 +3828,56 @@ msgstr ""
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:253
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:278
+#: html/index.php:255
+msgid "LDAP schema error"
+msgstr ""
+
+#: html/index.php:282
 msgid "Please specify a valid username!"
 msgstr "请输入一个有效的用户名!"
 
-#: html/index.php:281
+#: html/index.php:285
 msgid "Please specify your password!"
 msgstr "请输入您的口令!"
 
-#: html/index.php:300
+#: html/index.php:304
 msgid "Please check the username/password combination."
 msgstr "请检查用户名/口令。"
 
-#: html/index.php:330
+#: html/index.php:334
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:450
+#: html/index.php:454
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:471
+#: html/index.php:475
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:481
+#: html/index.php:485
 #, php-format
 msgid "Header user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:543
+#: html/index.php:547
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:553
+#: html/index.php:557
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:592
+#: html/index.php:596
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -4798,13 +4801,17 @@ msgid "Locking conflict detected"
 msgstr "检测到锁定冲突"
 
 #: ihtml/themes/breezy/islocked.tpl.c:8
+msgid "\"%1\" was locked by \"%1\""
+msgstr ""
+
+#: ihtml/themes/breezy/islocked.tpl.c:11
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
+"If this lock detection is false, the other person may have closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
-msgstr "如果锁检查失败,明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过按“仍然编辑”按钮来接管这个锁文件。"
+"pressing the \"%1\" button."
+msgstr ""
 
-#: ihtml/themes/breezy/islocked.tpl.c:11
+#: ihtml/themes/breezy/islocked.tpl.c:14
 msgid "Read only"
 msgstr ""