diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index bf618efb1ea60a3aaacdd0c86dee9427de21e6d5..f3b9b009a53c8bc7958b27c8d8399933aa14a552 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: 2017-06-13 19:52+0200\n"
+"POT-Creation-Date: 2017-06-19 22:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -235,7 +235,7 @@ msgstr ""
 #: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
-"information)</a>)"
+"information</a>)"
 msgstr ""
 
 #: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
@@ -744,7 +744,7 @@ msgstr ""
 #: include/class_config.inc:347 include/class_msgPool.inc:220
 #: include/class_msgPool.inc:240 include/class_msgPool.inc:270
 #: include/class_msgPool.inc:694 include/class_msgPool.inc:723
-#: include/simpleplugin/class_simpleTabs.inc:71
+#: include/simpleplugin/class_simpleTabs.inc:73
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
@@ -2010,7 +2010,7 @@ msgstr ""
 
 #: include/simpleplugin/class_dialogAttributes.inc:634
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:111
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:119
 msgid "None"
 msgstr ""
 
@@ -2046,14 +2046,14 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:72
+#: include/simpleplugin/class_simpleTabs.inc:74
 #, php-format
 msgid ""
 "No plugin definitions found to initialize \"%s\", please check your "
 "configuration file."
 msgstr ""
 
-#: include/simpleplugin/class_simpleTabs.inc:391
+#: include/simpleplugin/class_simpleTabs.inc:393
 #, php-format
 msgid "Move from \"%s\" to \"%s\" failed"
 msgstr ""
@@ -2162,33 +2162,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1293
+#: include/simpleplugin/class_simplePlugin.inc:1296
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1300
+#: include/simpleplugin/class_simplePlugin.inc:1303
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1490
+#: include/simpleplugin/class_simplePlugin.inc:1493
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may "
 "be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1675
+#: include/simpleplugin/class_simplePlugin.inc:1678
 #, php-format
 msgid "Service \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1677
+#: include/simpleplugin/class_simplePlugin.inc:1680
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1829
+#: include/simpleplugin/class_simplePlugin.inc:1832
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2203,7 +2203,7 @@ msgstr ""
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SelectAttribute.inc:137
+#: include/simpleplugin/attributes/class_SelectAttribute.inc:145
 #, php-format
 msgid ""
 "The value \"%s\" for field \"%s\" is not in the list of possible choices"
@@ -2547,22 +2547,22 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/roles/class_userRoles.inc:31
+#: plugins/personal/roles/class_userRoles.inc:33
 #: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Groups and roles"
 msgstr ""
 
-#: plugins/personal/roles/class_userRoles.inc:32
+#: plugins/personal/roles/class_userRoles.inc:34
 msgid "Edit user's groups and roles"
 msgstr ""
 
-#: plugins/personal/roles/class_userRoles.inc:47
-#: plugins/personal/roles/class_userRoles.inc:51
+#: plugins/personal/roles/class_userRoles.inc:49
+#: plugins/personal/roles/class_userRoles.inc:53
 msgid "Groups membership"
 msgstr ""
 
-#: plugins/personal/roles/class_userRoles.inc:58
-#: plugins/personal/roles/class_userRoles.inc:62
+#: plugins/personal/roles/class_userRoles.inc:60
+#: plugins/personal/roles/class_userRoles.inc:64
 msgid "Roles membership"
 msgstr ""
 
@@ -2837,53 +2837,53 @@ msgstr ""
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:668
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:671
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:673
+#: plugins/personal/generic/class_user.inc:682
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:687
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:696
+#: plugins/personal/generic/class_user.inc:701
+#: plugins/personal/generic/class_user.inc:705
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:703
+#: plugins/personal/generic/class_user.inc:712
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:705
+#: plugins/personal/generic/class_user.inc:714
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new password"
 "\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:707
+#: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:709
+#: plugins/personal/generic/class_user.inc:718
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:711
+#: plugins/personal/generic/class_user.inc:720
 msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:713
