Code

* Fix french locale
[gosa.git] / gosa-core / locale / core / fr / LC_MESSAGES / messages.po
index 3fab7c13060908ec0e547420777e993fb017ee13..d0185d3ce77ae37be6cf15feb1e9e44a55a5baa8 100644 (file)
@@ -4,87 +4,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:24+0100\n"
-"PO-Revision-Date: 2010-01-18 22:35+0100\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
+"PO-Revision-Date: 2010-11-19 17:43+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1002
-#: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/groups/userSelect/user-list.tpl:13
-#: plugins/admin/groups/generic.tpl:39
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
-#: plugins/admin/groups/class_groupGeneric.inc:1182
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/generic.tpl:39
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr ""
-
-#: ihtml/themes/default/MultiSelectWindow.tpl:51
-#: ihtml/themes/default/MultiSelectWindow.tpl:92
-#: ihtml/themes/default/msg_dialog.tpl:61
-#: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
-msgid "Information"
-msgstr "Information"
-
-#: ihtml/themes/default/MultiSelectWindow.tpl:63
-#: ihtml/themes/default/MultiSelectWindow.tpl:103
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/groups/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filtres"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
-#: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:929 include/functions.inc:2642
-#: include/functions.inc:2646 include/functions.inc:2652
+#: html/index.php:63 html/index.php:406 html/index.php:412
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/groups/class_groupGeneric.inc:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
 #: plugins/personal/posix/class_posixAccount.inc:946
 #: setup/class_setupStep_Migrate.inc:261 setup/class_setupStep_Migrate.inc:313
 #: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:662 setup/class_setupStep_Migrate.inc:803
-#: setup/class_setupStep_Migrate.inc:2572
-#: setup/class_setupStep_Migrate.inc:2725
-#: setup/class_setupStep_Migrate.inc:3057 setup/setup_checks.tpl:32
+#: setup/class_setupStep_Migrate.inc:661 setup/class_setupStep_Migrate.inc:804
+#: setup/class_setupStep_Migrate.inc:2573
+#: setup/class_setupStep_Migrate.inc:2726
+#: setup/class_setupStep_Migrate.inc:3058 setup/setup_checks.tpl:32
 #: setup/setup_checks.tpl:93
 msgid "Warning"
 msgstr "Avertissement"
@@ -114,7 +64,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:312
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -197,7 +147,7 @@ msgstr ""
 "nouveau !"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:330
 #, php-format
 msgid "Save"
 msgstr "Enregistrer"
@@ -247,7 +197,7 @@ msgstr ""
 "au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
 "restreindre les données a visualiser"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:348
 #, php-format
 msgid "Set"
 msgstr "Activer"
@@ -256,22 +206,22 @@ msgstr "Activer"
 msgid "Assigned ACL for current entry"
 msgstr "ACL assignés à l'entrée actuelle"
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr "Nouvelle ACL"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr "Type ACL"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr "Sélectionnez un type d'acl"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:324 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -297,7 +247,7 @@ msgstr "Membres disponibles"
 msgid "List message possible targets"
 msgstr "Liste les destinataires possibles pour les messages"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1090
 msgid "Members"
 msgstr "Membres"
 
@@ -305,7 +255,7 @@ msgstr "Membres"
 msgid "List message recipients"
 msgstr "Lister les destinataires du message"
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr "Liste des catégories d'acl disponibles"
 
@@ -329,11 +279,13 @@ msgstr "Ancien mot de passe"
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
-#: html/password.php:196 plugins/admin/users/password.tpl:13
-#: plugins/admin/users/class_userManagement.inc:249
-#: plugins/personal/generic/main.inc:97
-#: plugins/personal/generic/password.tpl:7
-#: plugins/personal/password/password.tpl:18
+#: html/password.php:196 plugins/admin/users/password.tpl:17
+#: plugins/admin/users/password.tpl:60
+#: plugins/admin/users/class_userManagement.inc:319
+#: plugins/personal/generic/password.tpl:22
+#: plugins/personal/generic/password.tpl:72
+#: plugins/personal/password/password.tpl:27
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
@@ -352,127 +304,6 @@ msgstr "Modifier le mot de passe"
 msgid "Click here to change your password"
 msgstr "Cliquez ici pour changer votre mot de passe"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Liste des départements"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-msgid "Domain"
-msgstr "Domaine"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-msgstr "Composant domaine"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Pays"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr "Lieu"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Entreprise"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Département"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
-#: plugins/admin/ogroups/class_ogroup.inc:1003
-#: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/ogroup-list.xml:49
-#: plugins/admin/groups/generic.tpl:24
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
-#: plugins/admin/groups/class_groupGeneric.inc:1181
-#: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/departments/locality.tpl:19
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
-#: plugins/admin/ogroups/ogroup-list.xml:62
-#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
-#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
-msgid "Actions"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Editer"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "Votre session GOsa à expiré !"
@@ -518,10 +349,10 @@ msgstr ""
 "est ce que l'imprimante sélectionnée existe encore ?"
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
+#: include/class_acl.inc:784 include/class_acl.inc:791
+#: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Objet"
 
@@ -568,27 +399,30 @@ msgstr "Raison pour la génération de cette copie instantanée"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Continuer"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: html/index.php:228 include/class_management.inc:447
-#: include/class_management.inc:583 include/class_management.inc:915
-#: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: html/index.php:228 include/class_management.inc:448
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -598,41 +432,53 @@ msgstr "Continuer"
 #: include/class_CopyPasteHandler.inc:185
 #: include/class_CopyPasteHandler.inc:193
 #: include/class_CopyPasteHandler.inc:273
-#: include/class_CopyPasteHandler.inc:375 include/class_msg_dialog.inc:99
-#: plugins/admin/groups/class_groupGeneric.inc:540
-#: plugins/admin/groups/class_groupGeneric.inc:546
-#: plugins/admin/groups/class_groupGeneric.inc:892
-#: plugins/admin/groups/class_groupGeneric.inc:897
-#: plugins/personal/generic/class_user.inc:274
-#: plugins/personal/generic/class_user.inc:387
-#: plugins/personal/generic/class_user.inc:482
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/main.inc:115
-#: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
+#: include/class_CopyPasteHandler.inc:377 include/class_msg_dialog.inc:99
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1221
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:297
+#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
+#: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
 msgid "Error"
 msgstr "Erreur"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:238 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Information"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:318
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
-#: setup/class_setupStep_Migrate.inc:658 setup/class_setupStep_Migrate.inc:799
-#: setup/class_setupStep_Migrate.inc:1045
-#: setup/class_setupStep_Migrate.inc:2012
-#: setup/class_setupStep_Migrate.inc:2156
-#: setup/class_setupStep_Migrate.inc:2578
-#: setup/class_setupStep_Migrate.inc:2732
-#: setup/class_setupStep_Migrate.inc:3062 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:604
+#: setup/class_setupStep_Migrate.inc:657 setup/class_setupStep_Migrate.inc:800
+#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:2013
+#: setup/class_setupStep_Migrate.inc:2157
+#: setup/class_setupStep_Migrate.inc:2579
+#: setup/class_setupStep_Migrate.inc:2733
+#: setup/class_setupStep_Migrate.inc:3063 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87
 #, php-format
 msgid "Ok"
@@ -650,16 +496,10 @@ msgstr "Réussi"
 msgid "Your password has been changed successfully."
 msgstr "Votre mot de passe à été changé avec succès."
 
-#: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:277
-#: plugins/personal/password/class_password.inc:78
-#: plugins/personal/password/class_password.inc:81
-#: plugins/personal/password/class_password.inc:84
-#: plugins/personal/password/class_password.inc:87
-#: plugins/personal/password/class_password.inc:90
-#: plugins/personal/password/class_password.inc:93
-#: plugins/personal/password/class_password.inc:107
-#: plugins/personal/password/class_password.inc:113
+#: ihtml/themes/default/password.tpl:41 html/main.php:198
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 msgid "Password change"
 msgstr "Changement de mot de passe"
 
@@ -674,7 +514,10 @@ msgstr ""
 "les champs ci-dessous et appuyez sur le bouton 'Changer'."
 
 #: ihtml/themes/default/password.tpl:78 ihtml/themes/default/password.tpl:79
-#: html/password.php:217 plugins/personal/password/password.tpl:13
+#: html/password.php:217 plugins/personal/generic/password.tpl:17
+#: plugins/personal/generic/password.tpl:44
+#: plugins/personal/password/password.tpl:22
+#: plugins/personal/password/password.tpl:49
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
@@ -683,7 +526,10 @@ msgid "New password repeated"
 msgstr "Nouveau mot de passe"
 
 #: ihtml/themes/default/password.tpl:90
-#: plugins/personal/password/password.tpl:28
+#: plugins/personal/generic/password.tpl:32
+#: plugins/personal/generic/password.tpl:82
+#: plugins/personal/password/password.tpl:37
+#: plugins/personal/password/password.tpl:88
 msgid "Password strength"
 msgstr "Niveau de sécurité du mot de passe"
 
@@ -769,23 +615,9 @@ msgstr ""
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: ihtml/themes/default/baseSelect-filter.tpl:3
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:3
-#: plugins/admin/ogroups/ogroup-filter.tpl:3
-#: plugins/admin/groups/userSelect/user-filter.tpl:3
-#: plugins/admin/groups/group-filter.tpl:3
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:3
-#: plugins/admin/users/user-filter.tpl:3
-#: plugins/admin/departments/dep-filter.tpl:3
-#: plugins/admin/acl/acl-filter.tpl:3
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-msgid "Filter"
-msgstr "Filtre"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
-#: include/class_pluglist.inc:207
+#: include/class_pluglist.inc:212
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -813,9 +645,9 @@ msgstr "Connecté:"
 msgid "GOsa main menu"
 msgstr "Menu Principal de GOsa"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:447
+#: html/password.php:58 html/main.php:147 include/functions.inc:454
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:433
 msgid "Fatal error"
 msgstr "Erreur Fatale"
 
@@ -825,23 +657,24 @@ msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "Le fichier de configuration %s/%s ne peut être lu. Abandon."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
-#: html/main.php:228
+#: html/main.php:268
 #: include/password-methods/class_password-methods-ssha.inc:51
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
-#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
-#: include/functions.inc:3023 include/functions.inc:3055
-#: include/functions.inc:3068 include/utils/class_timezone.inc:47
-#: include/class_config.inc:154 include/class_config.inc:694
-#: include/class_config.inc:1143 include/class_config.inc:1156
-#: include/class_config.inc:1174 include/class_pluglist.inc:177
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:825
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
+#: include/class_config.inc:155 include/class_config.inc:695
+#: include/class_config.inc:1146 include/class_config.inc:1159
+#: include/class_config.inc:1177 include/class_pluglist.inc:182
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:128
 #: include/class_CopyPasteHandler.inc:177
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
-#: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
+#: plugins/admin/groups/class_group.inc:1358
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -852,7 +685,7 @@ msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation est "
 "inaccessible !"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:593
 msgid "Password method"
 msgstr "Format de stockage des mots de passe"
 
@@ -860,9 +693,8 @@ msgstr "Format de stockage des mots de passe"
 msgid "Error: Password method not available!"
 msgstr "Erreur: Méthode de changement de mot de passe non disponible!"
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
-#: plugins/personal/generic/main.inc:92
-#: plugins/personal/password/class_password.inc:82
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -870,21 +702,23 @@ msgstr ""
 "Le mot de passe entrée dans le champ 'Nouveau mot de passe' et celui dans le "
 "champ 'Répéter le nouveau mot de passe' ne concordent pas."
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:88
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr "Le nouveau et l'ancien mot de passe sont trop similaires."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:91
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 
-#: html/password.php:215 plugins/admin/users/template.tpl:32
-#: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
-#: plugins/personal/generic/generic.tpl:82
+#: html/password.php:215 plugins/admin/groups/userSelect/user-list.xml:56
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
+#: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Identifiant"
@@ -902,11 +736,11 @@ msgid "External password changer reported a problem: "
 msgstr ""
 "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
 