+#: plugins/personal/generic/class_user.inc:722
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 37924fc901ed92af3590f20f1ac12c41f08d1813..04a3f973969ce8eb0c17b5fe2ae707adb4226606 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -631,8 +631,8 @@ msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
-"J'ai trouvé %s utilisateur(s) qui ne seront pas visibles dans ans "
-"FusionDirec."
+"%s utilisateur(s) trouvé(s) qui ne seront pas visibles dans FusionDirectory "
+"ou qui sont incomplet(s)."
 
 #: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
@@ -723,7 +723,7 @@ msgstr "Les références suivantes seront mises à jour"
 #: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
-msgstr "J'ai trouvé %s groupes en dehors de la branche configurée '%s'."
+msgstr "%s groupes trouvés en dehors de la branche configurée '%s'."
 
 #: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
@@ -733,7 +733,7 @@ msgstr "Déplacer les groupes dans la branche configurée"
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
-"J'ai trouvé %s département(s) qui ne seront pas visible dans "
+"%s département(s) trouvé(s) qui ne seront pas visible(s) dans "
 "FusionDirectory."
 
 #: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
@@ -1257,7 +1257,8 @@ msgstr "L’objectClass «posixGroup» doit être structurelle («STRUCTURAL»)"
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
-"Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
+"Le fichier '%s' n’a pas été trouvé - veuillez exécuter '%s' pour régler ce "
+"problème"
 
 #: include/class_pluglist.inc:183
 msgid "All objects in this category"
@@ -1388,11 +1389,11 @@ msgstr "Ces objets de type '%s' seront effacés: %s"
 
 #: include/class_msgPool.inc:101
 msgid "You have no permission to delete this object!"
-msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet !"
+msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet !"
 
 #: include/class_msgPool.inc:105 include/class_msgPool.inc:109
 msgid "You have no permission to delete the object:"
-msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet :"
+msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet :"
 
 #: include/class_msgPool.inc:112
 msgid "You have no permission to delete these objects:"
@@ -3405,7 +3406,7 @@ msgstr "Paramétrage de base"
 
 #: plugins/config/class_configInLdap.inc:113
 msgid "LDAP size limit"
-msgstr "nombre maximal d'objet LDAP retournés"
+msgstr "Limite du nombre d'objets LDAP"
 
 #: plugins/config/class_configInLdap.inc:113
 msgid "Defines the number of entries to get from LDAP by default."
@@ -3834,7 +3835,7 @@ msgstr ""
 
 #: plugins/config/class_configInLdap.inc:380
 msgid "Group or role"
-msgstr "Groupes ou rôles"
+msgstr "Groupe ou rôle"
 
 #: plugins/config/class_configInLdap.inc:385
 msgid "Plugin to blacklist"
@@ -4347,7 +4348,7 @@ msgstr "le dn n'existe pas : %s"
 
 #: plugins/admin/groups/class_ogroup.inc:154
 msgid "Object group"
-msgstr "Groupes d'objets"
+msgstr "Groupe d'objets"
 
 #: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group information"
@@ -4356,7 +4357,7 @@ msgstr "Information du groupe d’objets"
 #: plugins/admin/groups/class_ogroup.inc:159
 #: plugins/admin/groups/class_ogroup.inc:160
 msgid "Group"
-msgstr "Groupes"
+msgstr "Groupe"
 
 #: plugins/admin/groups/class_ogroup.inc:196
 msgid "Short description of this group"
@@ -4421,7 +4422,7 @@ msgstr "Programmer une action"
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
 msgid "ACL assignment creation"
-msgstr "création d'affectation ACL"
+msgstr "Création d'affectation ACL"
 
 #: plugins/admin/acl/class_aclManagement.inc:33
 msgid "Create an ACL assignment on an arbitrary dn"
@@ -4441,11 +4442,11 @@ msgstr "Impossible de trouver le dn demande dans l'annuaire LDAP"
 
 #: plugins/admin/acl/class_aclManagement.inc:139
 msgid "ACL assignments"