-#: html/password.php:280 html/index.php:414
+#: html/password.php:280 html/index.php:406
 msgid "Session will not be encrypted."
 msgstr "La session ne sera pas cryptée."
 
-#: html/password.php:280 html/index.php:414
+#: html/password.php:280 html/index.php:406
 msgid "Enter SSL session"
 msgstr "Démarrer une session SSL"
 
@@ -944,48 +778,48 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
-#: plugins/admin/ogroups/class_ogroup.inc:928
-#: plugins/admin/groups/class_groupGeneric.inc:698
-#: plugins/admin/groups/class_groupGeneric.inc:1025
-#: plugins/admin/departments/class_department.inc:241
-#: plugins/admin/departments/class_department.inc:429
-#: plugins/admin/departments/class_department.inc:702
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
+#: include/class_acl.inc:1329 include/functions.inc:483
+#: include/functions.inc:518 include/functions.inc:526
+#: include/functions.inc:571 include/functions.inc:840
+#: include/functions.inc:889 include/functions.inc:946
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
+#: plugins/admin/ogroups/class_ogroup.inc:888
+#: plugins/admin/ogroups/class_ogroup.inc:902
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1018
+#: plugins/admin/departments/class_department.inc:279
+#: plugins/admin/departments/class_department.inc:476
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:716
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
-#: setup/class_setupStep_Migrate.inc:1211
-#: setup/class_setupStep_Migrate.inc:1239
-#: setup/class_setupStep_Migrate.inc:1288
-#: setup/class_setupStep_Migrate.inc:1337
-#: setup/class_setupStep_Migrate.inc:2142
-#: setup/class_setupStep_Migrate.inc:2439
-#: setup/class_setupStep_Migrate.inc:2443
-#: setup/class_setupStep_Migrate.inc:2633
-#: setup/class_setupStep_Migrate.inc:2653
-#: setup/class_setupStep_Migrate.inc:2770
-#: setup/class_setupStep_Migrate.inc:3117
-#: setup/class_setupStep_Migrate.inc:3131
+#: setup/class_setupStep_Migrate.inc:1212
+#: setup/class_setupStep_Migrate.inc:1240
+#: setup/class_setupStep_Migrate.inc:1289
+#: setup/class_setupStep_Migrate.inc:1338
+#: setup/class_setupStep_Migrate.inc:2143
+#: setup/class_setupStep_Migrate.inc:2440
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2634
+#: setup/class_setupStep_Migrate.inc:2654
+#: setup/class_setupStep_Migrate.inc:2771
+#: setup/class_setupStep_Migrate.inc:3118
+#: setup/class_setupStep_Migrate.inc:3132
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -1020,7 +854,7 @@ msgstr ""
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:420
+#: html/index.php:412
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -1043,44 +877,45 @@ msgid "PHP configuration"
 msgstr "Configuration de PHP"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "FATAL: Register globals est activé. GOsa ne permettra pas aux utilisateurs "
 "de se connecter tant que ceci n'est pas corrigé par un administrateur."
 
-#: html/main.php:228
+#: html/main.php:198
+msgid "Your password is about to expire, please change your password!"
+msgstr ""
+"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
+
+#: html/main.php:268
 msgid "Running out of memory!"
 msgstr "Plus de mémoire disponible !"
 
-#: html/main.php:285
+#: html/main.php:325
 msgid "User ACL checks disabled"
 msgstr "Les vérifications des ACL de l'utilisateur ont été désactivés"
 
-#: html/main.php:339
-msgid "Your password is about to expire, please change your password!"
-msgstr ""
-"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
-
-#: html/main.php:349
+#: html/main.php:373
 msgid "Plugin"
 msgstr "Extension"
 
-#: html/main.php:350
-#, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+#: html/main.php:374
+#, fuzzy, php-format
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "FATAL: Impossible de trouver une définition pour l'extension '%s' !"
 
-#: html/main.php:364
+#: html/main.php:388
 msgid "Configuration Error"
 msgstr "Erreur de configuration"
 
-#: html/main.php:365
-#, php-format
+#: html/main.php:389
+#, fuzzy, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 "FATAL: toute les variables POST non pas été transférées par PHP - Veuillez "
 "avertir votre administrateur !"
@@ -1122,41 +957,43 @@ msgid "The filter is incomplete!"
 msgstr "Le filtre est incomplet !"
 
 #: include/class_management.inc:292 include/class_management.inc:427
-#: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:616
+#: include/class_management.inc:474 include/class_management.inc:511
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
+#: plugins/admin/users/class_userManagement.inc:236
+#: plugins/admin/users/class_userManagement.inc:745
 msgid "Permission"
 msgstr "Permissions"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:575
-#: plugins/admin/users/class_userManagement.inc:579
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 "Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
 
-#: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:474 include/class_management.inc:511
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
 
-#: include/class_management.inc:583
+#: include/class_management.inc:584
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
+"Pas de déclaration pour '%s' dans votre fichier de configuration. Impossible "
+"d'initialiser le plugin !"
 
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
@@ -1172,14 +1009,14 @@ msgstr "La connexion socket vers l'hôte '%s:%s' à echoué : %s"
 msgid "Socket timeout of %s seconds reached."
 msgstr "Le temps limite du socket de '%s' secondes à été atteint."
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 "Impossible de trouver une méthode de cryptage correspondante pour le mot de "
 "passe !"
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1144 include/class_config.inc:1175
+#: include/class_config.inc:1147 include/class_config.inc:1178
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1188,7 +1025,7 @@ msgstr ""
 "La fonctionnalité pour les copie instantanées est activée, mais la variable "
 "requise '%s' n'est pas configurée."
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1160
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -1197,321 +1034,331 @@ msgstr ""
 "La fonctionnalité pour les copie instantanées est activée, mais le module "
 "nécessaire à la compression est manquant. Veuillez installer '%s'. "
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr "Contrôle d'accès"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Gestion de listes de contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:120 include/class_acl.inc:581
+#: include/class_acl.inc:1009
+#, php-format
+msgid "All users"
+msgstr "Tout les utilisateurs"
+
+#: include/class_acl.inc:214 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr "Toutes les catégories"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:222
 msgid "Reset ACLs"
 msgstr "Remise à zéro des ACL"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr "Un niveau"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:224 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr "Objet actuel"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr "Sous arbre complet"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:226 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr "Le sous arbre complet (permanent)"
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:227 include/class_acl.inc:230
 msgid "Use ACL defined in role"
 msgstr "Utiliser l'ACL définie dans le rôle"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
-#: setup/class_setupStep_Migrate.inc:1039
+#: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1666
+#: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:233 plugins/admin/groups/class_group.inc:1180
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: setup/class_setupStep_Migrate.inc:1042
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Groups"
 msgstr "Groupes"
 
-#: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
-#: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:496 include/class_listing.inc:242
+#: include/class_listing.inc:999 include/class_listing.inc:1001
+#: include/class_sortableListing.inc:261
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Au dessus"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
-#: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: include/class_acl.inc:498 include/class_listing.inc:242
+#: include/class_sortableListing.inc:261
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "En bas"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:503 include/class_acl.inc:551
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:108
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Editer"
+
+#: include/class_acl.inc:503 include/class_acl.inc:507
+#: include/class_acl.inc:1265 include/class_acl.inc:1266
+#: include/class_acl.inc:1271 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr ""
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/class_acl.inc:507 include/class_acl.inc:555
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
+#: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Supprimer"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:543
 msgid "No ACL settings for this category!"
 msgstr "Pas de paramètres pour les ACL de cette catégorie !"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:545
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Contient les ACL pour ces objets: %s"
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:551 include/class_acl.inc:555
 msgid "category ACL"
 msgstr "ACL de la catégorie"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:608
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:618 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr "Tout les objets dans le sous arbres actuel"
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:779 include/class_acl.inc:786
 msgid "Show/hide advanced settings"
 msgstr "Afficher/Cacher la configuration avancée"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:803
 msgid "Create objects"
 msgstr "Créer un objet"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:804
 msgid "Move objects"
 msgstr "Bouger un objet"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:805
 msgid "Remove objects"
 msgstr "Enlever les objets"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:807
 msgid "Grant permission to owner"
 msgstr "Donner la permission à l'utilisateur"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:811 include/class_acl.inc:916
+#: include/class_acl.inc:920
 msgid "read"
 msgstr "lecture"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:812 include/class_acl.inc:918
+#: include/class_acl.inc:921
 msgid "write"
 msgstr "écrire"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:816
 msgid "Complete object"
 msgstr "L'objet au complet"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:960 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:604 include/functions.inc:790
-#: include/functions.inc:908 include/functions.inc:1306
-#: include/functions.inc:2370 include/functions.inc:2404
-#: include/functions.inc:2424 include/class_ldap.inc:692
-#: include/class_ldap.inc:740 include/class_log.inc:87
+#: include/functions.inc:611 include/functions.inc:815
+#: include/functions.inc:933 include/functions.inc:1331
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
+#: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:960
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Type d'ACL inconnu '%s' !"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:1005
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entrée inconnue '%s'  !"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1069 include/class_acl.inc:1071
 #, php-format
 msgid "Role: %s"
 msgstr "Rôle : %s"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1071
 msgid "unknown role"
 msgstr "Rôle inconnu"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1079
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Contient les paramètres pour ces objets: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1096
 msgid "inactive"
 msgstr "inactif"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1096
 msgid "No members"
 msgstr "Aucun membres"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1266
 msgid "Access control list"
 msgstr "Contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1271
 msgid "ACL roles"
 msgstr "Rôles ACL"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Fermer"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+"Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
+"système."
+
+#: include/class_listing.inc:301 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr "Sélectionner tout"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:522
+msgid "created by"
+msgstr "Crée par"
+
+#: include/class_listing.inc:991
 msgid "Go to root department"
 msgstr "Aller au département de base"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:991 include/class_listing.inc:993
+#: include/class_baseSelector.inc:159
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:999
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1007
 msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1007 include/class_listing.inc:1009
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1014
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1014 include/class_baseSelector.inc:206
 msgid "Submit"
 msgstr "Soumettre"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr "Encodage du inconsistant du DN détecté : '%s'"
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-msgid "Requested channel does not exist! Please contact your Administrator."
+#: include/class_listing.inc:1109 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
+#: plugins/admin/groups/group-list.xml:79 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
 msgstr ""
-"Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
-"système."
 
-#: include/class_baseSelectDialog.inc:28
-msgid "Choose a base"
-msgstr "Sélectionnez une base"
-
-#: include/class_listing.inc:303 setup/setup_migrate.tpl:93
-#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
-#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
-#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr "Sélectionner tout"
-
-#: include/class_listing.inc:521
-msgid "created by"
-msgstr "Crée par"
-
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1380 include/class_listing.inc:1430
+#: include/class_plugin.inc:2238
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1386 include/class_listing.inc:1420
+#: include/class_plugin.inc:2242
 msgid "Cut"
 msgstr "Couper"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
-#: include/class_CopyPasteHandler.inc:514
+#: include/class_listing.inc:1394 include/class_listing.inc:1396
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
+#: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1462 include/class_listing.inc:1464
 msgid "Restore snapshots"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1478
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1513 include/class_listing.inc:1514
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 msgid "Create snapshot"
 msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouveau snapshot depuis cet objet"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Exporter la liste"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Editer cette entrée"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
-#: include/functions.inc:127
+#: include/functions.inc:134
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 "Erreur fatale : pas d'emplacement défini pour les classes  - veuillez "
 "exécuter '%s' pour régler le problème"
 
-#: include/functions.inc:134
+#: include/functions.inc:141
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
@@ -1519,19 +1366,19 @@ msgstr ""
 "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
 "'%s' pour essayer de régler le problème"
 
-#: include/functions.inc:448
+#: include/functions.inc:455
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
-"FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu '%"
-"s'."
+"FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu "
+"'%s'."
 
-#: include/functions.inc:519
+#: include/functions.inc:526
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
 