-msgstr "Gestion des ACL"
+msgstr "Affectations ACL"
 
 #: plugins/admin/acl/class_aclManagement.inc:140
 msgid "ACL assignments management"
-msgstr "gestion des affectations ACL "
+msgstr "Gestion des affectations ACL "
 
 #: plugins/admin/acl/class_aclManagement.inc:141
 msgid "Manage ACL roles assignments to users"
@@ -4454,7 +4455,7 @@ msgstr "Affectations des rôles ACL pour les utilisateurs"
 #: plugins/admin/acl/class_aclManagement.inc:219
 #: plugins/admin/acl/class_aclAssignment.inc:273
 msgid "ACL Assignment"
-msgstr "Gestion des ACL"
+msgstr "Affectation ACL"
 
 #: plugins/admin/acl/class_aclAssignment.inc:26
 msgid "ACL Assignment Dialog"
@@ -4506,7 +4507,7 @@ msgstr ", et %d autres"
 
 #: plugins/admin/acl/class_aclAssignment.inc:259
 msgid "ACL assignment"
-msgstr "Gestion des ACL"
+msgstr "Affectation ACL"
 
 #: plugins/admin/acl/class_aclAssignment.inc:274
 msgid "Access control roles assignment"
@@ -4545,11 +4546,11 @@ msgstr "Remettre à zéro les catégories ACL"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:202
 #: ihtml/themes/breezy/acl.tpl.c:41
 msgid "List of available ACL categories"
-msgstr "Liste des catégories d'acl disponibles"
+msgstr "Liste des catégories ACL disponibles"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:215
 msgid "All objects in current subtree"
-msgstr "Tout les objets dans le sous arbres actuel"
+msgstr "Tous les objets dans le sous-arbre actuel"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:217
 #, php-format
@@ -4592,7 +4593,7 @@ msgstr "L'objet au complet"
 
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:35
 msgid "ACL roles management"
-msgstr "Gestion des rôles"
+msgstr "Gestion des rôles ACL"
 
 #: plugins/admin/aclrole/class_aclRoleManagement.inc:36
 msgid "Manage ACL roles"
@@ -4609,7 +4610,7 @@ msgstr "Contrôle d'accès (ACL)"
 
 #: plugins/admin/aclrole/class_aclRole.inc:81
 msgid "ACL role"
-msgstr "Rôles ACL"
+msgstr "Rôle ACL"
 
 #: plugins/admin/aclrole/class_aclRole.inc:99
 msgid "A name for this role"
@@ -4915,7 +4916,7 @@ msgstr "Nom d'utilisateur"
 
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
-msgstr "j'ai perdu mon mot de passe"
+msgstr "J'ai perdu mon mot de passe"
 
 #: ihtml/themes/breezy/login.tpl.c:38
 msgid "Sign in"
@@ -5279,7 +5280,7 @@ msgstr "Afficher les modèles"
 
 #: plugins/admin/users/user-filter.tpl.c:8
 msgid "Show functional users"
-msgstr "montrer les utilisateurs fonctionnels"
+msgstr "Montrer les utilisateurs fonctionnels"
 
 #: plugins/admin/users/user-filter.tpl.c:11
 msgid "Show POSIX users"
@@ -5306,8 +5307,8 @@ msgid ""
 "This includes all ACL assignments made on this node(s). If you want the list"
 " of these assignments, please cancel and open the objects."
 msgstr ""
-"Cela comprend toutes les affectations ACL faites sur ce noeud (s). Si vous "
-"voulez la liste de ces assignations, annuler et ouvrez les objets."
+"Cela comprend toutes les affectations ACL faites sur ce(s) noeud(s). Si vous"
+" voulez la liste de ces affectations, annulez et ouvrez les objets."
 
 #: plugins/admin/acl/remove.tpl.c:8
 msgid "Press 'Delete' to continue or 'Cancel' to abort."
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 961663edda3e6c30be72365a4d9a76d412b6c0e7..0a817434b0e3e15d922524a5fc9addf5371fab9f 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: setup/class_setupStepLanguage.inc:30
 #: plugins/personal/generic/class_user.inc:387