-#: include/functions.inc:604
+#: include/functions.inc:611
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1539,11 +1386,11 @@ msgstr ""
 "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP. "
 "Veuillez contacter votre administrateur système."
 
-#: include/functions.inc:790 include/functions.inc:908
+#: include/functions.inc:815 include/functions.inc:933
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Erreur lors de l'ajout d'un verrou. Contactez les développeurs !"
 
-#: include/functions.inc:800
+#: include/functions.inc:825
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1552,12 +1399,12 @@ msgstr ""
 "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
 "Veuillez contacter votre administrateur !"
 
-#: include/functions.inc:800
+#: include/functions.inc:825
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Le serveur LDAP à retourné: %s"
 
-#: include/functions.inc:929
+#: include/functions.inc:954
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1565,12 +1412,12 @@ msgstr ""
 "Détection de verrou multiple pour un même objet. Ceci ne devrait pas "
 "arriver. Effacement des références multiples."
 
-#: include/functions.inc:1233
+#: include/functions.inc:1258
 #, 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:1235
+#: include/functions.inc:1260
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1579,73 +1426,83 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Configurer"
 
-#: include/functions.inc:1252
+#: include/functions.inc:1277
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1642
+#: include/functions.inc:1667
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1644
+#: include/functions.inc:1669
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1646
+#: include/functions.inc:1671
 #, 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"
 
-#: include/functions.inc:1886
+#: include/functions.inc:1911
 msgid "Entries per page"
 msgstr "Entrées par page"
 
-#: include/functions.inc:1915 include/class_filter.inc:314
+#: include/functions.inc:1940 include/class_filter.inc:315
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/functions.inc:2227 include/class_filter.inc:280
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2273
+#: include/functions.inc:2313
+#, php-format
+msgid "GOsa %s"
+msgstr ""
+
+#: include/functions.inc:2320
+#, php-format
+msgid "GOsa %s snapshot (Rev %s)"
+msgstr "Version de développement de GOsa %s (Rev %s)"
+
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Version de développement de GOsa (Rev %s)"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Le fichier '%s' ne peut pas être éffacé."
 
-#: include/functions.inc:2404 include/functions.inc:2424
+#: include/functions.inc:2451 include/functions.inc:2471
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier de revision !"
 
-#: include/functions.inc:2642 include/functions.inc:2646
-#: include/functions.inc:2652
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' n'est pas disponible. Utilisation de la base par défaut !"
 
-#: include/functions.inc:2676
+#: include/functions.inc:2723
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:2676
+#: include/functions.inc:2723
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Impossible de récupérer les informations sur les schémas depuis le serveur. "
 "Vérification des schémas impossibles !"
 
-#: include/functions.inc:2702
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr "Utilisé pour stocker les informations spécifiques des comptes."
 
-#: include/functions.inc:2709
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1653,27 +1510,27 @@ msgstr ""
 "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de "
 "multiples changements simultanés."
 
-#: include/functions.inc:2754
+#: include/functions.inc:2801
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Object class obligatoire '%s' manquante !"
 
-#: include/functions.inc:2757
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Object class facultative '%s' manquante !"
 
-#: include/functions.inc:2762
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "La version requise des object class ne correspond pas '%s' (!=%s) !"
 
-#: include/functions.inc:2765
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2787
+#: include/functions.inc:2834
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1682,7 +1539,7 @@ msgstr ""
 "serveur ldap' lors de l'installation, mais la configuration de vos schéma ne "
 "supportent pas cette option."
 
-#: include/functions.inc:2788
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1690,7 +1547,7 @@ msgstr ""
 "Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, "
 "l'objectClass 'posixGroup' doit être       AUXILIARY"
 
-#: include/functions.inc:2792
+#: include/functions.inc:2839
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1699,51 +1556,51 @@ msgstr ""
 "avez désactivé cette option lors de l'étape 'configuration de l'annuaire "
 "ldap' du programme d'installation."
 
-#: include/functions.inc:2793
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "L'objectClass 'posixGroup' doit être STRUCTURAL"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Allemand"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Français"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Italien"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Anglais"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: include/functions.inc:2823
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Polonais"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr "Chinois"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2873
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: include/functions.inc:2827
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Russe"
 
-#: include/functions.inc:3022
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1751,11 +1608,11 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
 "pas."
 
-#: include/functions.inc:3055
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr "Impossible de générer un hash samba !"
 
-#: include/functions.inc:3068
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
@@ -1763,39 +1620,39 @@ msgstr ""
 "Impossible de générer le mot de passe samba: l'exécution de '%s' à échoué, "
 "veuillez vérifier le paramètre 'sambaHashHook'!"
 
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3401 include/functions.inc:3413
-#: include/functions.inc:3417 include/functions.inc:3432
-#: include/functions.inc:3441
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "Impossible d'assigner un ID libre :"
 
-#: include/functions.inc:3349
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr "Méthode d'allocation des id inconnue !"
 
-#: include/functions.inc:3363
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3393
+#: include/functions.inc:3443
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
 
-#: include/functions.inc:3401
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool n'est pas unique !"
 
-#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3463 include/functions.inc:3467
 msgid "no ID available!"
 msgstr "Pas d' ID disponibles !"
 
-#: include/functions.inc:3441
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "Nombre maximum d'essais dépassés !"
 
-#: include/functions.inc:3501
+#: include/functions.inc:3551
 msgid "Cannot allocate a free ID!"
 msgstr "Impossible d'assigner un ID libre !"
 
@@ -1830,6 +1687,42 @@ msgstr "Supprimer le snapshot"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:977
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/groups/class_group.inc:1184
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:63
+#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:92
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:123
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:92
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:91
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:359
+#: plugins/admin/departments/class_department.inc:664
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr ""
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1936,13 +1829,13 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Arguments"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:322 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr "Chercher dans les sous arbre"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1950,29 +1843,29 @@ msgstr ""
 "Cet objet à changer depuis son ouverture dans GOsa. Tout les changement "
 "éffectués par les autres seront perdus si vous sauvez cette entrée !"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr "Changement du dn de l'acl"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr "de"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
-#: setup/class_setupStep_Migrate.inc:1299
-#: setup/class_setupStep_Migrate.inc:1347
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
+#: setup/class_setupStep_Migrate.inc:1300
+#: setup/class_setupStep_Migrate.inc:1348
 msgid "to"
 msgstr "vers"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 msgid "Restore"
 msgstr "Restaurer"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "couper"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "copier"
 
@@ -2016,310 +1909,311 @@ msgstr "en ligne"
 msgid "XML error"
 msgstr "Erreur XML"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Sélectionnez pour lister les objets de type '%s'."
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Sélectionner pour lister les objets contenant '%s'."
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Sélectionnez pour lister les objets qui ont '%s' activés"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Sélectionner pour chercher dans le sous arbre"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr "Cet objet sera effacé !"
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr "L'objet '%s' sera effacé !"
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr "Cet objet sera effacé : %s"
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr "L'objet de type '%s' sera effacé: %s"
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr "Cet objet sera effacé: "
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr "L'objet de type '%s' sera effacé:"
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr "Ces objets seront effacés: %s"
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr "Ces objets de type '%s' seront effacés: %s"
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 msgid "You have no permission to delete this object!"
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet !"
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 msgid "You have no permission to delete the object:"
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet :"
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 msgid "You have no permission to delete these objects:"
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer ces objets :"
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 msgid "You have no permission to create this object!"
 msgstr "Vous n'avez pas les droits nécessaires pour créer cet objet !"
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 msgid "You have no permission to create the object:"
 msgstr "Vous n'avez pas les droits nécessaires pour créer l'objet :"
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 msgid "You have no permission to create these objects:"
 msgstr "Vous n'avez pas les droits nécessaires pour créer ces objets :"
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 msgid "You have no permission to modify this object!"
 msgstr "Vous n'avez pas l'autorisation de modifier cet objet !"
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 msgid "You have no permission to modify the object:"
 msgstr "Vous n'avez pas l'autorisation de modifier cet objet :"
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 msgid "You have no permission to modify these objects:"
 msgstr "Vous n'avez pas l'autorisation de modifier ces objets :"
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 msgid "You have no permission to view this object!"
 msgstr "Vous n'avez pas l'autorisation de voir cet objet !"
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 msgid "You have no permission to view the object:"
 msgstr "Vous n'avez pas l'autorisation de voir l'objet :"
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 msgid "You have no permission to view these objects:"
 msgstr "Vous n'avez pas l'autorisation devoir ces objets :"
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 msgid "You have no permission to move this object!"
 msgstr "Vous n'avez pas l'autorisation de bouger cet objet !"
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 msgid "You have no permission to move the object:"
 msgstr "Vous n'avez pas l'autorisation de bouger l'objet :"
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 msgid "You have no permission to move these objects:"
 msgstr "Vous n'avez pas l'autorisation de bouger ces objets :"
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 msgid "Connection information"
 msgstr "Informations de connexions"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Impossible de se connecter à la base de données %s !"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, php-format
 msgid "Cannot select %s database!"
 msgstr "Impossible de sélectionner la base de données %s !"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr "Pas de serveur %s défini !"
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, php-format
 msgid "Cannot query %s database!"
 msgstr "Impossible d'effectuer une requête sur la base de données %s !"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "Le champ '%s' contient un mot réservé !"
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 "La commande '%s', spécifiée comme connexion de l'extension '%s' n'existe "
 "pas !"
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "Le commande '%s' est invalide !"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr "l'option '%s' de la commande (%s) pour l'extension %s est invalide !"
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "l'option '%s' de la commande pour l'extension %s est invalide !"
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "l'option '%s' de la commande (%s) est invalide !"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Impossible d'exécuter la commande '%s' !"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 "Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Impossible d'exécuter l'option '%s' de la commande (%s) !"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "La valeur pour '%s' est trop grande !"
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' doit être plus petit que %s !"
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "La valeur pour '%s' est trop petite !"
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' doit être à la version %d ou plus grand !"
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dépend de '%s' - veuillez indiquer les deux valeurs !"
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Il existe déjà une entrée avec l'attribut '%s' dans le système !"
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Le champ obligatoire '%s' n'est pas rempli !"
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr "Exemple"
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:295
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Le champ '%s' contient des caractères invalides"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' n'est pas permis :"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' n'est pas autorisé !"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:299
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Le champ '%s' contient des caractères invalides !"
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:306
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Extension PHP %s manquante !"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
-#: setup/class_setupStep_Migrate.inc:2868
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
+#: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
 msgstr "Ajouter"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:336
 #, php-format
 msgid "Add %s"
 msgstr "Ajouter %s"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:342
 #, php-format
 msgid "Delete %s"
 msgstr "Supprimer %s"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:348
 #, php-format
 msgid "Set %s"
 msgstr "Activer %s"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:354
 #, php-format
 msgid "Edit..."
 msgstr "Editer..."
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:354
 #, php-format
 msgid "Edit %s..."
 msgstr "Editer %s..."
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:360
 msgid "Back"
 msgstr "Retour"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:380
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Ce compte n'a pas d'extensions %s valides !"
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:386
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
@@ -2327,24 +2221,24 @@ msgstr ""
 "Ce compte possède l'extension %s activée. Vous pouvez la supprimer en "
 "cliquant sur le bouton ci-dessous."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:389 include/utils/class_msgPool.inc:396
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
 "the %s settings first!"
 msgstr ""
-"Ce compte possède %s paramètres activés. Pour le désactiver vous devez au "
-"préalable supprimer les %s paramètres !"
+"Ce compte possède les paramètres %s activés. Pour les désactiver vous devez au "
+"préalable supprimer les paramètres %s !"
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:405
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
-"Ce compte possède %s paramètres desactivés. Vous pouvez les activer en "
+"Ce compte possède les paramètres %s desactivés. Vous pouvez les activer en "
 "clicquant ci dessous."
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:408 include/utils/class_msgPool.inc:415
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2353,184 +2247,184 @@ msgstr ""
 "Ce compte possède %s paramètres désactivés. Pour les activer, vous devez au "
 "préalable ajouter les %s paramètres !"
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:423
 #, php-format
 msgid "Add %s settings"
 msgstr "Ajouter %s paramètres"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:429
 #, php-format
 msgid "Remove %s settings"
 msgstr "Effacer %s paramètres"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:435
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans "
 "cette boite de dialogue"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "January"
 msgstr "Janvier"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "February"
 msgstr "Février"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "March"
 msgstr "Mars"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "April"
 msgstr "Avril"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "May"
 msgstr "Mai"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "June"
 msgstr "Juin"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "July"
 msgstr "Juillet"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "August"
 msgstr "Août"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "September"
 msgstr "Septembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:443
 msgid "October"
 msgstr "Octobre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:443
 msgid "November"
 msgstr "Novembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:443
 msgid "December"
 msgstr "Décembre"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Monday"
 msgstr "Lundi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Friday"
 msgstr "Vendredi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Saturday"
 msgstr "Samedi"
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:456
 msgid "MySQL operation failed!"
 msgstr "La requête MySQL à échoué !"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:464
 msgid "read operation"
 msgstr "lecture"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:464
 msgid "add operation"
 msgstr "ajout"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:464
 msgid "modify operation"
 msgstr "modification"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:465
 msgid "delete operation"
 msgstr "suppression"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:465
 msgid "search operation"
 msgstr "recherche"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:465
 msgid "authentication"
 msgstr "authentification"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:468
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La requête LDAP %s à échoué !"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:470
 msgid "LDAP operation failed!"
 msgstr "La requête LDAP à échoué !"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:485
 msgid "Upload failed!"
 msgstr "Le téléchargement à échoué !"
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:488
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Le téléchargement à échoué : %s"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:495
 msgid "Communication failure with the infrastructure service!"
 msgstr "Erreur de communication avec le service d'infrastructure !"
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:497
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Erreur de communication avec le service d'infrastructure : %s"
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:504 include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Ce '%s' est en cours d'utilisation par : %s"
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:510
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Ce '%s' est toujours en utilisation."
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:512
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Ce '%s' est en utilisation par les objets : %s"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:518
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Le fichier '%s' n'existe pas !"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:524
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Impossible de lire le fichier '%s' !"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:530
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Impossible d'écrire dans le fichier '%s' !"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:536
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -2539,32 +2433,32 @@ msgstr ""
 "La valeur de '%s' est actuellement vide ou non valide, veuillez vérifier "
 "votre fichier de configuration !"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:542
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Impossible d'effacer le fichier '%s' !"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:548
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Impossible de créer le répertoire '%s' !"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:554
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Impossible d'effacer le répertoire '%s' !"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:560
 #, php-format
 msgid "Checking for %s support"
 msgstr "Vérification du support pour %s"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:566
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installer et activer le module PHP %s."
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:572
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
@@ -2573,6 +2467,13 @@ msgstr ""
 "Impossible d'initialiser la classe '%s' ! Peut être manque t'il une "
 "extension dans votre installation de GOsa ?"
 
+#: include/utils/class_msgPool.inc:578
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+"La base fournie n'est pas valide et à été réinitialisée à la valeur "
+"précédente !"
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Avertissement de performance"
@@ -2584,7 +2485,7 @@ msgstr ""
 "La performance de votre annuaire est faible : la dernière requête à duré "
 "%.2fs !"
 
-#: include/class_ldap.inc:692
+#: include/class_ldap.inc:693
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
@@ -2592,24 +2493,29 @@ msgstr ""
 "Impossible de créer automatiquement des sous arbres avec le RDN '%s': object "
 "class non trouvé !"
 
-#: include/class_ldap.inc:740
+#: include/class_ldap.inc:744
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 "Impossible de créer automatiquement des sous arbres avec le RDN '%s': non "
 "supporté"
 
-#: include/class_ldap.inc:827
+#: include/class_ldap.inc:831
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
 
-#: include/class_ldap.inc:829
+#: include/class_ldap.inc:833
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP %s"
 
-#: include/class_ldap.inc:1051
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2618,7 +2524,7 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2657,26 +2563,26 @@ msgstr "Impossible d'envoyer l'evènement annuler pour l'entrée '%s' !"
 msgid "Cannot remove entry %s!"
 msgstr "Impossible d'enlever l'entrée %s !"
 
-#: include/class_config.inc:151
+#: include/class_config.inc:152
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
 
-#: include/class_config.inc:317
+#: include/class_config.inc:318
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
 "l'administrateur du système."
 
-#: include/class_config.inc:694
+#: include/class_config.inc:695
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID et/ou sambaRidBase absents de votre configuration !"
 
-#: include/class_config.inc:1102
+#: include/class_config.inc:1105
 msgid "Configuration"
 msgstr ""
 
-#: include/class_config.inc:1102
+#: include/class_config.inc:1105
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2688,14 +2594,17 @@ msgstr ""
 msgid "All objects in this category"
 msgstr "Tout les objets dans cette catégorie"
 
-#: include/class_pluglist.inc:178
+#: include/class_pluglist.inc:183
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 "Le format du fichier de configuration à changé. Veuillez réexecuter "
 "l'installation !"
 
-#: include/class_pluglist.inc:197 include/class_pluglist.inc:198
-#: include/class_pluglist.inc:311
+#: include/class_pluglist.inc:202 include/class_pluglist.inc:203
+#: include/class_pluglist.inc:316
+#: plugins/admin/departments/class_department.inc:145
+#: plugins/personal/generic/class_user.inc:273
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -2726,17 +2635,17 @@ msgstr "'%s' n'est pas un objet LDAP valide"
 msgid "No write permission in '%s'"
 msgstr "Pas de permissions d'écriture dans '%s'"
 
-#: include/class_CopyPasteHandler.inc:394
+#: include/class_CopyPasteHandler.inc:396
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr "Ces objets seront collés : %s"
 
-#: include/class_CopyPasteHandler.inc:418
+#: include/class_CopyPasteHandler.inc:420
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Cet objet sera collé : %s"
 
-#: include/class_CopyPasteHandler.inc:516
+#: include/class_CopyPasteHandler.inc:572
 msgid "Cannot paste"
 msgstr "Impossible de coller"
 
@@ -2745,12 +2654,12 @@ msgid "Please fix the above error and reload the page."
 msgstr "Veuillez fixer l'erreur ci dessus et recharger la page."
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
-#: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:966
+#: plugins/admin/groups/class_group.inc:1174
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Informations"
@@ -2763,7 +2672,7 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Messagerie"
@@ -2771,14 +2680,14 @@ msgstr "Messagerie"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr ""
 
@@ -2796,25 +2705,35 @@ msgstr ""
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
-#: plugins/admin/groups/group-list.xml:79
+#: plugins/admin/groups/group-list.xml:96
 #: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Groupes"
 
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:249
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
+msgid "Department"
+msgstr "Département"
+
 #: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:770
-#: plugins/admin/departments/generic.tpl:88
-#: plugins/admin/departments/class_department.inc:328
-#: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
-#: plugins/personal/generic/multiple_generic.tpl:217
-#: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/departments/generic.tpl:106
+#: plugins/admin/departments/class_department.inc:370
+#: plugins/admin/departments/organization.tpl:105
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Téléphone"
@@ -2896,12 +2815,12 @@ msgstr "L'équipe de GOsa"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#, fuzzy
 msgid "Please select the desired entries"
-msgstr "Veuillez sélectionner la langue par défaut"
+msgstr "Veuillez sélectionner les entrées désirées"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
@@ -2912,6 +2831,7 @@ msgstr ""
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
 #: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
@@ -2919,108 +2839,160 @@ msgid "User"
 msgstr "Utilisateur"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
-#: plugins/admin/ogroups/class_ogroup.inc:803
-#: plugins/admin/ogroups/class_ogroup.inc:813
-#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:29
+#: plugins/admin/ogroups/class_ogroup.inc:768
+#: plugins/admin/ogroups/class_ogroup.inc:783
+#: plugins/admin/ogroups/class_ogroup.inc:787
+#: plugins/admin/ogroups/class_ogroup.inc:975
+#: plugins/admin/ogroups/ogroup-filter.tpl:29
 #: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userSelect/user-filter.tpl:17
+#: plugins/admin/groups/group-filter.tpl:21
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl:17
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/class_groupGeneric.inc:1052
-#: plugins/admin/groups/class_groupGeneric.inc:1058
-#: plugins/admin/groups/class_groupGeneric.inc:1060
-#: plugins/admin/groups/class_groupGeneric.inc:1072
-#: plugins/admin/groups/class_groupGeneric.inc:1086
-#: plugins/admin/groups/class_groupGeneric.inc:1093
-#: plugins/admin/groups/class_groupGeneric.inc:1180
-#: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:412
-#: plugins/admin/users/class_userManagement.inc:459
-#: plugins/admin/departments/class_domain.inc:43
-#: plugins/admin/departments/class_domain.inc:45
-#: plugins/admin/departments/class_domain.inc:50
-#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:21
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/groups/class_group.inc:1045
+#: plugins/admin/groups/class_group.inc:1056
+#: plugins/admin/groups/class_group.inc:1058
+#: plugins/admin/groups/class_group.inc:1075
+#: plugins/admin/groups/class_group.inc:1089
+#: plugins/admin/groups/class_group.inc:1096
+#: plugins/admin/groups/class_group.inc:1183
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
+#: plugins/admin/users/user-filter.tpl:24
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
 #: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:90
+#: plugins/admin/departments/dep-filter.tpl:15
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
 #: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
 #: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
 #: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1284
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/class_user.inc:1339
-#: plugins/personal/generic/class_user.inc:1745
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:90
+#: plugins/admin/departments/class_department.inc:349
+#: plugins/admin/departments/class_department.inc:351
+#: plugins/admin/departments/class_department.inc:356
+#: plugins/admin/departments/class_department.inc:363
+#: plugins/admin/departments/class_department.inc:367
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
+#: plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:23
+#: plugins/personal/posix/groupSelect/group-filter.tpl:21
 #: plugins/personal/posix/groupSelect/group-list.xml:41
 #: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nom"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:976
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1185
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:92
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/class_organizationGeneric.inc:125
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-filter.tpl:3
+#: plugins/admin/groups/group-filter.tpl:3
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl:3
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:3
+#: plugins/admin/users/user-filter.tpl:3
+#: plugins/admin/departments/dep-filter.tpl:3
+#: plugins/admin/acl/acl-filter.tpl:3
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr "Filtre"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
-#, fuzzy
 msgid "Show department"
-msgstr "départements"
+msgstr "Départements"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
-#, fuzzy
 msgid "Show users"
-msgstr "serveurs"
+msgstr "Utilisateurs"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
-#, fuzzy
 msgid "Show groups"
-msgstr "Groupes de messagerie"
+msgstr "Groupes"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
-#, fuzzy
 msgid "Show server"
-msgstr "serveurs"
+msgstr "Serveur"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
-#, fuzzy
 msgid "Show workstation"
-msgstr "stations de travail"
+msgstr "Stations de travail"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
-#, fuzzy
 msgid "Show terminal"
-msgstr "terminaux"
+msgstr "Terminaux"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
-#, fuzzy
 msgid "Show printer"
-msgstr "imprimante"
+msgstr "Imprimante"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
-#, fuzzy
 msgid "Show phone"
-msgstr "Montrer les changements"
+msgstr "Téléphones"
 
 #: plugins/admin/ogroups/remove.tpl:6
 msgid ""
@@ -3032,7 +3004,7 @@ msgstr ""
 "données."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:972
 msgid "Object groups"
 msgstr "Groupes d'objets"
 
@@ -3042,7 +3014,7 @@ msgstr "Gestion des groupe d'objets"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:189
+#: plugins/admin/users/class_userManagement.inc:204
 msgid "Infrastructure error"
 msgstr "Erreur d'infrastructure"
 
@@ -3054,87 +3026,87 @@ msgstr "Modèles"
 msgid "Windows Install"
 msgstr "Installation Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:238
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 "Vous ne pouvez pas combiner des terminaux et des stations de travail dans un "
 "groupe d'objet !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
-#: plugins/admin/users/class_userManagement.inc:337
-#: plugins/admin/users/class_userManagement.inc:371
-#: plugins/admin/users/class_userManagement.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/ogroups/class_ogroup.inc:393
+#: plugins/admin/ogroups/class_ogroup.inc:356
 msgid "too many different objects!"
 msgstr "nombre d'objets différents trop important !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:358
 msgid "users"
 msgstr "utilisateurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:359
 msgid "groups"
 msgstr "groupes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:360
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:361
 msgid "departments"
 msgstr "départements"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:362
 msgid "servers"
 msgstr "serveurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:363
 msgid "workstations"
 msgstr "stations de travail"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:364
 msgid "winstations"
 msgstr "Stations Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:365
 msgid "terminals"
 msgstr "terminaux"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:366
 msgid "phones"
 msgstr "téléphones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:367
 msgid "printers"
 msgstr "imprimantes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:412
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "désactivé"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:412
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "accès complet"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/groups/class_group.inc:434
 #: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:636
+#: plugins/admin/ogroups/class_ogroup.inc:601
 msgid "Non existing dn:"
 msgstr "le dn n'existe pas :"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:758
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
@@ -3143,19 +3115,19 @@ msgstr ""
 "Ces systèmes sont déjà configurés par d'autres groupes d'objets et ne "
 "peuvent pas être ajoutés :"
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:792
 msgid "You can combine two different object types at maximum, only!"
 msgstr "Vous pouvez combiner au maximum deux objets différents !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/ogroups/class_ogroup.inc:967
 msgid "Object group generic"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:978
 msgid "Sytem trust"
 msgstr "Système de Confiance"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:979
 msgid "Member"
 msgstr "Membres"
 
@@ -3174,36 +3146,19 @@ msgstr "Nom du groupe"
 msgid "Descriptive text for this group"
 msgstr "Description du groupe"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Sélectionnez la branche où sera placée le groupe"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Sélectionnez une base"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1191
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Système de Confiance"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Mode de confiance"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Objets membres"
 
@@ -3231,7 +3186,7 @@ msgstr "Sommaire FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3290,7 +3245,7 @@ msgid "List of object groups"
 msgstr "Liste des groupes d'objets"
 
 #: plugins/admin/ogroups/ogroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:57 plugins/admin/users/user-list.xml:73
+#: plugins/admin/groups/group-list.xml:74 plugins/admin/users/user-list.xml:73
 #: plugins/admin/departments/locality.tpl:8
 #: plugins/admin/departments/generic.tpl:7
 #: plugins/admin/departments/domain.tpl:8
@@ -3301,15 +3256,15 @@ msgid "Properties"
 msgstr "Propriétés"
 
 #: plugins/admin/ogroups/ogroup-list.xml:73
-#: plugins/admin/groups/group-list.xml:73 plugins/admin/users/user-list.xml:89
+#: plugins/admin/groups/group-list.xml:90 plugins/admin/users/user-list.xml:89
 #: plugins/admin/departments/dep-list.xml:98 plugins/admin/acl/acl-list.xml:76
-#: setup/class_setupStep_Migrate.inc:1035
-#: setup/class_setupStep_Migrate.inc:1051
+#: setup/class_setupStep_Migrate.inc:1036
+#: setup/class_setupStep_Migrate.inc:1052
 msgid "Create"
 msgstr "Créer"
 
 #: plugins/admin/ogroups/ogroup-list.xml:98
-#: plugins/admin/groups/group-list.xml:98
+#: plugins/admin/groups/group-list.xml:115
 #: plugins/admin/users/user-list.xml:121
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
@@ -3317,12 +3272,12 @@ msgstr "Créer"
 #: plugins/personal/generic/generic_certs.tpl:21
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2869
+#: setup/class_setupStep_Migrate.inc:2870
 msgid "Remove"
 msgstr "Supprimer"
 
 #: plugins/admin/ogroups/ogroup-list.xml:106
-#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/groups/group-list.xml:123
 #: plugins/admin/users/user-list.xml:156
 msgid "Send message"
 msgstr "Envoyer un message"
@@ -3339,6 +3294,12 @@ msgstr "Enlever le groupe d'objet"
 msgid "Select objects to add"
 msgstr "Sélectionnez les objets à ajouter"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filtres"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Afficher les objets du département"
@@ -3393,24 +3354,26 @@ msgstr ""
 "impossible pour GOsa de récupérer vos données."
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:415
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1289
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Prénom"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Nom de famille"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr "Edition multiple"
 
@@ -3419,48 +3382,48 @@ msgstr "Edition multiple"
 msgid "Posix name of the group"
 msgstr "Nom posix du groupe"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalement les IDs sont générés automatiquement, vous pouvez en spécifier "
 "un manuellement"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Forcer le GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Forcer le numéro d'ID"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Sélectionnez afin de créer un groupe samba"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "dans le domaine"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Les membres sont dans un groupe téléphonique"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "Les membres sont dans un groupe nagios"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Membre du groupe"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr "dans tout les groupes"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr "pas dans tout les groupes"
 
@@ -3479,73 +3442,104 @@ msgstr "Groupes Samba"
 msgid "Show mail groups"
 msgstr "Groupes de messagerie"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
+#: setup/setup_ldap.tpl:78
+msgid "Select user"
+msgstr "Sélectionner un utilisateur"
+
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Préférences des groupes"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Liste des groupes"
+
+#: plugins/admin/groups/group-list.xml:23
+msgid "Group submenu entry"
+msgstr "Sous menu de groupe"
+
+#: plugins/admin/groups/group-list.xml:31
+msgid "Group menu entry"
+msgstr "Entrée du menu de groupe"
+
+#: plugins/admin/groups/group-list.xml:155
+msgid "Edit group"
+msgstr "Editer le groupe"
+
+#: plugins/admin/groups/group-list.xml:168
+msgid "Remove group"
+msgstr "Enlever le groupe"
+
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:1358
 msgid "Cannot find group SID in your configuration!"
 msgstr "Impossible de trouver le SID de ce groupe dans votre configuration !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Administrateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Utilisateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Invités du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Groupe spécial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 "L'ajout de l'UID '%s' au groupe '%s' à échoué : Impossible de trouver "
 "l'utilisateur !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 "L'ajout de l'UID '%s' au groupe '%s' à échoué : l'UID est utilisé plus d'un "
 "fois !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 msgid "! unknown UID"
 msgstr "! identifiant inconnu"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 "La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Impossible de trouver le SID pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Impossible de trouver le RIDBASe pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:994
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr "L'identifiant de groupe '%s' est déjà utilisé par '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1108
+#: plugins/admin/groups/class_group.inc:1187
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3553,46 +3547,30 @@ msgstr "L'identifiant de groupe '%s' est déjà utilisé par '%s' !"
 msgid "GID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1175
 msgid "Generic group settings"
 msgstr "Préférences des groupes génériques"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1189
 msgid "Samba group type"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1190
 msgid "Samba domain name"
 msgstr "Domaine Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1192
 msgid "Phone pickup group"
 msgstr "Groupe téléphonique"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1193
 msgid "Nagios group"
 msgstr "Groupe Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1195
 msgid "Group member"
 msgstr "Membre du groupe"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Préférences des groupes"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Liste des groupes"
-
-#: plugins/admin/groups/group-list.xml:138
-msgid "Edit group"
-msgstr "Editer le groupe"
-
-#: plugins/admin/groups/group-list.xml:151
-msgid "Remove group"
-msgstr "Enlever le groupe"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Administration du groupe"
@@ -3608,19 +3586,19 @@ msgid "Edit posix properties"
 msgstr "Modifier les propriétés posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Modifier les propriétés samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
@@ -3636,7 +3614,7 @@ msgid "Edit start menu properties"
 msgstr "Modifier les propriétes du menu de démarrage"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Modifier les propriétés d'environnement"
@@ -3662,7 +3640,8 @@ msgstr ""
 "Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
 "mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
 
-#: plugins/admin/users/password.tpl:8 plugins/personal/password/password.tpl:8
+#: plugins/admin/users/password.tpl:8 plugins/personal/generic/password.tpl:8
+#: plugins/personal/password/password.tpl:8
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
@@ -3670,19 +3649,48 @@ msgstr ""
 "Changer le mot de passe affecte votre identification sur la messagerie, le "
 "proxy, samba, et les services unix."
 
-#: plugins/admin/users/password.tpl:17
-#: plugins/personal/generic/password.tpl:11
-#: plugins/personal/password/password.tpl:23
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
+#: plugins/personal/generic/password.tpl:27
+#: plugins/personal/generic/password.tpl:77
+#: plugins/personal/password/password.tpl:32
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: plugins/admin/users/password.tpl:21
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 msgid "Strength"
 msgstr "Sécurité"
 
-#: plugins/admin/users/password.tpl:30
-#: plugins/personal/generic/password.tpl:17
-#: plugins/personal/password/password.tpl:39
+#: plugins/admin/users/password.tpl:35
+msgid "Password input dialog"
+msgstr "Saisie du mot de passe"
+
+#: plugins/admin/users/password.tpl:39
+#: plugins/personal/generic/password.tpl:51
+#: plugins/personal/password/password.tpl:56
+msgid "Use proposal"
+msgstr "Proposition"
+
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
+#: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
+msgid "Manually specify a password"
+msgstr "Choisir un mot de passe"
+
+#: plugins/admin/users/password.tpl:84
+msgid "Enforce password change on next login."
+msgstr "Forcer le changement de mot de passe a la prochaine connexion."
+
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Attribuer le mot de passe"
 
@@ -3701,18 +3709,18 @@ msgstr ""
 "Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:409
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Modèle"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Prénom"
@@ -3721,38 +3729,38 @@ msgstr "Prénom"
 msgid "Manage users"
 msgstr "Gèrer les utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:278
+#: plugins/admin/users/class_userManagement.inc:392
 msgid "You have no permission to change this users password!"
 msgstr ""
 "Vous n'avez pas l'autorisation pour changer le mot de passe de ce(s) "
 "utilisateurs !"
 
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Account locking"
 msgstr "Verrouillage du compte"
 
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
-"La méthode '%s' ne permet pas le verrouillage du mot de passe. Le compte (%"
-"s) n'a pas été verrouillé !"
+"La méthode '%s' ne permet pas le verrouillage du mot de passe. Le compte "
+"(%s) n'a pas été verrouillé !"
 
-#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Unlock account"
 msgstr "Déverrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Lock account"
 msgstr "Verrouiller Compte"
 
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3760,19 +3768,19 @@ msgstr "Modifier les propriétés de base"
 msgid "POSIX"
 msgstr "UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/admin/users/class_userManagement.inc:876
 msgid "Edit POSIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Modifier les propriétés de Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/admin/users/class_userManagement.inc:896
 msgid "Edit FAX properties"
 msgstr "Modifier les propriétés FAX"
 
@@ -3864,6 +3872,47 @@ msgstr ""
 "fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
 "continuer ou 'Annuler' pour abandonner."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Liste des départements"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:189
+msgid "Domain"
+msgstr "Domaine"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr "Composant domaine"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_countryGeneric.inc:82
+#: plugins/admin/departments/class_countryGeneric.inc:83
+msgid "Country"
+msgstr "Pays"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_localityGeneric.inc:82
+#: plugins/admin/departments/class_localityGeneric.inc:83
+msgid "Locality"
+msgstr "Lieu"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:237
+#: plugins/admin/departments/class_organizationGeneric.inc:113
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Entreprise"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 msgid "Locality name"
@@ -3882,38 +3931,45 @@ msgstr "Nom du lieu à créer"
 msgid "Descriptive text for department"
 msgstr "Description du département"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr ""
-"Sélectionnez la branche de l'annuaire dans laquelle sera placée le "
-"département"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
-#: plugins/admin/departments/class_domain.inc:89
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/locality.tpl:39
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_domain.inc:93
+#: plugins/admin/departments/class_localityGeneric.inc:93
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_countryGeneric.inc:93
+#: plugins/admin/departments/class_dcObject.inc:92
+#: plugins/admin/departments/domain.tpl:39
+#: plugins/admin/departments/country.tpl:39
+#: plugins/admin/departments/dcObject.tpl:39
+#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/organization.tpl:51
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
+msgid "Manager"
+msgstr "Responsable"
+
+#: plugins/admin/departments/locality.tpl:67
+#: plugins/admin/departments/generic.tpl:132
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/domain.tpl:67
+#: plugins/admin/departments/country.tpl:67
+#: plugins/admin/departments/dcObject.tpl:67
+#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "Paramètres administratifs"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:69
+#: plugins/admin/departments/generic.tpl:134
+#: plugins/admin/departments/domain.tpl:69
+#: plugins/admin/departments/country.tpl:69
+#: plugins/admin/departments/dcObject.tpl:69
+#: plugins/admin/departments/organization.tpl:133
 msgid "Tag department as an independent administrative unit"
 msgstr "Marquer le département comme une entité administrative indépendante"
 
@@ -3930,8 +3986,8 @@ msgid "Descriptive text for   department"
 msgstr "Description du département"
 
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_organizationGeneric.inc:124
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Catégorie"
@@ -3941,89 +3997,83 @@ msgstr "Catégorie"
 msgid "Category for this subtree"
 msgstr "Catégorie pour cette branche de l'annuaire"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
-#: plugins/personal/generic/multiple_generic.tpl:265
+#: plugins/admin/departments/generic.tpl:79
+#: plugins/admin/departments/generic.tpl:91
+#: plugins/admin/departments/class_localityGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_department.inc:669
+#: plugins/admin/departments/organization.tpl:78
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Lieu"
 
-#: plugins/admin/departments/generic.tpl:65
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
-#: plugins/personal/generic/multiple_generic.tpl:275
+#: plugins/admin/departments/generic.tpl:83
+#: plugins/admin/departments/class_organizationGeneric.inc:129
+#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Département"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:86
+#: plugins/admin/departments/organization.tpl:85
 msgid "State where this subtree is located"
 msgstr "Lieu où est située cette branche de l'annuaire"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:94
+#: plugins/admin/departments/organization.tpl:93
 msgid "Location of this subtree"
 msgstr "Lieu de cette branche"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
-#: plugins/personal/generic/multiple_generic.tpl:67
-#: plugins/personal/generic/multiple_generic.tpl:285
+#: plugins/admin/departments/generic.tpl:99
+#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/organization.tpl:98
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:102
+#: plugins/admin/departments/organization.tpl:101
 msgid "Postal address of this subtree"
 msgstr "Adresse postale de cette branche"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:109
+#: plugins/admin/departments/organization.tpl:108
 msgid "Base telephone number of this subtree"
 msgstr "Numéro de téléphone de base pour cette sous-branche"
 
-#: plugins/admin/departments/generic.tpl:96
-#: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
-#: plugins/personal/generic/multiple_generic.tpl:247
-#: plugins/personal/generic/multiple_generic.tpl:438
+#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:373
+#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/organization.tpl:113
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/organization.tpl:116
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Numéro de fax de base pour cette sous-branche"
 
-#: plugins/admin/departments/class_domain.inc:77
-#: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:189
-#: plugins/admin/departments/class_dcObject.inc:77
-#: plugins/admin/departments/class_dcObject.inc:78
+#: plugins/admin/departments/class_domain.inc:81
+#: plugins/admin/departments/class_domain.inc:82
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_dcObject.inc:81
+#: plugins/admin/departments/class_dcObject.inc:82
 msgid "Domain Component"
 msgstr "Objet Domaine"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Départements"
 
@@ -4031,7 +4081,7 @@ msgstr "Départements"
 msgid "Manage Departments"
 msgstr "Gérer les départements"
 
-#: plugins/admin/departments/class_departmentManagement.inc:128
+#: plugins/admin/departments/class_departmentManagement.inc:122
 msgid ""
 "As soon as the tag operation has finished, you can scroll down to end of the "
 "page and    press the 'Continue' button to continue with the department "
@@ -4041,20 +4091,20 @@ msgstr ""
 "page et appuyer sur le bouton 'Continuer' pour continuer la gestion des "
 "départements."
 
-#: plugins/admin/departments/class_organizationGeneric.inc:118
+#: plugins/admin/departments/class_organizationGeneric.inc:122
 msgid "Organization name"
 msgstr "Nom de l'entreprise"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/admin/departments/class_organizationGeneric.inc:131
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Adresse postale"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:126
+#: plugins/admin/departments/class_organizationGeneric.inc:132
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: plugins/admin/departments/class_countryGeneric.inc:87
+#: plugins/admin/departments/class_countryGeneric.inc:91
 #: plugins/admin/departments/country.tpl:11
 msgid "Country name"
 msgstr "Pays"
@@ -4071,46 +4121,46 @@ msgstr "Nom du domaine à créer"
 msgid "Name of country to create"
 msgstr "Nom du pays à créer"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:433
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 "Impossible de trouver un marqueur libre pour marquer l'entité "
 "administrative !"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Marquer '%s'."
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Bouger '%s' vers '%s'"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Impossible de copier %s, arrêt de l'opération"
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Nom du département"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "L'objet '%s' est déjà marqué"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Ajouter une marque (%s) à l'objet '%s'"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Suppression de la marque de l'objet '%s'"
@@ -4173,7 +4223,7 @@ msgid "ACL Templates"
 msgstr "Modèles des ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr "Contrôle d'accès (ACL)"
 
@@ -4181,51 +4231,50 @@ msgstr "Contrôle d'accès (ACL)"
 msgid "Edit AC roles"
 msgstr "Editer le rôles (ACL)"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr "Remise à zéro des ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr "Pas d'ACL pour cette catégorie"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL pour ces objets: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr "Editer les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr "Remettre à zéro les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr "Objet utilisé"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 "Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
-#: plugins/personal/generic/multiple_generic.tpl:345
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Rôle"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -4257,29 +4306,29 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Editer les paramètres organisationnels de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:297
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 "Veuillez ajouter une adresse IP ou une combinaison réseau/masque de sous "
 "réseau !"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:340
 msgid "female"
 msgstr "féminin"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:340
 msgid "male"
 msgstr "masculin"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:408
 msgid "Cannot upload file!"
 msgstr "Impossible de télécharger le fichier !"
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:503
 msgid "Serial number"
 msgstr "Numéro de série"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:548
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4287,328 +4336,318 @@ msgstr ""
 "(Certains types de certificats ne sont pas supportés et peuvent être "
 "affichés comme 'non valides'.)"
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Le certificat est valide de %s à %s et est actuellement %s."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "valide"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "invalide"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:593
 msgid "The selected password method is no longer available."
 msgstr ""
 "Le format de stockage sélectionné pour les mots de passe n'est plus "
 "disponible."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 "Impossible de construire le RDN: pas de + autorisé dans la construction d'un "
 "sous RDN !"
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "Impossible de construire un RDN: l'attribut n'est pas défini !"
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 "Imposible de contruire un RDN: les paramètres de l'attribut sont non "
 "valides !"
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1272
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 "Le format de stockage sélectionné nécessite une configuration de base !"
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
-#: plugins/personal/generic/multiple_generic.tpl:88
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
-#: plugins/personal/generic/multiple_generic.tpl:227
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
-#: plugins/personal/generic/multiple_generic.tpl:237
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1471
 msgid "Cannot open certificate!"
 msgstr "Impossible d'ouvrir le certificat !"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
-#: plugins/personal/generic/multiple_generic.tpl:371
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
-#: plugins/personal/generic/multiple_generic.tpl:402
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Identifiant du bâtiment"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
-#: plugins/personal/generic/multiple_generic.tpl:302
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
-#: plugins/personal/generic/multiple_generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
-#: plugins/personal/generic/multiple_generic.tpl:360
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
-#: plugins/personal/generic/multiple_generic.tpl:312
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
-#: plugins/personal/generic/multiple_generic.tpl:323
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
-#: plugins/personal/generic/multiple_generic.tpl:334
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numéro de série du certificat"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
-#: plugins/personal/generic/multiple_generic.tpl:460
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Visible par tous"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
-#: plugins/personal/generic/multiple_generic.tpl:382
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
-#: plugins/personal/generic/multiple_generic.tpl:392
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1661
 msgid "Generic user settings"
 msgstr "Paramètres par défaut des utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1607
-#: plugins/personal/posix/class_posixAccount.inc:1444
-#: plugins/personal/password/class_password.inc:150
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Mon Compte"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1673
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1616
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/multiple_generic.tpl:23
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
-#: plugins/personal/generic/class_user.inc:1620
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Sexe"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1679
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Image de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1684
+msgid "Login restrictions"
+msgstr "Restriction de connexions"
+
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1690
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
-#: plugins/personal/generic/multiple_generic.tpl:189
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1694
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1695
 msgid "Pager number"
 msgstr "Numéro de page"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1696
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1706
 msgid "User password method"
 msgstr "Méthode d'encodage des mots de passe"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1707
 msgid "User certificates"
 msgstr "Certificats utilisateurs"
 
+#: plugins/personal/generic/class_user.inc:1915
+msgid "Entries differ"
+msgstr "Les entrées sont différentes"
+
+#: plugins/personal/generic/changed.tpl:3
+#: plugins/personal/password/changed.tpl:3
+msgid ""
+"You've successfully changed your password. Remember to change all programms "
+"configured to use it as well."
+msgstr ""
+"Votre mot de passe a été changé. N'oubliez pas de modifier les programmes "
+"qui l'utilisent."
+
 #: plugins/personal/generic/generic.tpl:6
-#: plugins/personal/generic/multiple_generic.tpl:5
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
-#: plugins/personal/generic/multiple_generic.tpl:13
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Image personnelle"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Changer la photo"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/multiple_generic.tpl:33
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
-
-#: plugins/personal/generic/generic.tpl:196
-#: plugins/personal/generic/multiple_generic.tpl:78
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/generic.tpl:217
-#: plugins/personal/generic/multiple_generic.tpl:105
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Format de stockage des mots de passe"
 
-#: plugins/personal/generic/generic.tpl:234
-#: plugins/personal/generic/multiple_generic.tpl:117
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plugins/personal/generic/generic.tpl:237
-#: plugins/personal/generic/multiple_generic.tpl:121
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Editer des certificats"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr "Restreindre le login à"
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr "IP ou réseau"
 
-#: plugins/personal/generic/generic.tpl:273
-#: plugins/personal/generic/multiple_generic.tpl:137
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/generic.tpl:301
-#: plugins/personal/generic/multiple_generic.tpl:169
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/generic.tpl:309
-#: plugins/personal/generic/multiple_generic.tpl:179
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
-#: plugins/personal/generic/multiple_generic.tpl:207
-#: plugins/personal/generic/multiple_generic.tpl:418
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Veuillez utiliser l'onglet téléphone"
 
@@ -4629,23 +4668,30 @@ msgstr "Attribuer un nouveau mot de passe"
 msgid "Remove picture"
 msgstr "Suppression de l'image personnelle"
 
-#: plugins/personal/generic/main.inc:115
-msgid "You have no permission to set your password!"
-msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe !"
-
-#: plugins/personal/generic/main.inc:206
+#: plugins/personal/generic/main.inc:168
 msgid "Generic user information"
 msgstr "Information générales sur l'utilisateur"
 
-#: plugins/personal/generic/password.tpl:2
+#: plugins/personal/generic/password.tpl:4
+#: plugins/personal/password/password.tpl:4
 msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
 msgstr ""
-"Vous avez sélectionnez une autre méthode de stockage des mots de passe. Pour "
-"cette raison vous devez ressaisir votre mot de passe afin que GOsa puisse le "
-"réencoder et l'enregistrer dans l'annuaire LDAP."
+"Pour changer votre mot de passe, veuillez utiliser les champs ci-dessous. "
+"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
+"mot de passe car sans lui vous ne serez pas capable de vous identifier."
+
+#: plugins/personal/generic/password.tpl:42
+#: plugins/personal/password/password.tpl:47
+msgid "Password change dialog"
+msgstr "Changement de mot de passe"
+
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
+msgid "Clear fields"
+msgstr "Effacer les données dans les champs"
 
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
@@ -4659,6 +4705,16 @@ msgstr "Certificat S/MIME"
 msgid "PKCS12 certificate"
 msgstr "Certificat PKCS12"
 
+#: plugins/personal/generic/nochange.tpl:2
+#: plugins/personal/password/nochange.tpl:2
+msgid "You have no permission to change your password at this time"
+msgstr ""
+"Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
+
+#: plugins/personal/generic/nochange.tpl:5
+msgid "Your password hash method will not be changed!"
+msgstr "Votre méthode de cryptage des mots de passe ne sera pas changé !"
+
 #: plugins/personal/posix/class_posixAccount.inc:38
 msgid "Edit users POSIX settings"
 msgstr "Editer les paramètres Unix"
@@ -4734,7 +4790,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1450
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4767,53 +4823,53 @@ msgstr ""
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1440
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "POSIX account"
 msgstr "Compte Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:1453
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Group ID"
 msgstr "ID du Groupe"
 
-#: plugins/personal/posix/class_posixAccount.inc:1455
+#: plugins/personal/posix/class_posixAccount.inc:1463
 msgid "Force password change on login"
 msgstr "Forcer le changement de mot de passe au la connexion"
 
-#: plugins/personal/posix/class_posixAccount.inc:1456
+#: plugins/personal/posix/class_posixAccount.inc:1464
 msgid "Shadow min"
-msgstr ""
+msgstr "nb minimal entre changements"
 
-#: plugins/personal/posix/class_posixAccount.inc:1457
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
-msgstr ""
+msgstr "Max valid time"
 
-#: plugins/personal/posix/class_posixAccount.inc:1458
+#: plugins/personal/posix/class_posixAccount.inc:1466
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1459
+#: plugins/personal/posix/class_posixAccount.inc:1467
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1460
+#: plugins/personal/posix/class_posixAccount.inc:1468
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr "Clef SSH publique"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1470
 msgid "System trust model"
 msgstr "Système de Confiance"
 
@@ -4890,19 +4946,16 @@ msgid "User name of which groups are shown"
 msgstr "Utilisateur dont on montre les groupes"
 
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:11
-#, fuzzy
 msgid "Show servers"
-msgstr "serveurs"
+msgstr "Serveurs"
 
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:12
-#, fuzzy
 msgid "Show workstations"
-msgstr "stations de travail"
+msgstr "Stations de travail"
 
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:13
-#, fuzzy
 msgid "Show terminals"
-msgstr "terminaux"
+msgstr "Terminaux"
 
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
@@ -4921,53 +4974,33 @@ msgstr ""
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
-#: plugins/personal/password/changed.tpl:3
-msgid ""
-"You've successfully changed your password. Remember to change all programms "
-"configured to use it as well."
-msgstr ""
-"Votre mot de passe a été changé. N'oubliez pas de modifier les programmes "
-"qui l'utilisent."
-
 #: plugins/personal/password/main.inc:57 setup/setup_config1.tpl:136
 msgid "Password settings"
 msgstr "Préférences pour les mots de passe"
 
-#: plugins/personal/password/password.tpl:4
-msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
-msgstr ""
-"Pour changer votre mot de passe, veuillez utiliser les champs ci-dessous. "
-"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
-"mot de passe car sans lui vous ne serez pas capable de vous identifier."
-
-#: plugins/personal/password/password.tpl:41
-msgid "Clear fields"
-msgstr "Effacer les données dans les champs"
+#: plugins/personal/password/password.tpl:14
+msgid "Your Password has expired. Please choose a new password!"
+msgstr "Votre mot de passe à expiré. Choisissez un nouveau mot de passe !"
 
 #: plugins/personal/password/class_password.inc:27
 msgid "Change user password"
 msgstr "Modifier votre mot de passe"
 
-#: plugins/personal/password/class_password.inc:79
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
-#: plugins/personal/password/class_password.inc:85
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
 
-#: plugins/personal/password/class_password.inc:94
+#: plugins/personal/password/class_password.inc:140
 #, php-format
-msgid "External password changer reported a problem: %s."
+msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
-"Le programme externe pour changer votre mot de passe à renvoyé une erreur: %"
-"s."
 
-#: plugins/personal/password/class_password.inc:108
+#: plugins/personal/password/class_password.inc:161
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
@@ -4975,23 +5008,14 @@ msgstr ""
 "Le mot de passe entré comme mot de passe actuel ne correspond pas à votre "
 "mot de passe."
 
-#: plugins/personal/password/class_password.inc:114
+#: plugins/personal/password/class_password.inc:167
 msgid "You have no permission to change your password."
 msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
-#: plugins/personal/password/class_password.inc:146
+#: plugins/personal/password/class_password.inc:204
 msgid "User password"
 msgstr "Mot de passe"
 
-#: plugins/personal/password/nochange.tpl:2
-msgid "Password change not allowed"
-msgstr "Le changement du mot de passe n'est pas autorisé"
-
-#: plugins/personal/password/nochange.tpl:6
-msgid "You have no permission to change your password at this time"
-msgstr ""
-"Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
-
 #: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
 msgstr "Compte / Groupes UNIX"
@@ -5056,11 +5080,11 @@ msgstr ""
 "Erreur lors de l'envoi de votre retour d'information:  service "
 "temporairement non disponible"
 
-#: setup/class_setupStep_Feedback.inc:180
+#: setup/class_setupStep_Feedback.inc:181
 msgid "Please specify a valid email address."
 msgstr "Veuillez indiquer une adresse de messagerie valide."
 
-#: setup/class_setupStep_Feedback.inc:184
+#: setup/class_setupStep_Feedback.inc:185
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -5201,15 +5225,19 @@ msgid "After migration"
 msgstr "Après migration"
 
 #: setup/setup_migrate.tpl:54 setup/class_setupStep_Migrate.inc:376
-#: setup/class_setupStep_Migrate.inc:665 setup/class_setupStep_Migrate.inc:805
-#: setup/class_setupStep_Migrate.inc:1034
-#: setup/class_setupStep_Migrate.inc:2132
-#: setup/class_setupStep_Migrate.inc:2575
-#: setup/class_setupStep_Migrate.inc:2729
-#: setup/class_setupStep_Migrate.inc:3059
+#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:806
+#: setup/class_setupStep_Migrate.inc:1035
+#: setup/class_setupStep_Migrate.inc:2133
+#: setup/class_setupStep_Migrate.inc:2576
+#: setup/class_setupStep_Migrate.inc:2730
+#: setup/class_setupStep_Migrate.inc:3060
 msgid "Migrate"
 msgstr "Migrer"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Fermer"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -5391,11 +5419,6 @@ msgstr ""
 "GOsa. Si vous voulez changer ceci pour certains périphériques, veuillez les "
 "sélectionner et utiliser le bouton 'migration' ci dessous."
 
-#: setup/setup_migrate.tpl:470 setup/setup_migrate.tpl:513
-#: setup/setup_migrate.tpl:557
-msgid "Refresh"
-msgstr "Rafraîchir"
-
 #: setup/setup_migrate.tpl:488
 msgid ""
 "The listed services are currently invalid for the GOsa version you are going "
@@ -5483,10 +5506,11 @@ msgid "GOsa requires this module for the samba integration."
 msgstr "GOsa à besoin de ce module pour dialoger avec Samba."
 
 #: setup/class_setupStep_Checks.inc:97
-msgid "GOsa requires this module to make use of SSHA encryption."
+msgid ""
+"GOsa requires either 'mhash' or the 'sha1' module to make use of SSHA "
+"encryption."
 msgstr ""
-"GOsa à besoin de ce module est nécessaire pour l'utilisation de l'encryption "
-"SSHA."
+"GOsa à besoin du module 'mash' ou 'sha1' pour l'utilisation du cryptage SSHA."
 
 #: setup/class_setupStep_Checks.inc:105
 msgid "GOsa requires this module to talk to an IMAP server."
@@ -5893,32 +5917,36 @@ msgid "What PHP version do you use?"
 msgstr "Quelle version de php utilisez vous ?"
 
 #: setup/setup_feedback.tpl:115
+msgid "GOsa version"
+msgstr "Version de GOsa"
+
+#: setup/setup_feedback.tpl:123
 msgid "LDAP"
 msgstr ""
 
-#: setup/setup_feedback.tpl:119
+#: setup/setup_feedback.tpl:127
 msgid "What kind of LDAP server(s) do you use?"
 msgstr "Quel type de serveur(s) ldap utilisez vous ?"
 
-#: setup/setup_feedback.tpl:125
+#: setup/setup_feedback.tpl:133
 msgid "How many objects are in your LDAP?"
 msgstr "Combien d'objet sont dans votre annuaire LDAP ?"
 
-#: setup/setup_feedback.tpl:132
+#: setup/setup_feedback.tpl:140
 msgid "Features"
 msgstr "Fonctionalités"
 
-#: setup/setup_feedback.tpl:135
+#: setup/setup_feedback.tpl:143
 msgid "What features of GOsa do you use?"
 msgstr "Quel fonctionnalités de GOsa utilisez vous ?"
 
-#: setup/setup_feedback.tpl:145
+#: setup/setup_feedback.tpl:153
 msgid "What features do you want to see in future versions of GOsa?"
 msgstr ""
 "Quelle fonctionnalités voulez vous voir dans les prochaines versions de "
 "GOsa ?"
 
-#: setup/setup_feedback.tpl:152
+#: setup/setup_feedback.tpl:160
 msgid "Send feedback"
 msgstr "Envoyer vos réponses"
 
@@ -5954,26 +5982,26 @@ msgstr ""
 "Cette boite de dialogue permet d'indiquer la configuration de base LDAP pour "
 "GOsa."
 
-#: setup/class_setupStep_Ldap.inc:105
+#: setup/class_setupStep_Ldap.inc:112
 #, php-format
 msgid "Anonymous bind to server '%s' failed!"
 msgstr "La connexion anonyme sur le serveur '%s' à échoué !"
 
-#: setup/class_setupStep_Ldap.inc:107
+#: setup/class_setupStep_Ldap.inc:114
 #, php-format
 msgid "Bind as user '%s' failed!"
 msgstr "la connexion comme l'utilisateur '%s' à échoué !"
 
-#: setup/class_setupStep_Ldap.inc:112
+#: setup/class_setupStep_Ldap.inc:119
 #, php-format
 msgid "Anonymous bind to server '%s' succeeded."
 msgstr "La connexion anonyme sur le serveur '%s' à réussi."
 
-#: setup/class_setupStep_Ldap.inc:113
+#: setup/class_setupStep_Ldap.inc:120
 msgid "Please specify user and password!"
 msgstr "Veuillez introduire un utilisateur et un mot de passe !"
 
-#: setup/class_setupStep_Ldap.inc:115
+#: setup/class_setupStep_Ldap.inc:122
 #, php-format
 msgid "Bind as user '%s' to server '%s' succeeded!"
 msgstr "La connexion comme l'utilisateur '%s' au serveur '%s' à réussi !"
@@ -6006,10 +6034,6 @@ msgstr "Authentification"
 msgid "Admin DN"
 msgstr "DN de l'administrateur"
 
-#: setup/setup_ldap.tpl:78
-msgid "Select user"
-msgstr "Sélectionner un utilisateur"
-
 #: setup/setup_ldap.tpl:86
 msgid "Automatically append LDAP base to admin DN"
 msgstr ""
@@ -6060,7 +6084,7 @@ msgid "Checking for invisible users"
 msgstr "Vérification des utilisateurs invisibles"
 
 #: setup/class_setupStep_Migrate.inc:165
-#: setup/class_setupStep_Migrate.inc:3210
+#: setup/class_setupStep_Migrate.inc:3211
 msgid "Checking for super administrator"
 msgstr "Vérification du superadministrateur"
 
@@ -6099,24 +6123,24 @@ msgstr "Vérifier pour les menu des applications ancienne mode"
 #: setup/class_setupStep_Migrate.inc:240 setup/class_setupStep_Migrate.inc:292
 #: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:421
 #: setup/class_setupStep_Migrate.inc:492 setup/class_setupStep_Migrate.inc:569
-#: setup/class_setupStep_Migrate.inc:654 setup/class_setupStep_Migrate.inc:795
-#: setup/class_setupStep_Migrate.inc:891
-#: setup/class_setupStep_Migrate.inc:2037
-#: setup/class_setupStep_Migrate.inc:2505
-#: setup/class_setupStep_Migrate.inc:2696
-#: setup/class_setupStep_Migrate.inc:2833
+#: setup/class_setupStep_Migrate.inc:653 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:892
+#: setup/class_setupStep_Migrate.inc:2038
+#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2697
+#: setup/class_setupStep_Migrate.inc:2834
 msgid "LDAP query failed"
 msgstr "La requête LDAP à échoué"
 
 #: setup/class_setupStep_Migrate.inc:241 setup/class_setupStep_Migrate.inc:293
 #: setup/class_setupStep_Migrate.inc:358 setup/class_setupStep_Migrate.inc:422
 #: setup/class_setupStep_Migrate.inc:493 setup/class_setupStep_Migrate.inc:570
-#: setup/class_setupStep_Migrate.inc:655 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:892
-#: setup/class_setupStep_Migrate.inc:2038
-#: setup/class_setupStep_Migrate.inc:2506
-#: setup/class_setupStep_Migrate.inc:2697
-#: setup/class_setupStep_Migrate.inc:2834
+#: setup/class_setupStep_Migrate.inc:654 setup/class_setupStep_Migrate.inc:797
+#: setup/class_setupStep_Migrate.inc:893
+#: setup/class_setupStep_Migrate.inc:2039
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2698
+#: setup/class_setupStep_Migrate.inc:2835
 msgid "Possibly the 'root object' is missing."
 msgstr "L'objet racine est probablement manquant."
 
@@ -6130,16 +6154,16 @@ msgstr "J'ai trouvé %s valeur dupliquées pour l'attribut 'uidNumber'."
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "J'ai trouvé %s valeur dupliquées pour l'attribut 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:584
-#: setup/class_setupStep_Migrate.inc:597
-#: setup/class_setupStep_Migrate.inc:1031
-#: setup/class_setupStep_Migrate.inc:1049
-#: setup/class_setupStep_Migrate.inc:1989
-#: setup/class_setupStep_Migrate.inc:2002
-#: setup/class_setupStep_Migrate.inc:2057
-#: setup/class_setupStep_Migrate.inc:2078
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:3212
+#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:596
+#: setup/class_setupStep_Migrate.inc:1032
+#: setup/class_setupStep_Migrate.inc:1050
+#: setup/class_setupStep_Migrate.inc:1990
+#: setup/class_setupStep_Migrate.inc:2003
+#: setup/class_setupStep_Migrate.inc:2058
+#: setup/class_setupStep_Migrate.inc:2079
+#: setup/class_setupStep_Migrate.inc:2131
+#: setup/class_setupStep_Migrate.inc:3213
 msgid "Failed"
 msgstr "Echec"
 
@@ -6148,8 +6172,8 @@ msgstr "Echec"
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
-"J'ai trouvé %s winstations en dehors du département winstation prédéfini '%"
-"s'."
+"J'ai trouvé %s winstations en dehors du département winstation prédéfini "
+"'%s'."
 
 #: setup/class_setupStep_Migrate.inc:448
 #, php-format
@@ -6165,134 +6189,134 @@ msgstr "Bouger"
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "J'ai trouvé %s utilsateur(s) en dehors de la branche configurée '%s'."
 
-#: setup/class_setupStep_Migrate.inc:586 setup/class_setupStep_Migrate.inc:599
+#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:598
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 "L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
 
-#: setup/class_setupStep_Migrate.inc:663
+#: setup/class_setupStep_Migrate.inc:662
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr "J'ai trouvé %s utilisateur(s) qui ne seront pas visibles dans GOsa."
 
-#: setup/class_setupStep_Migrate.inc:713 setup/class_setupStep_Migrate.inc:856
-#: setup/class_setupStep_Migrate.inc:1119
+#: setup/class_setupStep_Migrate.inc:712 setup/class_setupStep_Migrate.inc:857
+#: setup/class_setupStep_Migrate.inc:1120
 msgid "Migration error"
 msgstr "Erreur de migration"
 
-#: setup/class_setupStep_Migrate.inc:713 setup/class_setupStep_Migrate.inc:856
+#: setup/class_setupStep_Migrate.inc:712 setup/class_setupStep_Migrate.inc:857
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Impossible de migrer le département '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:804
+#: setup/class_setupStep_Migrate.inc:805
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr "J'ai trouvé %s département(s) qui ne seront pas visible dans GOsa."
 
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStep_Migrate.inc:1029
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Compte administratifs de GOsa 2.5 trouvés : %s"
 
-#: setup/class_setupStep_Migrate.inc:1033
+#: setup/class_setupStep_Migrate.inc:1034
 msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
 msgstr ""
 "Il n'y a pas d'administrateur GOsa 2.6 valide dans votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1050
+#: setup/class_setupStep_Migrate.inc:1051
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr "Il n'y a pas d'administrateur GOsa dans votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1119
+#: setup/class_setupStep_Migrate.inc:1120
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Impossible d'ajouter une ACL pour l'utilisateur '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:1157
-#: setup/class_setupStep_Migrate.inc:1167
+#: setup/class_setupStep_Migrate.inc:1158
+#: setup/class_setupStep_Migrate.inc:1168
 msgid "Input error"
 msgstr "Erreur d'entrée"
 
-#: setup/class_setupStep_Migrate.inc:1157
+#: setup/class_setupStep_Migrate.inc:1158
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1163
 msgid "Password error"
 msgstr "Erreur de mot de passe"
 
-#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1163
 msgid "Provided passwords do not match!"
 msgstr ""
 "Le mot de passe entré dans le champ nouveau et celui dans le champ "
 "vérification ne concordent pas !"
 
-#: setup/class_setupStep_Migrate.inc:1167
+#: setup/class_setupStep_Migrate.inc:1168
 msgid "Specify a valid user ID!"
 msgstr "Le nom d'utilisateur est incorrect !"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStep_Migrate.inc:1201
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 "L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
 
-#: setup/class_setupStep_Migrate.inc:1239
-#: setup/class_setupStep_Migrate.inc:1288
-#: setup/class_setupStep_Migrate.inc:1337
+#: setup/class_setupStep_Migrate.inc:1240
+#: setup/class_setupStep_Migrate.inc:1289
+#: setup/class_setupStep_Migrate.inc:1338
 msgid "Cannot move users to the requested department!"
 msgstr "Impossible de bouger les utilisateurs vers le département spécifié !"
 
-#: setup/class_setupStep_Migrate.inc:1249
+#: setup/class_setupStep_Migrate.inc:1250
 msgid "Winstation will be moved from"
 msgstr "Les stations windows seront bougées depuis"
 
-#: setup/class_setupStep_Migrate.inc:1260
-#: setup/class_setupStep_Migrate.inc:1309
+#: setup/class_setupStep_Migrate.inc:1261
+#: setup/class_setupStep_Migrate.inc:1310
 msgid "Updating following references too"
 msgstr "Mise à jour des références suivantes aussi"
 
-#: setup/class_setupStep_Migrate.inc:1299
+#: setup/class_setupStep_Migrate.inc:1300
 msgid "Group will be moved from"
 msgstr "Les groupes seront bougés depuis"
 
-#: setup/class_setupStep_Migrate.inc:1347
+#: setup/class_setupStep_Migrate.inc:1348
 msgid "User will be moved from"
 msgstr "Les utilisateurs seront bougés depuis"
 
-#: setup/class_setupStep_Migrate.inc:1357
+#: setup/class_setupStep_Migrate.inc:1358
 msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
-#: setup/class_setupStep_Migrate.inc:1990
+#: setup/class_setupStep_Migrate.inc:1991
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 "L'objet LDAP racine est manquant. Il est indispensable pour utiliser votre "
 "annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1991
-#: setup/class_setupStep_Migrate.inc:2004
+#: setup/class_setupStep_Migrate.inc:1992
+#: setup/class_setupStep_Migrate.inc:2005
 msgid "Try to create root object"
 msgstr "Essai de création de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:2003
+#: setup/class_setupStep_Migrate.inc:2004
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr "L'objet racine n'a pas pu être crée, vous devrez essayer vous même."
 
-#: setup/class_setupStep_Migrate.inc:2058
+#: setup/class_setupStep_Migrate.inc:2059
 #, php-format
 msgid "Missing GOsa object class '%s'!"
 msgstr "Object class '%s' de GOsa manquante !"
 
-#: setup/class_setupStep_Migrate.inc:2059
+#: setup/class_setupStep_Migrate.inc:2060
 msgid "Please check your installation."
 msgstr "Veuillez vérifier votre installation."
 
-#: setup/class_setupStep_Migrate.inc:2080
+#: setup/class_setupStep_Migrate.inc:2081
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -6301,33 +6325,33 @@ msgstr ""
 "Impossible de gérer l'objet structural de votre objet racine. S'il vous "
 "plaît essayer de ajouter la classe d'objet '%s' à la main."
 
-#: setup/class_setupStep_Migrate.inc:2439
+#: setup/class_setupStep_Migrate.inc:2440
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "La copie de '%s' vers '%s' à échoué :"
 
-#: setup/class_setupStep_Migrate.inc:2574
+#: setup/class_setupStep_Migrate.inc:2575
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "Il y a %s services qui ont besoin d'être migrés."
 
-#: setup/class_setupStep_Migrate.inc:2634
+#: setup/class_setupStep_Migrate.inc:2635
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "L'ajout de '%s' à l'annuaire LDAP à échoué: %s"
 
-#: setup/class_setupStep_Migrate.inc:2654
-#: setup/class_setupStep_Migrate.inc:2771
+#: setup/class_setupStep_Migrate.inc:2655
+#: setup/class_setupStep_Migrate.inc:2772
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "La mise à jour de '%s' à échoué : %s"
 
-#: setup/class_setupStep_Migrate.inc:2727
+#: setup/class_setupStep_Migrate.inc:2728
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Il y a %s services qui doivent être migrés."
 
-#: setup/class_setupStep_Migrate.inc:3058
+#: setup/class_setupStep_Migrate.inc:3059
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "Il y a %s menu d'applications qui doivent être migrés."
@@ -6703,41 +6727,7 @@ msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 msgid "Automatic"
 msgstr "Automatique"
 
-#~ msgid "Update"
-#~ msgstr "Mise à jour"
-
-#~ msgid "Show %s"
-#~ msgstr "Afficher %s"
-
-#~ msgid "people"
-#~ msgstr "utilisateurs"
-
-#~ msgid "Select users to add"
-#~ msgstr "Sélectionnez les utilisateurs à ajouter"
-
-#~ msgid "Select to see servers"
-#~ msgstr "Sélectionnez pour voir les serveurs"
-
-#~ msgid "Search within subtree"
-#~ msgstr "Chercher dans le sous arbre"
-
-#~ msgid "Display users of department"
-#~ msgstr "Afficher les utilisateurs du département"
-
-#~ msgid "Display users matching"
-#~ msgstr "Afficher les utilisateurs correspondants"
-
-#~ msgid "Regular expression for matching user names"
-#~ msgstr "Expression régulière concordant avec les noms des utilisateurs"
-
-#, fuzzy
-#~ msgid "List of systems"
-#~ msgstr "Liste des utilisateurs"
-
-#, fuzzy
-#~ msgid "givenname"
-#~ msgstr "Prénom"
-
-#, fuzzy
-#~ msgid "surename"
-#~ msgstr "Nom de famille"
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr ""
+#~ "Le programme externe pour changer votre mot de passe à renvoyé une "
+#~ "erreur: %s."