diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index bd7d0f24fe500dcc1860a2034bb8aad22ae4dac4..e8d7509ae7dd1154b667883b2ce886f08a3268d9 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "تحذير"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "خطأ"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "تحذير"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
-msgid "Move users into configured user tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
+msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "خطأ"
@@ -797,70 +758,70 @@ msgstr "خطأ"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,280 +1499,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "الرجوع"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1906,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2004,37 +1918,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2047,11 +1961,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2059,13 +1972,12 @@ msgstr "الإسم"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "الوصف"
@@ -2117,8 +2029,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2180,37 +2092,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2242,28 +2155,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2308,8 +2226,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2318,7 +2236,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2329,7 +2247,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2403,6 +2321,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2476,36 +2398,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2433,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2620,224 +2537,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "تلقائي"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2864,7 +2565,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2901,258 +2602,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "الإسم العائلي"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "الإسم الأول"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "العنوان"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "الهاتف"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "الهاتف المحمول"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "الفاكس"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "رقم المنزل"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "القسم"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "الرقم البريدي"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3260,36 +2981,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3301,31 +3032,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3379,530 +3110,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4001,9 +3645,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4192,7 +3835,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4212,8 +3855,7 @@ msgid "Information"
 msgstr "معلومات"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4237,163 +3879,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "مجموعة"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4443,10 +4077,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index a5d081da12aa0f87faf34db5c9da417a825c6e24..0f85a2dde847431a82e30d82adc8069112a2855f 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Llengua preferida"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Avís"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finalitza"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "D'acord"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Avís"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finalitza"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -797,70 +758,70 @@ msgstr "Error"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error de la configuració"
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Canceŀla-ho tot"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr "Entrada"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error d'autenticació."
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "El meu compte"
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
-#, php-format
-msgid "The required field %s is empty!"
-msgstr ""
-
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "Canceŀla"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplica"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Desa"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,31 +1499,31 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Edita…"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Edita %s…"
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Enrere"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Aquest compte no té extensions de %s vàlides!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1624,249 +1532,256 @@ msgstr ""
 "Aquest compte té paràmetres de %s habilitats. Podeu inhabilitar-los fent "
 "clic a sota."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "gener"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "febrer"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "març"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "abril"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "maig"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "juny"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "juliol"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "agost"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "setembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "octubre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "novembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "desembre"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "diumenge"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "dilluns"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "dimarts"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "dimecres"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "dijous"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "divendres"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "dissabte"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objecte"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1908,7 +1823,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2006,37 +1920,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2049,11 +1963,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2061,13 +1974,12 @@ msgstr "Nom"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2119,8 +2031,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2182,37 +2094,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2244,28 +2157,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2310,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2320,7 +2238,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2331,7 +2249,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2405,6 +2323,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2478,36 +2400,31 @@ msgstr "Especifiqueu la vostra contrasenya."
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "El compte és blocat. Contacteu el vostre administrador de sistemes."
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2521,44 +2438,44 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2625,224 +2542,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Directori personal"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Intèrpret d'ordres"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Compte"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2869,7 +2570,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2906,258 +2607,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informació personal"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Cognoms"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nom"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localització"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Província"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adreça"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Núm de sala"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de sala"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telèfon"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Buscapersones"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Pàgina principal"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Adreça postal personal"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telèfon privat"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Número de telèfon personal"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organització"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Núm de department"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número de departament"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Núm d'empleat"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número d'empleat"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Categoria professional"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Responsable"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "La contrasenya nova i l'actual són massa similars."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "La contrasenya nova és massa curta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3265,36 +2986,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3306,31 +3037,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3384,530 +3115,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
-msgstr "Paràmetres de la contrasenya"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
+msgstr "Paràmetres de la contrasenya"
+
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4006,9 +3650,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4197,7 +3840,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4217,8 +3860,7 @@ msgid "Information"
 msgstr "Informació"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4242,163 +3884,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4448,10 +4082,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index f277277a6bd4af6d39fddf856e6d1f4c2db9a01d..91b35f503e2af02403172bab783d7651c2bdf91b 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -18,20 +18,20 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "upřednostňovaný jazyk"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "nastavení jazyka"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "V tomto kroku vyberete Vámi upřednostňovaný jazyk."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
@@ -41,56 +41,251 @@ msgstr ""
 "samočinně použije jazyk požadovaný přistupujícím webovým prohlížečem. Toto "
 "nastavení může být přebito."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "automaticky"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "název místa"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+"Název tohoto připojení, který bude zobrazován v seznamu serverů v LDAP"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "připojovací URI (adresa)"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+"URI adresa, na které kontaktovat LDAP server. Obvykle začíná na ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "připojení pomocí TLS (šifrované)"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr "Šifrovat komunikaci s LDAP serverem (pomocí TLS)?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "základ"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "Základ LDAP adresáře"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "ověření"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"Rozlišený název účtu správce, použitého pro spojování do LDAP. Základ je "
+"připojen samočinně."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN (rozlišené jméno) účtu správce"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "heslo účtu správce"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr "Heslo k účtu správce, použitého pro spojování do LDAP"
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "stav"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "současný stav"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr "Výsledek posledního pokusu kontroly LDAP spojení a základních schémat"
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "nastavení LDAPu"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "nastavení připojení k LDAPu"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"V tomto dialogu budou provedena základní nastavení pro komunikaci "
+"FusionDirectory s LDAPem."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonymní přihlášení k serveru '%s' se nezdařilo!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Přihlášení jako uživatel '%s' se nezdařilo!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "znovu"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Anonymní přihlášení k serveru '%s' proběhlo úspěšně."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "obnovit"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Zadejte prosím uživatelské jména a heslo!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Přihlášení se jako uživatel '%s' k serveru '%s' proběhlo úspěšně!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "varování"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "chyba instalátoru"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "hotovo"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "následující"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "vítejte"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "dokončit"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "dokončení – zapsání nastavení do souboru"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "zapsání nastavení do souboru"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Váš soubor s konfigurací je v tuto chvíli čitelný úplně pro všechny. Upravte"
+" nastavení oprávnění pro přístup k němu."
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Soubor s nastaveními není v tuto chvíli čitelný, nebo zcela chybí."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Po stažení a umístění souboru do %s se prosím ujistěte, že %s je oprávněn "
+"číst pouze uživatelský účet, pod kterým běží webový server a nikdo jiný."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "kontroly PHP a jeho rozšiřujících modulů"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr "Nastavení PHP (<a href=\"?info\" target=\"_blank\">zobrazit informace)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "kontrola instalace"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 "základní kontrola toho, zda je PHP a jeho rozšířující moduly ve vyhovujících"
 " verzích"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "kontroluji verzi PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP musí být ve verzi %s a vyšší"
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Aktualizujte prosím na verzi, která je podporována."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr "FusionDirectory potřebuje tento modul pro komunikaci s LDAP serverem."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory potřebuje tento modul pro přizpůsobení uživatelského "
 "rozhraní místním odlišnostem (formát data a času, měrné jednotky, atp.)."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -98,22 +293,22 @@ msgstr ""
 "FusionDirectory potřebuje tento modul pro komunikaci různými protokoly s "
 "různými typy serverů."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory potřebuje tento modul pro začlenění Samby."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -121,37 +316,37 @@ msgstr ""
 "Aby bylo možné ve FusionDirectory využívat SSHA šifrování, musí být "
 "nainstalován jeden z těchto modulů: 'mhash', nebo 'sha1'."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr "FusionDirectory potřebuje tento modul pro komunikaci s IMAP serverem."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 "FusionDirectory potřebuje tento modul pro práci se znaky v univerzálním "
 "kódování (unicode)."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "ImageMagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory jej potřebuje pro práci s obrázky."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "kompresní modul"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory toto rozšíření potřebuje pro práci se snímky."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -161,19 +356,19 @@ msgstr ""
 "proměnných, které jsou tak dostupné ze skriptů aniž by bylo třeba měnit "
 "jejich rozsah. Jenže to může rizikové z hlediska zabezpečení."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Vyhledejte ve svém php.ini parametr 'register_globals' a nastavte jej na "
 "'off'. "
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP tuto hodnotu používá pro „úklid“ (garbage collector) při odstraňování "
 "starých relací."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -181,7 +376,7 @@ msgstr ""
 "Nastavení této hodnoty na jeden den zabrání ztrátě relace a cookies dříve, "
 "než skutečně vyprší nastavený časový limit."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -189,12 +384,12 @@ msgstr ""
 "Vyhledejte ve svém php.ini parametr 'session.gc_maxlifetime' a nastavte jej "
 "na hodnotu '86400' a vyšší."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "vypnuto"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -202,13 +397,13 @@ msgstr ""
 "Abyste se vyhnuli potížím při používání FusionDirectory, vyhledejte ve svém "
 "php.ini parametr session.auto_start a nastavte jej na hodnotu off ."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Vyhledejte ve svém php.ini parametr 'session.auto_start' a nastavte jej na "
 "'off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -218,14 +413,14 @@ msgstr ""
 "nevyzpytatelné chyby! Pro rozsáhlá nasazení je třeba tuto hodnotu ještě dále"
 " navýšit."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "V souboru s nastaveními php.ini na svém serveru vyhledejte volbu "
 "memory_limit a nastavte ji na hodnotu 128M a vyšší."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -233,17 +428,17 @@ msgstr ""
 "Tato volba ovlivňuje to, jak PHP zachází s výstupem. Pro zvýšení výkonu "
 "nastavte na 'vypnuto'."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 "Vyhledejte ve svém php.ini parametr 'implicit_flush' a nastavte jej na "
 "'off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "PHP skripty by měly dostat čas alespoň 30 vteřin na to, aby proběhly."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -251,7 +446,7 @@ msgstr ""
 "Vyhledejte ve svém php.ini parametr 'max_execution_time' a nastavte jej na "
 "hodnotu '30' a vyšší."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -259,18 +454,18 @@ msgstr ""
 "Pro zlepšení zabezpečení nastavte PHP tak, aby neposkytovalo jakékoli "
 "informace o serveru, na kterém běží."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 "Vyhledejte ve svém php.ini parametr 'expose_php' a nastavte jej na 'off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Výkonnost Vašeho serveru můžete zlepšit nastavením parametru "
 "'magic_quotes_gpc' na 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -278,41 +473,28 @@ msgstr ""
 "Vyhledejte ve svém php.ini parametr 'zend.ze1_compatibility_mode' a nastavte"
 " jej na 'off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "vítejte"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "vítejte v průvodci nastavením FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "uvítací zpráva"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "v pořádku"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "migrovat"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "kontrola LDAPu"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "prozkoumání Vášeho LDAPu, zda je slučitelný s FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Udělit veškerá práva na uživatelích v dané větvi"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
@@ -320,93 +502,86 @@ msgstr ""
 "Umožnit uživatelům upravovat své vlastní údaje (panely Hlavní a Posix "
 "použijte jen na základu)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 "Umožnit uživatelům upravovat jejich vlastní hesla (použijte pouze na "
 "základu)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "kontrolují se třídy objektů v kořenovém objektu"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "kontrolují se oprávnění na LDAP databázi"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "kontroluje se, zda neexistují „neviditelní“ uživatelé"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "kontroluji, zda již existuje účet správce FusionDirectory/GOsa"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Kontrola výchozích ACL úloh a skupin"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "kontroluje se, zda neexistují účty uživatelů mimo příslušný podstrom"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "kontroluje se, zda neexistují účty skupin mimo příslušný podstrom"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "kontroluje se, zda neexistují „neviditelná“ oddělení"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 "kontroluje se, zda neexistují duplicity v číselných identifikátorech "
 "uživatelů (UID)"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "dotaz do LDAPu byl neúspěšný"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr "Možná chybí kořenový objekt."
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "selhalo"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Chybí chybí třída objektů '%s' FusionDirectory!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Zkontrolujte prosím Vaši instalaci."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -415,47 +590,31 @@ msgstr ""
 "Nedaří se manipulace s typem struktury kořenového objektu. Prosím pokuste se"
 " přidat třídu objektů '%s' ručním zásahem."
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "chyba LDAPu"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr "Zvolený uživatel %s nemá plný přístup do LDAP databáze."
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr "Zvolený uživatel %s nemá plný přístup do LDAP databáze."
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "varování"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -464,329 +623,132 @@ msgstr ""
 "Nalezeno %s uživatelů, kteří nebudou dostupní z FusionDirectory nebo jsou "
 "jejich účty neúplné."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Přemístění uživatele"
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "chyba během migrace"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Položku %s nelze přemístit:"
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Nalezeny správcovské účty z F.D. 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Nalezeny správcovské skupiny z F.D. 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-"Na konci nastavení je možné spustit <i>fusiondirectory-setup --migrate-"
-"acls</i> a přemístit ho.<br/>"
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-"Ve vaší LDAP databázi se nenachází žádný použitelný účet správce "
-"FusionDirectory 1.0.8."
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "vytvořit"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "uživatelé"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "skupiny"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "role"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Ve Vašem LDAPu neexistuje účet správce FusionDirectory/GOsa."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "vytvořit"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Uděluje veškerá práva na veškerých objektech"
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "Výchozí ACL úlohy nebyly vloženy"
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Chybí některé výchozí ACL úlohy"
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "Výchozí ACL úlohy byly vloženy"
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Nelze přidat ACL úlohu %s:"
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "Nalezeno %s uživatelů, nacházejících se mimo nastavený strom %s."
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "přesunout uživatele do příslušného stromu"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr "Položky nelze přesunout do požadovaného oddělení!"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "Položka bude přesunuta z"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "do"
 
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr "tyto odkazy budou aktualizovány"
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-"Bylo nalezeno %s účtů skupin, nacházejících se mimo příslušný strom '%s'."
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr "Přesunout skupiny do příslušného stromu"
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr "Bylo nalezeno %s oddělení, která nebudou viditelná z FusionDirectory."
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr "Přemístění oddělení"
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "název místa"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-"Název tohoto připojení, který bude zobrazován v seznamu serverů v LDAP"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "připojovací URI (adresa)"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-"URI adresa, na které kontaktovat LDAP server. Obvykle začíná na ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "připojení pomocí TLS (šifrované)"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "Šifrovat komunikaci s LDAP serverem (pomocí TLS)?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "základ"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "Základ LDAP adresáře"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "ověření"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-"Rozlišený název účtu správce, použitého pro spojování do LDAP. Základ je "
-"připojen samočinně."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN (rozlišené jméno) účtu správce"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "heslo účtu správce"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr "Heslo k účtu správce, použitého pro spojování do LDAP"
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "stav"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "současný stav"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr "Výsledek posledního pokusu kontroly LDAP spojení a základních schémat"
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "nastavení LDAPu"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "nastavení připojení k LDAPu"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"V tomto dialogu budou provedena základní nastavení pro komunikaci "
-"FusionDirectory s LDAPem."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonymní přihlášení k serveru '%s' se nezdařilo!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Přihlášení jako uživatel '%s' se nezdařilo!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "znovu"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Anonymní přihlášení k serveru '%s' proběhlo úspěšně."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "obnovit"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Zadejte prosím uživatelské jména a heslo!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Přihlášení se jako uživatel '%s' k serveru '%s' proběhlo úspěšně!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "dokončit"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "dokončení – zapsání nastavení do souboru"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "zapsání nastavení do souboru"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
+msgstr "tyto odkazy budou aktualizovány"
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
-"Váš soubor s konfigurací je v tuto chvíli čitelný úplně pro všechny. Upravte"
-" nastavení oprávnění pro přístup k němu."
+"Bylo nalezeno %s účtů skupin, nacházejících se mimo příslušný strom '%s'."
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Soubor s nastaveními není v tuto chvíli čitelný, nebo zcela chybí."
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
+msgstr "Přesunout skupiny do příslušného stromu"
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
+msgstr "Bylo nalezeno %s oddělení, která nebudou viditelná z FusionDirectory."
+
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
+msgstr "Přemístění oddělení"
+
+#: setup/class_setupStepMigrate.inc:1298
+#, php-format
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
-"Po stažení a umístění souboru do %s se prosím ujistěte, že %s je oprávněn "
-"číst pouze uživatelský účet, pod kterým běží webový server a nikdo jiný."
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "chyba instalátoru"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "hotovo"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "vítejte v průvodci nastavením FusionDirectory"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "následující"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "uvítací zpráva"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -807,17 +769,17 @@ msgid "Specified objectType is empty or invalid!"
 msgstr ""
 "Jako objectType (typ objektu) buď nebylo zadáno nic, nebo nesprávná hodnota."
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "kořen"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "odeslat"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "nahoru"
 
@@ -844,24 +806,19 @@ msgstr "vybrat vše"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "chyba"
@@ -870,70 +827,70 @@ msgstr "chyba"
 msgid "created by"
 msgstr "vytvořeno (kým)"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "přejít do kořene všech oddělení"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "přejít o jedno oddělení výše"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr "Přejít do oddělení uživatele"
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "domovské"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "znovunačtení seznamu"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "akce"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "zkopírovat"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "vyjmout"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "vložit"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "vyjmout tuto položku"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "kopírovat tuto položku"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "obnovit ze snímků"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "exportovat seznam"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "obnovit ze snímku"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "vytvořit snímek"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "vytvořit nový snímek tohoto objektu"
 
@@ -953,9 +910,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "chyba v nastavení"
@@ -983,27 +940,27 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Požadovaný kanál neexistuje! Prosím kontaktujte svého správce systémů."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "oprávnění"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "zrušit vše"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "nemohu vložit"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -1011,8 +968,10 @@ msgstr "uživatelské jméno"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "šablona"
 
@@ -1040,7 +999,7 @@ msgstr ""
 "spuštěním '%s' --update-cache (na serveru) a restartujte svůj webový "
 "prohlížeč"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1048,12 +1007,12 @@ msgstr ""
 msgid "Fatal error"
 msgstr "fatální chyba"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATÁLNÍ: chyba při připojování do LDAPu. Server ohlásil '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -1061,11 +1020,11 @@ msgstr ""
 "Přihlašovací údaj (uid) není v rámci LDAP stromu jedinečný! Kontaktujte "
 "svého správce systémů."
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "chyba ověření"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -1073,12 +1032,12 @@ msgstr ""
 "Zdá se, že platnost vašeho hesla skončila. Změňte jej pomocí funkce <a "
 "href=\"recovery.php\">obnovení hesla</a>."
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Nastala chyba při pokusu o přidání zámku. Nahlaste to prosím vývojářům!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1087,12 +1046,12 @@ msgstr ""
 "Nemohu vytvořit informaci o zamykání ve stromu LDAPu. Kontaktujte prosím "
 "svého správce systémů!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server odpověděl: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1100,12 +1059,12 @@ msgstr ""
 "Při pokusu o vyhrazení přístupu k objektu bylo nalezeno několik již "
 "existujících zámků. To by se nemělo stávat – probíhá jejich odstraňování."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit velikosti položek %d je překročen!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1114,85 +1073,77 @@ msgstr ""
 "nastavit novou hodnotu limitu %s a v případě, že ani to nebude stačit, "
 "zobrazit toto hlášení znovu"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "nastavit"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "neúplné"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "přesto pokračovat"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "přesto upravit"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "chystáte se upravit položky LDAPu %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "položek na stránku"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "použít filtr"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1201,64 +1152,60 @@ msgstr ""
 "Soubor %s nebylo možné smazat. Zkuste opravit přístupová práva spuštěním "
 "příkazu fusiondirectory-setup --check-directories"
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Nelze zapsat do souboru s revizemi!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "nextIdHook není k dispozici. Bude použit výchozí základ!"
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "varování LDAPu"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Nedaří se získat informace o schématech ze serveru. Schémata proto nelze "
 "ověřit!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "dostupné třídy"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -1266,7 +1213,7 @@ msgstr ""
 "Zásuvný modul smíšených skupin je nainstalován, ale vaše nastavení schématu "
 "ho nepodporuje."
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
@@ -1274,7 +1221,7 @@ msgstr ""
 "Aby bylo možné použít smíšené skupiny v objectClass posixGroup, je třeba aby"
 " byly POMOCNÉ"
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -1282,54 +1229,17 @@ msgstr ""
 "Stávající schéma je nastaveno pro smíšené skupiny, ale není přítomen "
 "příslušný zásuvný modul."
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "Je třeba, aby ObjectClass posixGroup bylo STRUKTURÁLNÍ"
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Není k dispozici volné ID:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "Identifikátor sambaUnixIdPool není jedinečný!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "Není k dispozici ID!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "překročen maximální počet neúspěšných pokusů!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Není k dispozici volné ID – není co přidělit!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Nemohu nalézt soubor '%s' – opravte to prosím spuštěním '%s' (na serveru)."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "všechny objekty v této kategorii"
 
@@ -1342,50 +1252,46 @@ msgstr "Opravte prosím výše zmíněnou chybu a znovunačtěte stránku."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Nastavení časové zóny %s ve vašem nastavení není platné."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Chybné XML ve fusiondirectory.conf: %s na řádku %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Nedaří se přihlášení do LDAPu. Kontaktujte prosím správce systémů."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"Pořizování snímků je sice povolené, ale není nastavena potřebná proměnná "
-"'%s'."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"Pořizování snímků je sice povolené, ale chybí modul pro jejich kompresi. "
-"Nainstalujte prosím '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "všechny kategorie"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "můj účet"
 
@@ -1408,7 +1314,7 @@ msgstr "Vyberte pro vypsání objektů, které mají zapnuto '%s'."
 msgid "Select to search within subtrees"
 msgstr "zvolte pro vyhledávání i v podstromech"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "hledat v podstromech"
 
@@ -1618,52 +1524,46 @@ msgstr "'%s' musí být %d a větší!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' závisí na '%s' – zadejte prosím obě hodnoty!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
-#, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "V systému již existuje položka s atributem '%s'!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
-msgstr ""
+msgid "The entry '%s' already use this '%s' attribute!"
+msgstr "Položka %s již používá tento %s atribut!"
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "Pole '%s' nemůže být prázdné!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr "Ukázka:"
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Políčko %s obsahuje neplatné znaky"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' není dovoleno:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' nejsou dovolené!"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Chybějící rozšíření PHP %s!"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1671,27 +1571,27 @@ msgstr "Chybějící rozšíření PHP %s!"
 msgid "Cancel"
 msgstr "zrušit"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "použít"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "uložit"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "přidat"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "přidat %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1699,31 +1599,31 @@ msgstr "přidat %s"
 msgid "Delete"
 msgstr "smazat"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "smazat %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "upravit…"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "upravit %s…"
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "zpět"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Tento účet nemá platná rozšíření %s!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1731,7 +1631,7 @@ msgid ""
 msgstr ""
 "Tento účet má povolena nastavení %s. Zakázat je můžete kliknutím níže."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1740,7 +1640,7 @@ msgstr ""
 "Tento účet má vytvořena nastavení pro %s. Pokud je chcete odebrat, musíte "
 "ale nejprve odebrat nastavení pro %s!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1749,7 +1649,7 @@ msgstr ""
 "Tento účet má deaktivována nastavení pro %s. Zapnout je můžete kliknutím "
 "níže."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1758,184 +1658,191 @@ msgstr ""
 "Tento účet má deaktivována nastavení pro %s. Zapnout je ale můžete teprve "
 "poté, co přidáte nastavení pro %s!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "přidat nastavení pro %s"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "odebrat nastavení pro %s"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "leden"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "únor"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "březen"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "duben"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "květen"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "červen"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "červenec"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "srpen"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "září"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "říjen"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "listopad"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "prosinec"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "neděle"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "pondělí"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "úterý"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "středa"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "čtvrtek"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "pátek"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "sobota"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "operace čtení"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "operace přidání"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "operace upravování"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "operace smazání"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "operace hledání"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "ověření"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s selhalo!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "Operace v LDAPu selhala!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "objekt"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Nahrání selhalo!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Nahrání selhalo: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Selhání komunikace se službou infrastruktury!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Selhání komunikace se službou infrastruktury: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "toto '%s' je stále používáno objektem: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Toto '%s' je stále používáno."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "toto '%s' je stále používáno následujícími objekty: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Soubor '%s' neexistuje!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Soubor '%s' nelze číst!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Do souboru '%s' nelze zapisovat!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1944,37 +1851,37 @@ msgstr ""
 "Hodnota '%s' v tuto chvíli buď není nastavena, nebo je neplatná – "
 "překontrolujte prosím Váš soubor s nastaveními!"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Soubor '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Složku '%s' nelze vytvořit!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Složku '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "kontroluji, zda je podporováno: %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Nainstalovat a aktivovat modul PHP %s."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Nainstalovat a zapnout Pear modul %s"
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1983,7 +1890,7 @@ msgstr ""
 "Nelze připravit třídu '%s'! Možná ve Vaší instalaci FusionDirectory chybí "
 "příslušný zásuvný modul?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -2027,7 +1934,6 @@ msgid "Restoring snapshots"
 msgstr "Obnovení zachycených stavů"
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Zachycené stavy"
 
@@ -2127,37 +2033,37 @@ msgstr "při operaci na LDAP serveru '%s'"
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open se nezdařilo vykonat ldapsearch"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2170,11 +2076,10 @@ msgstr "vyberte prosím požadované položky"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2182,13 +2087,12 @@ msgstr "název"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "popis"
@@ -2240,8 +2144,8 @@ msgstr "upravit"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2303,37 +2207,38 @@ msgstr "dny"
 msgid "From template"
 msgstr "Ze šablony"
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr "%s šablona"
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Zobrazit %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "chyba filtru"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Tento filtr je neúplný!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "chyba oprávnění"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Nejste oprávněn(a) vytvořit snímek %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Nejste oprávněn(a) obnovit ze snímku %s."
@@ -2368,28 +2273,33 @@ msgstr ""
 "Nedaří se spočítat dn: nedaří se nalézt objectType informace z panelu třídy "
 "%s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Položka s takovým rozlišeným názvem již existuje: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Položka %s neexistuje"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Panel %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2434,8 +2344,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bajtů)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "nahrát"
 
@@ -2444,7 +2354,7 @@ msgstr "nahrát"
 msgid "Download"
 msgstr "stažení"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2455,7 +2365,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Neplatná hodnota pro %s"
@@ -2531,6 +2441,10 @@ msgstr "Neznámá položka '%s'!"
 msgid "All users"
 msgstr "všichni uživatelé"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "použít filtr"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2609,36 +2523,31 @@ msgstr "Zadejte prosím své heslo!"
 msgid "Please check the username/password combination."
 msgstr "Zkontrolujte prosím správnost zadaného uživatelského jména a hesla."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Účet je uzamčen. Prosím kontaktujte svého správce systémů."
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2651,46 +2560,46 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "e-mailová adresa"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Účet s uživatelským jménem %s nebyl nalezen"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Bylo nalezeno hned několik účtů s uživatelským jménem %s"
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Nastal problém s poštovním serverem – obraťte se prosím na svého správce "
 "systémů."
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "tato poukázka (token) je neplatná"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Vyskytl se problém s poštovním serverem, potvrzovací e-mail proto nebyl "
@@ -2765,237 +2674,8 @@ msgstr "Vítejte, %s!"
 msgid "References"
 msgstr "odkazy"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "upravit POSIXová nastavení uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "domovský adresář"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "Umístění domovské složky tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr "Který shell by měl být použit, když se uživatel přihlásí"
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "nenastavené"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "hlavní skupina"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Hlavní skupina tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Stav tohoto unixového uživatelského účtu"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr "Vynutit konkrétní identifikátor uživatele/skupiny"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-"Pro tohoto uživatele vynutit konkrétní identifikátory uživatele a jeho "
-"hlavní skupiny"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr "Identifikátor uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr "Hodnota identifikátoru účtu tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr "Idenifikátor skupiny"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr "Hodnota identifikátoru hlavní skupiny tohoto uživatele"
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "členství ve skupinách"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "účet"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "Uživatel musí při prvním přihlášení změnit heslo."
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-"Při prvním přihlášení musí uživatel změnit heslo (vyžaduje nastavenou "
-"hodnotu u Prodleva před vynucením změny hesla)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Prodleva před vynucením změny hesla (dny)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"Po tomto počtu dnů bude uživatel přiměn ke změně hesla (nevyplnění funkce "
-"vypíná)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Datum skončení platnosti hesla"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Datum po kterém skončí platnost hesla uživatele (nevyplnění tuto funkci "
-"vypíná)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Délka nečinnosti uživatele, po které bude účet uživatele vypnut (dny)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Po skončení platnosti hesla, jak dlouho nanejvýš může být účet nepoužíván, "
-"než dojde k jeho vypnutí (zůstane ovšem zachován). Nevyplnění tuto funkci "
-"vypíná"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Prodleva varování uživatele před skončením platnosti hesla (dny)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"Uživatel bude varován nastavený počet dnů předem před skončením platnosti "
-"hesla (nevyplnění tuto funkci vypíná)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "důvěryhodnost systémů"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "režim důvěryhodnosti"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Typ ověřování pro tyto stroje"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "zakázáno"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "plný přístup"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "povolit přístup k těmto strojům"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Tomuto uživateli povolit připojení pouze na počítače z tohoto seznamu"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automatické"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "platnost skončila"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "běží čas odkladu"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "aktivní"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "platnost hesla skončila"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "heslo nelze změnit"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr "Skupina uživatele %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Skupiny a role"
 
@@ -3022,7 +2702,7 @@ msgid "Password hash method to use"
 msgstr "Metoda otisku hesla"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -3059,164 +2739,168 @@ msgstr "Informace o uživatelském účtu"
 msgid "User account"
 msgstr "Uživatelský účet"
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "osobní informace"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "příjmení"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Příjmení uživatele"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "jméno"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Křestní jméno uživatele"
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Stručný popis uživatele"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Fotografie"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Obrázek pro tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Organizační kontaktní údaje"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "umístění"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "stát"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "adresa"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Firemní poštovní adresa"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "označení místnosti"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "označení místnosti"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "telefon"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Služební telefoní číslo"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "mobilní telefon"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Číslo služebního mobilního telefonu"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "pager"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Číslo na pracovní pager"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Číslo služebního faxu"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "osobní webové stránky"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Osobní webové stránky"
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Informace o účtu"
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Přihlašovací jméno tohoto uživatele"
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Uživatelovo heslo"
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Osobní kontaktní údaje"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "zobrazované jméno"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 "Jméno, pod kterým má být tento uživatel zobrazován. Používáno MS Exchange."
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Adresa bydliště"
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "soukromá poštovní adresa"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "soukromý telefon"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "telefonní číslo domů"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "organizační informace"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titul"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3224,97 +2908,113 @@ msgstr ""
 "Titul osoby v kontextu organizace. Každý z titulů je hodnota tohoto "
 "vícehodnotového atributu"
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "organizace"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "oddělení"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "číslo oddělení"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "číslo oddělení"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "číslo zaměstnance"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "číslo zaměstnance"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "typ zaměstnaneckého poměru"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "nadřízený"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Poštovní směrovací číslo (PSČ)"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Ppolicy %s nebyla nalezena v LDAP!"
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Nejste oprávněni ke změně svého hesla"
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 "Je třeba, abyste počkali %d sekund než budete moci znovu měnit své heslo"
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Toto heslo už bylo nedávno použito"
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "Bylo zadáno naprosto stejné heslo, jako je to stávající"
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Pro pokračování je třeba zadat své stávající heslo."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr "Zadání v kolonkách Nové heslo a Zopakování nového hesla se neshodují."
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "nové heslo"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Nové a staré heslo jsou si příliš podobné."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Nové heslo nelze použít – je příliš krátké (není bezpečné)."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejí "
@@ -3428,29 +3128,39 @@ msgstr ""
 "Uživatelé budou moci pro obnovení svých hesel použít jednu ze svých "
 "alternativních adres"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "atribut použitý pro přihlašování"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "První e-mail"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "předmět"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Předmět prvního e-mailu"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] odkaz pro obnovu hesla"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr "Tělo zprávy (první %s je přihlašovací jméno, druhé je odkaz)"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3459,7 +3169,7 @@ msgstr ""
 "Obsah první e-mailové zprávy, poslané uživateli, když požádá o nové heslo. "
 "Pro přihlašovací jméno a obnovovací odkaz použijte %s."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3471,24 +3181,24 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Druhý e-mail"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Předmět druhého e-mailu"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] obnova ztraceného hesla proběhla úspěšně"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Tělo zprávy (%s je přihlašovací jméno)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3497,7 +3207,7 @@ msgstr ""
 "Obsah druhé e-mailové zprávy, poslané pro potvrzení toho, že heslo bylo "
 "změněno. Na místě přihlašovacího jména uživatele použijte %s – bude dosazeno"
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3557,59 +3267,106 @@ msgstr "časová zóna"
 msgid "Timezone to be used"
 msgstr "Časová zóna, která má být použita"
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Nastavení schématu"
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr "Základní nastavení"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Nejvyšší umožněná velikost LDAP"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Určuje počet položek, které budou ve výchozím nastavení získávány z LDAP."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Upravit zamykání"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Kontrolovat, zda aktuálně upravovaná položka nebyla mezitím změněna mimo "
+"FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Zapnout protokolování"
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Protokolování událostí na straně FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr "Ověření schématu"
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr "Zapíná kontrolu schématu při přihlašování."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "zapnout pořizování snímků aktuálního stavu"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr "Toto umožňuje uložit určité stavy položek a později je zase obnovit."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "podstrom pro uložení snímků"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "Základ, ve kterém by měly být zachycené stavy ukládány v LDAP."
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "nastavení hesel"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Výchozí otisk hesla"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Výchozí otisk, který bude použit"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Vynutit výchozí otisk"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Vynutit použití výchozího otisku hesla"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "minimální délka hesla"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Minimální délka hesel uživatelů"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "O kolik je třeba, aby se hesla lišila"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Nejnižší umožněný počet rozdílných znaků oproti předchozímu heslu"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "omezovat platnost uživatelský účtů na základě platnosti jejich hesel"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -3617,82 +3374,33 @@ msgstr ""
 "Zapíná test stínového atributy během přihlašování k FusionDirectory a "
 "vynucuje obnovu hesla nebo uzamčení účtu"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "SASL oblast"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Atribut, který ukládat v atributu userPassword"
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Základní nastavení"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "ve výpisech zobrazovat souhrny"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Určuje, zda bude na konci seznamů zobrazována stavová lišta, ve které bude "
-"uveden krátký souhrn typu a počtu prvků na seznamu."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Upravit zamykání"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Kontrolovat, zda aktuálně upravovaná položka nebyla mezitím změněna mimo "
-"FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Zapnout protokolování"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Protokolování událostí na straně FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Nejvyšší umožněná velikost LDAP"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr ""
-"Určuje počet položek, které budou ve výchozím nastavení získávány z LDAP."
-
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "přihlašování a relace"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "atribut použitý pro přihlašování"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Který LDAP atribut by měl být použit jako přihlašovací jméno při "
 "přihlašování."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "vynucovat šifrované spojení"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3700,303 +3408,208 @@ msgstr ""
 "Zapnout kontroly zabezpečení PHP z důvodu vynucení šifrovaného přístupu "
 "(https) na webové rozhraní."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "varovat, pokud relace není šifrována"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr "zobrazí uživateli varování, když použije protokol http namísto https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Doba nečinnosti, po jejímž uplynutí bude relace automaticky ukončena."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "zapnout pořizování snímků aktuálního stavu"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr "Toto umožňuje uložit určité stavy položek a později je zase obnovit."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "podstrom pro uložení snímků"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "Základ, ve kterém by měly být zachycené stavy ukládány v LDAP."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Umístění klíče"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 "Umístění soukromé části klíče FusionDirectory. V tuto chvíli není používáno."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Umístění certifikátu"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr "Umístění certifikátu FusionDirectory. V tuto chvíli není používáno."
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Umístění certifikátu cert. autority"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Umístění certifikátu cert. autority. Slouží k ověření stroje s Argonaut "
 "serverem."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "Ústřední ověřovací služba (CAS)"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Zapnout CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr "Bude použito CAS namísto LDAP přihlášení"
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr "Umístění certifikátu cert. autority na CAS serveru"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "stroj"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr "Stroj, na kterém je provozován CAS server"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr "Port na kterém CAS server očekává spojení"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr "Kontext CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr "Kontext CAS, který použít"
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "umístění účtů uživatelů a skupin"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "atribut účtu uživatele použitý jako DN"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Atribut, který bude použit na začátku rozlišených jmen uživatelů"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Vzor CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr "Vzor který použít pro vytváření kolonky běžný název"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Přísná pravidla pro pojmenovávání"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Zapíná přísnou kontrolu uživatelských jmen a názvů skupin"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr "Nejnižší identifikátor skupiny/uživatele"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-"Nejnižší umožněný přiřaditelný identifikátor uživatele či skupiny pro "
-"vyloučení bezpečnostních průniků s účty s identifikátorem 0 (root)."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Háček příštího identifikátoru"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-"Skript, který má být volán pro nalezení dalšího volného identifikátoru pro "
-"uživatele nebo skupiny."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Od jakého čísla začít přidělovat identifikátory uživatelů"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Kde začít s hledáním volných identifikátorů pro nové uživatele."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Od jakého čísla začít přidělovat identifikátory skupin"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Kde začít s hledáním volných identifikátorů pro nové skupiny."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Relativní rozlišený název uživatelů"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Větev, ve které jsou uloženi uživatelé."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Relativní rozlišený název skupin"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Větev, ve které jsou uloženy skupiny."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Relativní rozlišený název ACL úlohy"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Větev, ve které jsou uloženy ACL úlohy."
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Metoda přiřazování identifikátorů"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Způsob přiřazování identifikátorů uživatelů/skupin"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradiční"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Rozsah unixových identifikátorů pro Samba"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Nejnižší identifikátor uživatele"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
-"Nejnižší umožněná hodnota pro identifikátor uživatele při použití způsobu "
-"rozsahu"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Nejvyšší identifikátor uživatele"
 
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
-"Nejvyšší umožněná hodnota pro identifikátor uživatele při použití způsobu "
-"rozsahu"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Nejnižší identifikátor skupiny"
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
-"Nejnižší umožněná hodnota pro identifikátor skupiny při použití způsobu "
-"rozsahu"
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
-msgstr "Nejvyšší identifikátor skupiny"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
-"Nejvyšší umožněná hodnota pro identifikátor skupiny při použití způsobu "
-"rozsahu"
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "diagnostika"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Zobrazit chyby"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -4004,11 +3617,11 @@ msgstr ""
 "V horní části obrazovky vypisuje chyby, ke kterým došlo v PHP. V produkčním "
 "nasazení by toto mělo být vypnuto, protože se zde mohou objevovat hesla."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "maximální prodleva odpovědi LDAPu"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -4016,11 +3629,11 @@ msgstr ""
 "Zastavit LDAP akce pokud není obdržena odpověď v rámci zadaného počtu "
 "sekund."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "zaznamenávat statistiky LDAPu"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -4028,55 +3641,89 @@ msgstr ""
 "Sledovat statistiky časování LDAP do systémového protokolu. Může pomoci s "
 "hledáním problémů s indexováním či chybnými filtry hledání."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "úroveň podrobností diagnostických informací"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Zobrazit určité údaje při každém načtení stránky."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "různé"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "ve výpisech zobrazovat souhrny"
+
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+"Určuje, zda bude na konci seznamů zobrazována stavová lišta, ve které bude "
+"uveden krátký souhrn typu a počtu prvků na seznamu."
+
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr "Zobrazit panel ACL u všech objektů"
+
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+"Pro velmi specifická nastavení ACL práv, kde je zapotřebí udělit právo na "
+"jediném objektu."
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks"
+msgstr "háčky"
+
+#: plugins/config/class_configInLdap.inc:387
 msgid "Hooks that are called when specific actions happens"
 msgstr "Háčky, které jsou volány pokud nastane konkrétní událost"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "panel"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:391
 msgid "The tab that this hook concerns"
 msgstr "Panel, kterého se týká tento háček"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr "režim"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:396
 msgid "When to call this command"
 msgstr "Kdy spouštět tento příkaz"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "příkaz"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:403
 msgid "The command that will be called"
 msgstr "Příkaz, který bude spouštěn"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "háčky"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:417
 msgid "Display hook output"
 msgstr "Zobrazit výstup háčku"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:418
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -4084,42 +3731,6 @@ msgstr ""
 "Pokud je zapnuto, je úspěšné vykonání háčku zobrazeno uživateli "
 "prostřednictvím dialogu."
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Dostupné shelly"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "POSIX shelly, dostupné pro uživatele F.D."
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Zobrazit panel ACL u všech objektů"
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
-"Pro velmi specifická nastavení ACL práv, kde je zapotřebí udělit právo na "
-"jediném objektu."
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr ""
-
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
 msgstr "Zásuvné moduly"
@@ -4220,9 +3831,8 @@ msgstr "oddělení"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4413,7 +4023,7 @@ msgstr "odebrat uživatele"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4433,8 +4043,7 @@ msgid "Information"
 msgstr "informace"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Název této skupiny"
 
@@ -4458,128 +4067,149 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Přidat uživatele pro tuto roli"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Spravovat skupiny a role"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Upravit vlastnosti role"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "POSIX"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "upravit POSIXové vlastnosti"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Zobrazit skupiny uživatele"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "zobrazovat primární skupiny"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Zobrazit organizační úlohy"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Zobrazit skupiny aplikací"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "zobrazovat primární skupiny"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "zobrazovat e-mailové skupiny"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "zobrazovat skupiny Samby"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Zobrazit skupiny serverů"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Zobrazit skupiny počítačů"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Zobrazit skupiny počítačů s MS Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Zobrazit skupiny terminálů"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Zobrazit skupiny tiskáren"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Zobrazit skupiny telefonů"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Neznámý typ: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Neexistující rozlišený název: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "skupina objektu"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Informace o skupinÄ› objektu"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "skupina"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Stručný popis této skupiny"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "členské objekty"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objekty spadající do této skupiny"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "důvěryhodnost systémů"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "režim důvěryhodnosti"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Typ ověřování pro tyto stroje"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "zakázáno"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "plný přístup"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "povolit přístup k těmto strojům"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Této skupině umožnit připojení pouze na stroje z tohoto seznamu"
 
-#: plugins/admin/groups/class_ogroup.inc:319
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr "Není možné umístit počítače a terminály do jedné skupiny"
@@ -4588,35 +4218,6 @@ msgstr "Není možné umístit počítače a terminály do jedné skupiny"
 msgid "List of groups"
 msgstr "seznam skupin"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr "Informace o POSIX skupinÄ›"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr "POSIX skupina"
-
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr "POSIX skupina uživatelů"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "vynutit GID"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
-msgstr "Vynutit konkrétní identifikátor pro tuto skupinu"
-
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
-msgstr "Identifikátor (GID) pro tuto skupinu"
-
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "členové skupiny"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4664,10 +4265,6 @@ msgstr "Dialog přiřazení ACL"
 msgid "Access control roles assignment dialog"
 msgstr "Dialog přiřazení úloh řízení přístupu"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "režim"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Týká se toto celého podstromu nebo jen základu?"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 0fd2433e8980ce3a7d6b3c812880e82451f68225..8f6b16bdb5744dbee0179c490ede4de53c764677 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -18,36 +18,228 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Sprachauswahl"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Dieser Schritt erlaubt es Ihnen, Ihre bevorzugte Sprache auszuwählen."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr "LDAP-Verbindung"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Name des Standortes"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "Verbindungs-URI"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS-Verbindung"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Basis"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "Die LDAP-Verzeichnisbasis"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Authentisierung"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Administrator-DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Administrator-Passwort:"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Momentaner Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "LDAP-Einrichtung"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Einrichten der LDAP-Verbindung"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Dieser Dialog leistet die grundlegende Konfiguration der LDAP-Konnektivität "
+"für FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonyme Anmeldung an server '%s' ist fehlgeschlagen!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Verbindung als Benutzer '%s' ist fehlgeschlagen!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Wiederholen"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Verbindung als anonymer Benutzer zu Server '%s' war erfolgreich."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Bitte geben Sie Ihren Benutzer und das zugehörige Passwort ein!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Verbindung als Benutzer '%s' zu Server '%s' war erfolgreich!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Warnung"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Einrichtungsfehler"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Vor"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Willkommen"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Speichern"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Abschluß - Schreiben der Konfigurationsdatei"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Schreibe Konfigurationsdatei"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Ihre Konfigurationsdatei ist momentan für jeden lesbar. Bitte ändern Sie die"
+" Zugriffsrechte!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Die Konfiguration ist momentan nicht lesbar oder existiert nicht."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Nach dem Herunterladen und dem Plazieren der Datei unter %s, bitte "
+"vergewissern Sie sich dass der Benutzer unter dem der Webserver läuft, in "
+"der Lage ist %s zu lesen. Anderen Nutzern sollte dies nicht möglich sein."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "PHP Modul- und Erweiterungsprüfung"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
@@ -55,41 +247,41 @@ msgstr ""
 "PHP-Einrichtungskonfiguration (<a href=\"?info\" "
 "target=\"_blank\">Information anzeigen)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Installationsprüfung"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Grundlegende Überprüfungen der PHP-Version und Erweiterungen."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Prüfe PHP-Version"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP muß in Version %s oder höher vorliegen."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Bitte aktualisieren Sie auf eine unterstützte Version."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory benötigt dieses Modul um mit Ihrem LDAP-Server zu "
 "kommunizieren."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory benötigt dieses Modul für internationalisierte "
 "Schnittstellen."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -97,22 +289,22 @@ msgstr ""
 "FusionDirectory benötigt dieses Modul um mit den unterschiedlichen Arten von"
 " Servern und Protokollen zu kommunizieren."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory benötigt dieses Modul für die Sambaintegration."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -120,38 +312,38 @@ msgstr ""
 "FusionDirectory benötigt entweder 'mhash' oder das 'sha1' Modul um SSHA-"
 "Verschlüsselung nutzen zu können."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory benötigt dieses Modul um mit einem IMAP-Server zu "
 "kommunizieren."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 "FusionDirectory benötigt dieses Modul um Unicode-Zeichenketten zu verwalten."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "Imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory benötigt diese Erweiterung um Bilder zu verarbeiten."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "Komprimierungs-Modul"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory benötigt diese Erweiterung um Snapshots zu verwalten."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -160,19 +352,19 @@ msgstr ""
 "register_globals ist ein PHP-Mechanismus, welcher alle globalen Variablen "
 "für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Suchen Sie nach 'register_globals' in Ihrer php.ini und setzen Sie es auf "
 "'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP verwendet diese Einstellungen für den Garbage Collector, um alte "
 "Sessions zu entfernen."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -181,7 +373,7 @@ msgstr ""
 " Sitzung und den zugehörigen Cookie verlieren, bevor diese tatsächlich ihre "
 "Gültigkeit verlieren."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -189,12 +381,12 @@ msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'session.gc_maxlifetime' und setzen Sie es "
 "auf 84600 oder höher."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Aus"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -202,13 +394,13 @@ msgstr ""
 "Um FusionDirectory ohne Probleme benutzen zu können, muss die Option "
 "session.auto_start in Ihrer php.ini auf 'Off' gestellt werden."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'session.auto_start' und setzen Sie es auf "
 "'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -217,14 +409,14 @@ msgstr ""
 "unter dieses Limit gesetzt, kann dies unreproduzierbare Fehler hervorrufen. "
 "Erhöhen Sie dies für größere Installationen."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "Suchen nach 'memory_limit' in Ihrer php.ini und setzen auf '128M' oder "
 "höher."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -232,17 +424,17 @@ msgstr ""
 "Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
 "diese auf 'off', um die Leistung zu erhöhen."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'implicit_flush' und setzen Sie es auf "
 "'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Die Ausführungszeit sollte mindestens 30 Sekunden betragen."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -250,7 +442,7 @@ msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'max_execution_time' und setzen Sie es auf "
 "'30' oder höher."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -259,18 +451,18 @@ msgstr ""
 "setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
 "laufenden Server senden."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Erhöhen Sie die Leistung des Servers, indem sie magic_quotes_gpc auf 'off' "
 "stellen."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -278,130 +470,110 @@ msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen "
 "Sie es auf 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Willkommen"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Willkommen im FusionDirectory Einrichtungsassistent"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Die Willkommensnachricht"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrieren"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "LDAP-Inspektion"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 "Analysieren Sie Ihr aktuelles LDAP nach Kompatibilität mit FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Prüfe Objekt-Klassen des Wurzelobjektes"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Prüfe Berechtigungen auf die LDAP-Datenbank"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Prüfe auf unsichtbare Benutzer"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Prüfe auf Superadministrator"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Prüfe auf Benutzer ausserhalb des Benutzerbaums"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Prüfe auf Gruppen ausserhalb des Gruppenbaums"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Prüfe auf unsichtbare Abteilungen"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Prüfe auf doppelte UID Nummern"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "LDAP-Abfrage fehlgeschlagen."
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Fehlende FusionDirectory Objektklasse '%s'!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Bitte überprüfen Sie Ihre Installation."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -410,47 +582,31 @@ msgstr ""
 "Die strukturelle Objekt-Typ Ihres Wurzel-Objektes kann nicht konvertiert "
 "werden. Bitte fügen Sie die Objekt-Klasse '%s' manuell hinzu."
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Warnung"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -459,323 +615,133 @@ msgstr ""
 "%s Benutzer(innen) gefunden, die nicht in FusionDirectory sichtbar sein "
 "werden oder unvollständig sind."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Benutzermigration"
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Migrationsfehler"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Kann Eintrag \"%s\" nicht migrieren:"
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Anlegen"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Benutzer"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Gruppen"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Rollen"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Es gibt kein FusionDirectory Administratorkonto innerhalb Ihres LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Anlegen"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Gibt alle Rechte auf alle Objekte"
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Einige Standard-ACL-Rollen fehlen"
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Kann ACL-Rolle \"%s\" nicht hinzufügen:"
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Verschiebe Benutzer in den konfigurierten Benutzerbaum"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "Eintrag wird verschoben von"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "an"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Die folgenden Referenzen werden aktualisiert"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 "Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Gruppen in den konfigurierten Gruppenbaum verschieben"
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
-"Fand %s Abteilungen, die nicht in FusionDirectory sichtbar sein werden."
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr "LDAP-Verbindung"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Name des Standortes"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "Verbindungs-URI"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS-Verbindung"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "Die LDAP-Verzeichnisbasis"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Authentisierung"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Administrator-DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Administrator-Passwort:"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Momentaner Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "LDAP-Einrichtung"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Einrichten der LDAP-Verbindung"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Dieser Dialog leistet die grundlegende Konfiguration der LDAP-Konnektivität "
-"für FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonyme Anmeldung an server '%s' ist fehlgeschlagen!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Verbindung als Benutzer '%s' ist fehlgeschlagen!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Wiederholen"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Verbindung als anonymer Benutzer zu Server '%s' war erfolgreich."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Aktualisieren"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Bitte geben Sie Ihren Benutzer und das zugehörige Passwort ein!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Verbindung als Benutzer '%s' zu Server '%s' war erfolgreich!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Speichern"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Abschluß - Schreiben der Konfigurationsdatei"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Schreibe Konfigurationsdatei"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"Ihre Konfigurationsdatei ist momentan für jeden lesbar. Bitte ändern Sie die"
-" Zugriffsrechte!"
+"Fand %s Abteilungen, die nicht in FusionDirectory sichtbar sein werden."
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Die Konfiguration ist momentan nicht lesbar oder existiert nicht."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
-"Nach dem Herunterladen und dem Plazieren der Datei unter %s, bitte "
-"vergewissern Sie sich dass der Benutzer unter dem der Webserver läuft, in "
-"der Lage ist %s zu lesen. Anderen Nutzern sollte dies nicht möglich sein."
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Einrichtungsfehler"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Abgeschlossen"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Willkommen im FusionDirectory Einrichtungsassistent"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Vor"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Die Willkommensnachricht"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -795,17 +761,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Der angegebene Objekt-Typ ist leer oder ungültig!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Wurzel"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Übertragen"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Auf"
 
@@ -832,24 +798,19 @@ msgstr "Alle auswählen"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fehler"
@@ -858,70 +819,70 @@ msgstr "Fehler"
 msgid "created by"
 msgstr "Angelegt von"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Heimat"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Aktionen"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Kopieren"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Liste exportieren"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Snapshot erstellen"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
@@ -939,9 +900,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
@@ -969,27 +930,27 @@ msgstr ""
 "Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren "
 "Administrator."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Alle abbrechen"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Kann nicht einfügen"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -997,8 +958,10 @@ msgstr "Kennung"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Vorlage"
 
@@ -1026,7 +989,7 @@ msgstr ""
 "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie "
 "'%s' aus um das Problem zu beheben"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1034,34 +997,34 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Schwerer Fehler"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Authentifizierungsfehler"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1070,12 +1033,12 @@ msgstr ""
 "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
 "Ihren Administrator!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1083,12 +1046,12 @@ msgstr ""
 "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
 "passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1097,85 +1060,77 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sie bearbeiten gerade den/die LDAP Eintrag/Einträge %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Einträge pro Seite"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Filter anwenden"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1184,130 +1139,89 @@ msgstr ""
 "Datei '%s' konnte nicht gelöscht werden. Versuchen Sie fusiondirectory-setup"
 " --check-directories um die Rechte zu beheben."
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Kann nicht in Revisions-Datei schreiben!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'nextIdHook' ist nicht verfügbar. Benutze Standardbasis!"
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP-Warnung"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung"
 " möglich!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Verfügbare Klasse(n)"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Konnte keine freie ID allozieren:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool ist nicht eindeutig!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "keine ID verfügbar!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "maximale Anzahl von Versuchen abgelaufen!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Konnte keine freie ID allozieren!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu"
 " beseitigen"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Keine Objekte dieser Kategorie"
 
@@ -1320,52 +1234,48 @@ msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Die Zeitzoneneinstellung \"%s\" in Ihrer Konfiguration ist nicht gültig."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML-Fehler in der Datei fusiondirectory.conf: %s in Zeile %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den "
 "Administrator."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable "
-"'%s' ist nicht gesetzt."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"Die Snapshot-Funktionalität ist aktiviert, aber das erforderliche Modul ist "
-"nicht verfügbar. Bitte installieren Sie '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Alle Kategorien"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mein Konto"
 
@@ -1388,7 +1298,7 @@ msgstr "Auswählen um Objekte des Typs '%s' aufzulisten"
 msgid "Select to search within subtrees"
 msgstr "Wählen Sie diese Option um auch in Teilbäumen zu suchen"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Suche in Teilbäumen"
 
@@ -1598,52 +1508,46 @@ msgstr "'%s' muß größer oder gleich %d sein!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' hängt von '%s' ab - bitte geben Sie beide Werte an!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr "\"%s\""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "Es existiert bereits ein Eintrag mit diesem '%s' Attribut im System!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
-msgstr ""
+msgid "The entry '%s' already use this '%s' attribute!"
+msgstr "Der Eintrag '%s' verwendet bereits dieses Attribut '%s'!"
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "Das Pflicht-Feld '%s' ist leer!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr "Beispiel:"
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Das Feld '%s' enthält ungültige Zeichen"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' ist nicht erlaubt:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' sind nicht erlaubt!"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Fehlenden %s PHP-Erweiterung!"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1651,27 +1555,27 @@ msgstr "Fehlenden %s PHP-Erweiterung!"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Anwenden"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Speichern"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1679,31 +1583,31 @@ msgstr "%s hinzufügen"
 msgid "Delete"
 msgstr "Entfernen"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "%s löschen"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "%s bearbeiten..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Zurück"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Dieses Konto besitzt keine gültigen %s-Einstellungen."
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1712,7 +1616,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte %s-Einstellungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1721,7 +1625,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte %s-Erweiterungen. Um sie zu deaktivieren, "
 "müssen Sie zunächst die %s Einstellungen entfernen!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1730,7 +1634,7 @@ msgstr ""
 "Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch "
 "einen Klick auf die Schaltfläche aktivieren."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1739,184 +1643,191 @@ msgstr ""
 "Dieses Konto besitzt aktuell keine aktivierten %s-Einstellungen. Um sie zu "
 "aktivieren, müssen Sie zunächst die %s Erweiterungen hinzufügen!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "%s Einstellungen hinzufügen"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "%s Einstellungen entfernen"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Januar"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Februar"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "März"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "August"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Dezember"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Montag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Freitag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Samstag"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "Lese-Operation"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "Hinzufügeoperation"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "Änderungs-Operation"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "Lösch-Operation"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "Such-Operation"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "Authentifizierung"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s fehlgeschlagen!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "LDAP-Operation fehlgeschlagen"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objekt"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Übertragung fehlgeschlagen!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Übertragung fehlgeschlagen: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieses Objekts: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Dieses '%s' ist noch in Benutzung."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieser Objekte: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Die Datei '%s' existiert nicht!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kann Datei '%s' nicht zum Lesen öffnen!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kann Datei '%s' nicht zum Schreiben öffnen!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1925,37 +1836,37 @@ msgstr ""
 "Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte "
 "prüfen Sie Ihre Konfigurationsdatei!"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kann Datei '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht anlegen!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Prüfe auf %s-Unterstützung"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installieren und aktivieren Sie das %s PHP-Modul."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installieren und aktivieren des %s Pear Moduls."
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1964,7 +1875,7 @@ msgstr ""
 "Kann Klasse '%s' nicht initialisieren. Vielleicht fehlt ein Plugin in Ihrer "
 "FusionDirectory Installation?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -2007,7 +1918,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Schnappschüsse"
 
@@ -2109,37 +2019,37 @@ msgstr "während der Arbeit auf LDAP-Server '%s'"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2152,11 +2062,10 @@ msgstr "Bitte wählen Sie die gewünschten Einträge"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2164,13 +2073,12 @@ msgstr "Name"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Beschreibung"
@@ -2222,8 +2130,8 @@ msgstr "Bearbeiten"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2285,37 +2193,38 @@ msgstr "Tage"
 msgid "From template"
 msgstr "Aus Vorlage"
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr "%s Vorlage"
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Zeigen %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Filter Fehler"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Der Filter ist unvollständig!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
@@ -2347,28 +2256,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Es gibt bereits einen Eintrag mit dem selben dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Der Eintrag %s existiert nicht"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Unbekanntes Feld \"%s\""
@@ -2413,8 +2327,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d Bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -2423,7 +2337,7 @@ msgstr "Hochladen"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2434,7 +2348,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ungültiger Wert für %s"
@@ -2508,6 +2422,10 @@ msgstr "Unbekannter Eintrag '%s'!"
 msgid "All users"
 msgstr "Alle Benutzer"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Filter anwenden"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2585,36 +2503,31 @@ msgstr "Bitte geben Sie Ihr Passwort ein!"
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2627,45 +2540,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Das Token ist nicht gültig"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Es gab ein Problem mit dem Mailserver, Bestätigungsmail wurde nicht "
@@ -2740,239 +2653,8 @@ msgstr "Willkommen %s!"
 msgid "References"
 msgstr "Referenzen"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Benutzer POSIX-Einstellungen bearbeiten"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Basisverzeichnis"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "Der Pfad zum Heimatverzeichnis für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-"Welche Shell soll verwendet werden, wenn dieser Benutzer sich einloggt"
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "unkonfiguriert"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Primäre Gruppe"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Primäre Gruppe für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Status dieses Benutzer unixkontos"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr "Benutzer-/Gruppenkennung erzwingen"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-"Benutzerkennungs- und Gruppenkennungswerte für diesen Benutzer erzwingen"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr "Benutzerkennung"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr "Benutzerkennwert für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr "Gruppenkennung"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr "Gruppenkennwert für diesen Benutzer"
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Gruppenmitgliedschaft"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Konto"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "Benutzer muss beim ersten Anmelden sein Passwort ändern"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-"Benutzer muss das Passwort bei der ersten Anmeldung ändern (benötigt einen "
-"Wert für die Verzögerung, bevor die Passwortänderung erzwungen wird)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr "Mindestverzögerung zwischen Passwortänderungen (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-"Der Benutzer kann sein Passwort nicht vor dieser Anzahl an Tagen ändern (zum"
-" Deaktivieren leer lassen)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Verzögerung bevor die Passwortänderung forciert wird (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"Der Benutzer wird gezwungen werden, sein Passwort nach dieser Anzahl von "
-"Tagen zu ändern (Leer lassen zum Deaktivieren)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Passwort Ablaufdatum"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Datum nach dem dieses Benutzerpasswort ablaufen wird (leer lassen zur "
-"Deaktivierung)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-"Verzögerung von Inaktivität bevor der Benutzer deaktiviert wird (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Maximale Verzögerung der Inaktivität nach Passwortablauf bevor der Benutzer "
-"deaktiviert wird (leer lassen zum Deaktivieren)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Verzögerung für Benutzerwarnung vor Passwortablauf (Tage)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"Der Benutzer wird diese Anzahl an Tagen vorher gewarnt, bevor sein Passwort "
-"aufläuft (leer lassen zum Deaktivieren)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "System-Vertrauen"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Vertrauens-Modus"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Art der Authorisierung für diese Hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "deaktiviert"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "Vollzugriff"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "erlaube Zugriff auf diese Hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Nur diesem Benutzer erlauben, dieser Liste von Hosts zu verbinden"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automatisch"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "abgelaufen"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "Nachfrist aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "Passwort abgelaufen"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "Passwort kann nicht geändert werden"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr "Gruppe des Benutzers %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Gruppen und Rollen"
 
@@ -2999,7 +2681,7 @@ msgid "Password hash method to use"
 msgstr "Zu verwendende Passworthash-Methode"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -3036,260 +2718,278 @@ msgstr "Benutzerkontoinformation"
 msgid "User account"
 msgstr "Benutzerkonto"
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Nachname von diesem Benutzer"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Vorname von diesem Benutzer"
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Kurze Beschreibung des Benutzers"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Bild"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Der Avatar für diesen Benutzer"
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Land"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Geschäftliche Adresse"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Geschäftliche Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Geschäftliche Mobiltelefonnummer"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Geschäftliche Faxnummer"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Kontoinformation"
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Passwort des Benutzers"
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Persönliche Kontaktinformation"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Anzeigename"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Verwalter"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Postleitzahl"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Passwörter ist im Verlauf alter Passwörter"
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "Bestehender Wert das Passworts wurde nicht geändert"
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Das alte und neue Passwort sind sich zu ähnlich."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu "
-"kurz."
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "Das Passwort beinhaltet möglicherweise problematische Unicode-Zeichen!"
@@ -3402,29 +3102,39 @@ msgstr ""
 "Benutzer werden auch in der Lage sein, eine ihrer alternativen Adressen zur "
 "Wiederherstellung ihres Passworts, einzugeben"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Anmeldeattribut"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Erste Email"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Betreff"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Betreff der ersten Email"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Password recovery link"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr "Body (zuerst %s ist Login, zweiter ist Link)"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3434,7 +3144,7 @@ msgstr ""
 "neuen Passwort fragt. Benutzen Sie %s für den Login und den "
 "Wiederherstellungslink."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3446,24 +3156,24 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Zweite Email"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Betreff der zweiten Email"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Passwort-Wiederherstellung erfolgreich"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Body (%s ist Login)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3472,7 +3182,7 @@ msgstr ""
 "Body der zweiten Email, die verschickt wird um zu bestätigen, dass das "
 "Passwort geändert wurde. Benutzen Sie %s für den Benutzerlogin."
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3533,58 +3243,108 @@ msgid "Timezone to be used"
 msgstr "Zu verwendende Zeitzone"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Schemaeinrichtung"
+msgid "Core settings"
+msgstr "Kerneinstellungen"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "LDAP Größenlimit"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Definiert die Anzahl der Einträge, die standardmäßig von LDAP geholt werden "
+"sollen."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Locking bearbeiten"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Prüfen ob ein Eintrag, der momentan bearbeitet wird, außerhalb von "
+"FusionDirectory zwischenzeitlich bearbeitet wurde."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Logging aktivieren"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Ereignisloggins auf Seiten von FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
-msgstr "Aktiviert Schema-Überprüfung während des Logins."
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr "Aktiviert Schema-Überprüfung während des Logins."
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Snapshots ermöglichen"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Dies ermöglicht es Ihnen, gewisse Stati von Einträgen zu speichern und diese"
+" später wieder herzustellen."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Basis für Snapshots"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "Die Basis wo Snapshots innerhalb des LDAP gespeichert werden sollen."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Passwort-Einstellungen"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Stadard Passworthash"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Standard hash, der verwendet werden soll"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Standardhash forcieren"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Forciert die Nutzung des Standard Passworthashs"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Minimale Passwortlänge"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Minimale Länge der Benutzerpasswörter"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Passwort Minimallänge unterscheidet sich"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Mindestanzahl der unterschiedlichen Buchstaben vom letzten Passwort"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Verwende ablaufende Konten"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -3592,84 +3352,33 @@ msgstr ""
 "Aktiviert shadow Attributtests während des Logins in FusionDirectory und "
 "forciert Passworterneuerung und oder Kontensperrung"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attribut welchen im userPasswort Attribut gespeichert werden soll"
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Kerneinstellungen"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Zeige Zusammenfassung in Listen"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Bestimmt, ob eine Statusanzeige am Rande der Listen gezeigt werden soll, die"
-" eine kurze Zusammenfassung von Typ und Anzahl der Elemente in der Liste "
-"zeigt."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Locking bearbeiten"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Prüfen ob ein Eintrag, der momentan bearbeitet wird, außerhalb von "
-"FusionDirectory zwischenzeitlich bearbeitet wurde."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Logging aktivieren"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Ereignisloggins auf Seiten von FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "LDAP Größenlimit"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr ""
-"Definiert die Anzahl der Einträge, die standardmäßig von LDAP geholt werden "
-"sollen."
-
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Anmeldung und Sitzung"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Anmeldeattribut"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Welches LDAP Attribut soll als Loginname während des Logins verwendet "
 "werden."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Erzwinge verschlüsselte Verbindungen"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3677,294 +3386,207 @@ msgstr ""
 "Aktiviert PHP-Sicherheitschecks zur Forcierung des verschlüsselten Zugangs "
 "(https) zur Webschnittstelle."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Bei unverschlüsselten Verbindungen warnen"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "Zeigt dem Benutzer eine Warnung  wenn http anstelle von https verwendet "
 "wird."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Lebensdauer der Sitzung"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr "Kopfdatenname"
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Snapshots ermöglichen"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-"Dies ermöglicht es Ihnen, gewisse Stati von Einträgen zu speichern und diese"
-" später wieder herzustellen."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Basis für Snapshots"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "Die Basis wo Snapshots innerhalb des LDAP gespeichert werden sollen."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Schlüsselpfad"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Zertifikatspfad"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "CA-Zertifikatspfad"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "System"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Anschluss"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Ablage für Personen und Gruppen"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "DN-Attribut für Personen"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Zu verwendendes Attribut zu Beginn des Benutzers dn"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "CN-Muster"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Strikte Namenspolicy"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Nachster id hook"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Basisnummer für Benutzerkennung"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-"Wo mit der Suche nach einer neuen freien user id gestartet werden soll."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Basisnummer für Gruppenkennung"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-"Wo nach der Suche nach einer neuen freien group-ID geschaut werden soll."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Users RDN"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Groups RDN"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Der Zweig in welchem Gruppen gespeichert werden."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Id-Zuweisungsmethode"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Traditionell"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Samba unix id pool"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Fehler anzeigen"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3973,11 +3595,11 @@ msgstr ""
 "produktiven Einrichtungen deaktiviert werden, da einige Passwörter enthalten"
 " sein könnten."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximale LDAP Abfragedauer"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3985,11 +3607,11 @@ msgstr ""
 "Anhalten von LDAP-Aktionen wenn keine Antwort innerhalb der angegeben Anzahl"
 " von Sekunden erfolgt."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Protokolliere LDAP-Statistiken"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3997,94 +3619,93 @@ msgstr ""
 "LDAP Timingstatistiken mit dem Syslog verfolgen. Dies kann helfen, "
 "Indexproblem oder schlechte Suchfilter zu finden."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug Level"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Gewisse Informationen bei jedem Seitenladen anzeigen."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Zeige Zusammenfassung in Listen"
+
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+"Bestimmt, ob eine Statusanzeige am Rande der Listen gezeigt werden soll, die"
+" eine kurze Zusammenfassung von Typ und Anzahl der Elemente in der Liste "
+"zeigt."
+
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr "ACL-Reiter auf allen Objekten anzeigen"
+
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks"
+msgstr "Hooks"
+
+#: plugins/config/class_configInLdap.inc:387
 msgid "Hooks that are called when specific actions happens"
 msgstr "Hooks die aufgerufen werden wenn spezifische Aktionen passieren"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "Reiter"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:391
 msgid "The tab that this hook concerns"
 msgstr "Der Tab, der diesen hook betrifft"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "mode"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modus"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:396
 msgid "When to call this command"
 msgstr "Wann dieser Befehl aufgerufen wird"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:403
 msgid "The command that will be called"
 msgstr "Der zu aufrufende Befehl"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Hooks"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:417
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:418
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Verfügbare Shells"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Verfügbare POSIX-Shells für FD-Benutzer."
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "ACL-Reiter auf allen Objekten anzeigen"
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr ""
-
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
 msgstr "Plugins"
@@ -4181,9 +3802,8 @@ msgstr "Abteilung"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4372,7 +3992,7 @@ msgstr "Benutzer entfernen"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4392,8 +4012,7 @@ msgid "Information"
 msgstr "Information"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Name dieser Gruppe"
 
@@ -4417,128 +4036,149 @@ msgstr "Rollenmitglieder"
 msgid "Add users for the role"
 msgstr "Benutzer für die Rolle hinzufügen"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Gruppen und Rollen verwalten"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Rolleneigenschaften bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "POSIX-Eigenschaften bearbeiten"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Benutzergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Zeige primäre Gruppen"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Organisatorische Rollen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Anwendungsgruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Zeige primäre Gruppen"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Zeige Mail Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Zeige Samba Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr "DSA-Einträge anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Servergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Gruppen von Arbeitsstationen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Windows-Gruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Gruppen von Terminals anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Druckergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Telefongruppen anzeigen"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Unbekannter Typ: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objektgruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Objektgruppeninformation"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Kurze Beschreibung dieser Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objektmitglied dieser Gruppe"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "System-Vertrauen"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Vertrauens-Modus"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Art der Authorisierung für diese Hosts"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "deaktiviert"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Vollzugriff"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "erlaube Zugriff auf diese Hosts"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Nur dieser Gruppe erlauben, dieser Liste von Hosts zu verbinden"
 
-#: plugins/admin/groups/class_ogroup.inc:319
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -4547,35 +4187,6 @@ msgstr ""
 msgid "List of groups"
 msgstr "Liste der Gruppen"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr "POSIX-Gruppeninformation"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr "POSIX-Gruppe"
-
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr "POSIX-Benutzergruppe"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Erzwinge GID"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
-msgstr "GID-Wert für diese Gruppe erzwingen"
-
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
-msgstr "GID-Wert für diese Gruppe"
-
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Gruppenmitglieder"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4623,10 +4234,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr "Zugriffssteuerungsrollen-Zuordnungsdialog"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modus"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index c33e1600943513edec1c338ed4b955427d174f8b..bdee34ae481840db9b5e03c76c704631cec1b44d 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Προτιμώμενη γλώσσα"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Βάση"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Κατάσταση"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Προσπάθεια ξανά"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Ανανέωση"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Παρακαλώ επαληθεύστε το όνομα χρήστη και τον κωδικό σας!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Προειδοποίηση"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Μετακίνηση"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Έλεγχος έγκρισης για βάση δεδομένων  LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "'Έλεγχος για αόρατους χρήστες"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Έλεγχος για υπερδιαχειριστές "
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Έλεγχος για προεπιλεγμένους ρόλους και ομάδες στην ACL"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Έλεγχος για χρήστες εκτός της δομής δεδομένων "
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Έλεγχος για ομάδες εκτός της δομής δεδομένων"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Σφάλμα LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Προειδοποίηση"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Δημιουργία"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Χρήστες"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Ρόλοι"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Δημιουργία"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Βάση"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Κατάσταση"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Προσπάθεια ξανά"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Ανανέωση"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Παρακαλώ επαληθεύστε το όνομα χρήστη και τον κωδικό σας!"
+msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Υποβολή"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Πάνω"
 
@@ -771,24 +737,19 @@ msgstr "Επιλογή όλων"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Σφάλμα"
@@ -797,70 +758,70 @@ msgstr "Σφάλμα"
 msgid "created by"
 msgstr "δημιουργήθηκε από"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Μετάβαση στον ριζικό τμήμα"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Μετάβαση ένα τμήμα επάνω"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Αρχή (Home)"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Επαναφόρτωση λίστας"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Αποκοπή αυτής της εγγραφής"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Αντιγραφή αυτής της εγγραφής"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Επαναφορά στιγμιοτύπων"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Εξαγωγή λίστας"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Επαναφορά στιγμιοτύπου"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Δημιουργία στιγμιότυπου"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Δημιουργία νέου στιγμιότυπου από αυτό το αντικείμενο"
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Σφάλμα ρύθμισης"
@@ -906,27 +867,27 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Άδεια"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Ακύρωση όλων"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Αδυναμία επικόλλησης"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr "Σύνδεση"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Πρότυπο"
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,13 +930,13 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Μοιραίο σφάλμα"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "ΣΦΑΛΜΑ: Σφάλμα σύνδεσης στον διακομιστή LDAP. Ο διακομιστής αποκρίθηκε '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -981,22 +944,22 @@ msgstr ""
 "Η σύνδεση (uid) δεν είναι μοναδική μέσα στο δέντρο LDAP. Παρακαλούμε "
 "επικοινωνήστε με τον διαχειριστή του συστήματος σας."
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Σφάλμα πιστοποίησης"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Σφάλμα κατά την προσθήκη κλειδώματος. Επικοινωνήστε με τους προγραμματιστές!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1005,238 +968,189 @@ msgstr ""
 "Αποτυχία δημιουργίας κλειδώματος στο δέντρο LDAP. Παρακαλούμε επικοινωνήστε "
 "με τον διαχειριστή του συστήματος σας."
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Ο διακομιστής LDAP επίστρεψε: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Έχει ξεπεραστεί το όριο %d καταχωρίσεων!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Ρύθμιση"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "ελλιπής"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Συνέχεια οπωσδήποτε"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Επεξεργασία οπωσδήποτε"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Καταχωρήσεις ανά σελίδα"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Εφαρμογή φίλτρου"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Αδύνατη η εγγραφή σε αρχείο αναθεώρησης!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Προειδοποίηση LDAP "
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Αδυναμία λήψης πληροφοριών σχήματος για τον εξυπηρετητή. Δεν υπάρχει η "
 "δυνατότητα ελέγχου σχήματος!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Δαθέσιμες κλάσεις"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Δεν είναι δυνατό να ανατεθεί μια free ID:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool  δεν είναι μοναδική!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "Μη διαθέσιμη ID!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "Υπέρβαση μεγίστου ορίου προσπαθειών!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Δεν είναι δυνατή η διάθεση μιας  free ID!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Αδυναμία εντοπισμού αρχείου '%s' - παρακαλώ εκτελέστε το '%s' για να το "
 "διορθώσετε"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1250,46 +1164,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Αδυναμία bind σε LDAP. Επικοινωνήστε με τον διαχειριστή συστήματος"
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Όλες οι κατηγορίες"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Ο λογαριασμός μου"
 
@@ -1312,7 +1226,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1521,52 +1435,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr "Παράδειγμα:"
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1574,27 +1482,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Προσθήκη του %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1602,280 +1510,287 @@ msgstr "Προσθήκη του %s"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Διαγραφή %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Επεξεργασία..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Επεξεργασία %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Πίσω"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Μάρτιος"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Απρίλιος"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Μάιος"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Ιούνιος"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Ιούλιος"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Αύγουστος"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "λειτουργία ανάγνωσης"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "λειτουργία προσθήκης"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "λειτουργία τροποποίησης"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "λειτουργία διαγραφής"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "λειτουργία αναζήτησης"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "πιστοποίηση"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s απέτυχε!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "Η λειτουργία LDAP απέτυχε!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Αντικείμενο"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Η αποστολή απέτυχε!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Αποτυχία αποστολής: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Αποτυχία επικοινωνίας με την υπηρεσία υποδομής: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Το '%s'  χρησιμοποιείται ήδη."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Το αρχείο '%s' δεν υπάρχει!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Αδυναμία ανοίγματος αρχείου '%s' για ανάγνωση!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Αδυναμία ανοίογματος αρχείου `%s' για εγγραφή!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Αδύνατη η διαγραφή αρχείου '%s'!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Αδύνατη η δημιουργία του φακέλου '%s'!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Αδύνατη η διαγραφή του φακέλου '%s'"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Έλεγχος για υποστήριξη %s "
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1917,7 +1832,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Στιγμιότυπα"
 
@@ -2015,37 +1929,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2058,11 +1972,10 @@ msgstr "Παρακαλώ επιλέξτε τις επιθυμητές εγγρα
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2070,13 +1983,12 @@ msgstr "Όνομα"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Περιγραφή"
@@ -2128,8 +2040,8 @@ msgstr "Επεξεργασία"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2191,37 +2103,38 @@ msgstr "ημέρες"
 msgid "From template"
 msgstr "Από πρότυπο"
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr "πρότυπο %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Εμφάνιση %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Σφάλμα φίλτρου"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Το φίλτρο δεν είναι ολοκληρωμένο! "
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Σφάλμα δικαιωμάτων"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε ένα στιγμιότυπο για  %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Δεν επιτρέπεται να επαναφέρετε ένα στιγμιότυπο για  %s."
@@ -2253,28 +2166,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Υπάρχει ήδη μια καταχώριση με το ίδιο dn : %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Η καταχώριση  %s  δεν υπάρχει."
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2319,8 +2237,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Αποστολή"
 
@@ -2329,7 +2247,7 @@ msgstr "Αποστολή"
 msgid "Download"
 msgstr "Λήψη"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2340,7 +2258,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2414,6 +2332,10 @@ msgstr ""
 msgid "All users"
 msgstr "Όλοι οι χρήστες"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Εφαρμογή φίλτρου"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2487,36 +2409,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr "Παρακαλώ ελέγξτε το συνδυασμό όνομα χρήστη/κωδικός πρόσβασης."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2528,44 +2445,44 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Οι ρυθμίσεις %s/%s  του FusionDirectory δεν είναι αναγνώσιμες. Εγκατάλειψη"
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Διευθύνση ηλεκτρονικής αλληλογγραφίας"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2632,239 +2549,8 @@ msgstr "Καλώς ήλθατε στο %s!"
 msgid "References"
 msgstr "Αναφορές"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Επεξεργασία ρυθμίσεων χρηστών POSIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Προσωπικός κατάλογος"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "Η διαδρομή για τον αρχικό κατάλογο του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Κέλυφος"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr "Ποιο κέλυφος πρέπει να χρησιμοποιηθεί όταν ο χρήστης συνδεθεί"
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "μη ρυθμισμένο"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Κύρια ομάδα"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Κύρια ομάδα του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Κατάσταση του λογαριασμού unix του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr "Εξαναγκασμός user/group id"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-"Υποχρέωση συμπλήρωσης τιμών για user id και group id για αυτόν τον χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr "User id"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr "Τιμή User id για αυτόν τον χρήστη."
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr "Group id"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr "Τιμή Group id για αυτόν τον χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Μέλη ομάδας"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Λογαριασμός"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-"Ο χρήστης θα πρέπει να αλλάξει τον κωδικό πρόσβασης κατά την πρώτη του "
-"σύνδεση"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-"Ο χρήστης πρέπει να αλλάξει συνθηματικό στην πρώτη σύνδεση (η τιμή στο πεδίο"
-" Καθυστέρηση δηλώνει το πόσες φορές μπορεί ο χρήστης να συνδεθεί πριν "
-"αναγκαστεί να αλλάξει συνθηματικό)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Καθυστέρηση πριν την υποχρεωτική αλλαγή κωδικού πρόσβασης (σε ημέρες)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"Ο χρήστης θα υποχρεωθεί να αλλάξει τον κωδικό πρόσβασής του μετά από αυτό "
-"τον αριθμό ημερών (αφήστε κενό για απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Ημερομηνία λήξης κωδικού πρόσβασης"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Ημερομηνία μετά από την οποία θα λήγει ο κωδικός πρόσβασης (αφήστε κενό για "
-"απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Ημέρες αδράνειας πριν από την απενεργοποίηση του χρήστη"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Μέγιστος αριθμός ημερών αδράνειας μετά την λήξη του κωδικού πρόσβασης πριν "
-"την απενεργοποίηση του χρήστη (αφήστε κενό για απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Ημέρες μεταξύ προειδοποίησης χρήστη και λήξης κωδικού:"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"Ο χρήστης θα προειδοποιείται αυτόν τον αριθμό των ημερών πριν από τη λήξη "
-"του κωδικού πρόσβασής του (αφήστε κενό για απενεργοποίηση)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Εμπιστοσύνη συστήματος"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Λειτουργία επιστοσύνης"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Τύπος εξουσιοδότησή για αυτά τα συστήματα"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "απενεργοποιημένο"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "Πλήρης Πρόσβαση"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "να επιτραπεί πρόσβαση σε αυτά τα host"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-"Επιτρέπεται σ'αυτόν τον χρήστη να συνδέεται στην ακόλουθη λίστα διακομιστών"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "αυτόματο"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr " έληξε"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "χρονικό διάστημα χάριτος ενεργό"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "ενεργό"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "ο κωδικός πρόσβασης έχει λήξει"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "ο κωδικός πρόσβασης δεν μπορεί να αλλάξει"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr "Ομάδα του χρήστη %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Ομάδες και ρόλοι"
 
@@ -2891,7 +2577,7 @@ msgid "Password hash method to use"
 msgstr "Μέθοδος hash για χρήση κωδικού"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2928,165 +2614,169 @@ msgstr "Πληροφορίες λογαριασμού χρήστη"
 msgid "User account"
 msgstr "Λογαριασμός χρήστη"
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Επίθετο"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Το επίθετο του χρήστη."
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Όνομα"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Το όνομα του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Σύντομη περιγραφή του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Εικόνα"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Το άβαταρ του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Πληροφοριών επαφή οργανισμού"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Πολιτεία"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Ταχυδρομική διεύθυνση εταιρίας"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Αρ. δωματίου"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Αριθμός δωματίου"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Αριθμός τηλεφώνου εργασίας"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Κινητό"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Αριθμός κινητού τηλεφώνου εργασίας"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Βομβητής"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Αριθμός βομβητή εργασίας"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Φαξ"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Αριθμός φαξ εργασίας"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Ιστοσελίδα"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Προσωπική ιστοσελίδα"
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Πληροφορίες λογαριασμού"
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Λογαριασμός σύνδεσης αυτού του χρήστη."
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Ο κωδικός του χρήστη"
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Προσωπικές πληροφορίες επαφής"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Όνομα που εμφανίζεται"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 "Το όνομα με το οποίο πρέπει να εμφανίζεται ο χρήστης. Χρησιμοποιείται από το"
 " Exchange."
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Διεύθυνση οικίας"
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Ταχυδρομική διεύθυνση οικίας"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Ιδιωτικό τηλέφωνο"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Αριθμός τηλεφώνου οικίας"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Πληροφορίες οργανισμού"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Τίτλος"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3094,77 +2784,93 @@ msgstr ""
 "Τίτλος προσώπου στο οργανωτικό του πλαίσιο. Κάθε τίτλος είναι μια από τις "
 "πολλές τιμές αυτού του χαρακτηριστικού"
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Τμήμα"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Αρ. τμήματος"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Αριθμός τμήματος"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Αρ. Υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Αριθμός Υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Τύπος υπαλλήλου"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Διαχειριστής"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Ταχυδρομικός κώδικας"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στο LDAP!"
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Δεν έχετε δικαίωμα αλλαγής του κωδικού σας"
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Θα πρέπει να περιμένετε %d δευτερόλεπτα για να αλλάξετε το κωδικό σας"
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Ο κωδικός είναι στο ιστορικό παλιών κωδικών πρόσβασης."
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "Ο κωδικός πρόσβασής σας δεν έχει αλλάξει από την τρέχουσα τιμή"
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Θα πρέπει να εισάγετε τον κύριο κωδικό σας για να συνεχίσετε"
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3172,20 +2878,20 @@ msgstr ""
 "Οι κωδικοί εισάγατε ως \"Νέο κωδικό\" και \"Επανάληψη νέου κωδικού\" δεν "
 "ταιριάζουν."
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Νέος κωδικός "
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Ο παλιός και ο νέος κωδικός πρόσβασης μοιάζουν πολύ"
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Ο κωδικός που εισάγατε είναι πολύ μικρός"
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Ο νέος κωδικός πρόσβασης περιέχει προβληματικούς χαρακτήρες Unicode!"
 
@@ -3297,36 +3003,46 @@ msgstr ""
 "Οι χρήστες θα έχουν επίσης τη δυνατότητα να εισάγουν μία από τις "
 "εναλλακτικές τους διευθύνσεις για να ανακτήσουν τον κωδικό τους"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Πρώτο email"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Θέμα"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Θέμα του πρώτου email"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3338,31 +3054,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Δεύτερο email"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Θέμα του δεύτερου email"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Επιτυχής επαναφορά κωδικού πρόσβασης"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3417,544 +3133,455 @@ msgstr "Θέμα που θα χρησιμοποιηθεί"
 msgid "Timezone"
 msgstr "Ζώνη ώρας"
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
-msgstr "Ζώνη ώρας που θα χρησιμοποιηθεί"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr "Ζώνη ώρας που θα χρησιμοποιηθεί"
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Επεξεργασία κλειδώματος"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Ελέγξτε αν η εγγραφή που υφίσταται επεξεργασία έχει στο μεταξύ τροποποιηθεί "
+"έξω από FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Ενεργοποίηση λήψεων στιγμιότυπων"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Ρυθμίσεις κωδικού πρόσβασης"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Ελάχιστο μήκος κωδικού"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Ελάχιστο μήκος κωδικού χρήστη"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Ελάχιστη διαφοροποίηση κωδικού"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Ελάχιστος αριθμός διαφορετικών χαρακτήρων από τον τελευταίο κωδικό"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Χρήση λήξης λογαριασμού"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Καθορίζει αν μια γραμμή κατάστασης θα εμφανιστεί στο κάτω μέρος των λιστών, "
-"εμφανίζοντας μια σύντομη περίληψη του τύπου και του αριθμού των στοιχείων "
-"στη λίστα."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Επεξεργασία κλειδώματος"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Ελέγξτε αν η εγγραφή που υφίσταται επεξεργασία έχει στο μεταξύ τροποποιηθεί "
-"έξω από FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Επιβολή κρυπτογραφημένων συνδέσεων"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Προειδοποίηση αν η συνεδρία δεν είναι κρυπτογραφημένη"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "θα εμφανίσει προειδοποίηση προς το χρήστη όταν το πρωτόκολλο http "
 "χρησιμοποιείται αντί του πρωτοκόλλου https "
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Διάρκεια συνεδρίας"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Ενεργοποίηση λήψεων στιγμιότυπων"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Όνομα συστήματος"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Θύρα"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Αυστηρή πολιτική ονοματοδοσίας"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Ενεργοποίηση αυστηρού ελέγχου στα ονόματα χρηστών και ομάδων"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-"Ένα σενάριο που θα κληθεί για την εύρεση του επόμενου ελεύθερου id για "
-"χρήστες ή ομάδες."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Αριθμός βάση για user id"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Τοποθεσία εύρεσης νέου ελεύθερου user id."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Αριθμός βάση για group id"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Τοποθεσία εύρεσης νέου ελεύθερου group id."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται χρήστες."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται ομάδες."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Κλάδος στον οποίο αποθηκεύονται ρόλοι ACL."
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Μέθοδος διανομής id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Μέθοδος για την διανομή user/group id"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Παραδοσιακή"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Αποσφαλμάτωση"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Προβολή σφαλμάτων"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Διάφορα"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
+"Καθορίζει αν μια γραμμή κατάστασης θα εμφανιστεί στο κάτω μέρος των λιστών, "
+"εμφανίζοντας μια σύντομη περίληψη του τύπου και του αριθμού των στοιχείων "
+"στη λίστα."
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "λειτουργία"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
-msgstr "Πότε καλείται αυτή η εντολή"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
-msgstr "Η εντολή που θα κληθεί"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Λειτουργία"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
+msgstr "Πότε καλείται αυτή η εντολή"
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
+msgstr "Η εντολή που θα κληθεί"
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4053,9 +3680,8 @@ msgstr "τμήμα"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4246,7 +3872,7 @@ msgstr "Αφαίρεση χρήστη"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4266,8 +3892,7 @@ msgid "Information"
 msgstr "Πληροφορίες"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Όνομα αυτής της ομάδας"
 
@@ -4291,129 +3916,150 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Προσθήκη χρηστών για το ρόλο"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Διαχείριση ομάδων και ρόλων"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Επεξεργασία ιδιοτήτων ρόλου"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Επεξεργασία ιδιοτήτων posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Εμφάνιση ομάδων χρήστη"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Εμφάνιση αρχικών ομάδων"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Λίστα ρόλων οργανισμών"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Εμφάνιση ομάδων εφαρμογών"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Εμφάνιση αρχικών ομάδων"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Εμφάνιση ομάδων αλληλογραφίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Εμφάνιση ομάδων samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Εμφάνιση ομάδων server"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Εμφάνιση ομάδων σταθμών εργασίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Εμφάνιση ομάδων windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Εμφάνιση ομάδων τερματικού"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Εμφάνιση ομάδων εκτυπωτή"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Εμφάνιση ομάδων τηλεφώνου"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "'Αγνωστος τύπος: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Ανύπαρκτο dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Ομάδα αντικειμένου"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Πληροφορίες ομάδας αντικειμένου"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Ομάδα"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Σύντομη περιγραφή αυτής της ομάδας"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Αντικείμενα μέλους"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Αντικείμενα μέλους για αυτή την ομάδα"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Εμπιστοσύνη συστήματος"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Λειτουργία επιστοσύνης"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Τύπος εξουσιοδότησή για αυτά τα συστήματα"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "απενεργοποιημένο"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Πλήρης Πρόσβαση"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "να επιτραπεί πρόσβαση σε αυτά τα host"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 "Επιτρέπεται σ'αυτή την ομάδα να συνδέεται στην ακόλουθη λίστα διακομιστών"
 
-#: plugins/admin/groups/class_ogroup.inc:319
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -4423,35 +4069,6 @@ msgstr ""
 msgid "List of groups"
 msgstr "Λίστα ομάδων"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr "Πληροφορίες ομάδας POSIX"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr "Ομάδα POSIX"
-
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr "Ομάδα χρηστών POSIX"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Εξαναγκασμός GID"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
-msgstr "Εξαναγκασμός τιμής GID για αυτή την ομάδα"
-
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
-msgstr "Τιμή GID για αυτήν την ομάδα"
-
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Μέλη ομάδας"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4499,10 +4116,6 @@ msgstr "Διάλογος Ανάθεσης ACL"
 msgid "Access control roles assignment dialog"
 msgstr "Διάλογος λίστας ελέγχου ανάθεσης ρόλων"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Λειτουργία"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Αυτό εφαρμόζεται σε ολόκληρο το υποδένδρο ή μόνο στη βάση;"
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index 95b967c0a39acb40ffd8fc51c7097df01788df52..88cbb117494b3ae1df9c5f07d2e72527475c8837 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-04-05 14:21+0200\n"
+"POT-Creation-Date: 2017-04-05 19:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 19b98447b58238f0be8bf3a37e095a8f3eaef8c0..f3add5f86242dde64b74cb19de0d18b931256a75 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -18,74 +18,266 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Selección de idiomas"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permite seleccionar su idioma preferido"
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nombre de la localización"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de conexión"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Conexión TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN del administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Contraseña de administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Estado actual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuración LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Conectividad LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este dialogo realiza la configuración básica de la conectividad LDAP para "
+"FusionDirectory"
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "¡La conexión como usuario '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Reintento"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La conexión anónima al servidor '%s' ha tenido exito."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Refresco"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "¡Por Favor especifique un usuario y contraseña!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Aviso"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Error de configuración"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completado"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Siguiente"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Terminar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Terminar - Escribir el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Escribir archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"El fichero de configuración es universalmente legible. ¡Por favor modifique "
+"los permisos del archivo!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "En estos momentos la configuración no es accesible o no existe."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
+"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
+"mientras que otros usuarios no deben poder."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Comprobaciones de módulos y extensiones PHP"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Comprobación de la instalación"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Comprobación básica de la versión de PHP y las extensiones."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Comprobando la versión de PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP debe ser versión '%s' o superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor actualize a la versión soportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory requiere este modulo para una interfaz internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -93,22 +285,22 @@ msgstr ""
 "FusionDirectory requiere este modulo para comunicarse con distintos tipos de"
 " servidores y protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory requiere este modulo para la integración con Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -116,36 +308,36 @@ msgstr ""
 "FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
 "encripción SSHA"
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requiere este modulo para manejar cadenas unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "modulo de compresión"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requiere esta extensión para manejar capturas."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -155,17 +347,17 @@ msgstr ""
 "globales de tal manera que sean accesible desde scripts sin que cambien su "
 "ámbito. Esto puede ser un problema de seguridad."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Busque 'register_globals' en su php.ini y modifíquelo por 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP usa este valor en el recolector de basura para eliminar las sesiones "
 "antiguas."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -173,40 +365,40 @@ msgstr ""
 "Ajustando este valor a un día impedirá la perdida de sesiones y cookies "
 "antes de que realmente se desconecte por tiempo."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 "Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Off"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr "Busque 'session.auto_start' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -214,22 +406,22 @@ msgstr ""
 "Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
 "opción poniéndola en off para mejorar el rendimiento."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Busque 'implicit_flush' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 "Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -238,145 +430,125 @@ msgstr ""
 "'off'. PHP no debería enviar ningún tipo de información sobre el servidor "
 "que esta ejecutando la aplicación."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Busque 'expose_php' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenido"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenido al asistente de configuración de FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Mensaje de Bienvenida"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Inspección LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analizar el arbol LDAP actual por compatibilidad con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Analizando objetos en la entrada raíz"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Comprobando usuarios invisibles"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Comprobando súper administrador"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Comprobando cuentas fuera del árbol de usuarios"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Comprobando grupos fuera del árbol de grupos"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Comprobando departamentos invisibles"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Comprobando números UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Objeto '%s' de FusionDirectory faltante!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Por favor compruebe su instalación"
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -385,47 +557,31 @@ msgstr ""
 "No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
 "intente añadir la clase de objeto '%s' manualmente."
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Aviso"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -434,322 +590,132 @@ msgstr ""
 "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
 "incompletos."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Crear"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Roles"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Crear"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios al árbol de usuarios configurado"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1375
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nombre de la localización"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de conexión"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Conexión TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN del administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Contraseña de administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Estado actual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuración LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Conectividad LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Este dialogo realiza la configuración básica de la conectividad LDAP para "
-"FusionDirectory"
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "¡La conexión como usuario '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Reintento"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "La conexión anónima al servidor '%s' ha tenido exito."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Refresco"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "¡Por Favor especifique un usuario y contraseña!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Terminar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Terminar - Escribir el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Escribir archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"El fichero de configuración es universalmente legible. ¡Por favor modifique "
-"los permisos del archivo!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "En estos momentos la configuración no es accesible o no existe."
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
-"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
-"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
-"mientras que otros usuarios no deben poder."
-
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Error de configuración"
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Completado"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenido al asistente de configuración de FusionDirectory"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Siguiente"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Mensaje de Bienvenida"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -769,17 +735,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡Se ha indicado un objectType vacio o no válido!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Enviar"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Arriba"
 
@@ -806,24 +772,19 @@ msgstr "Seleccione todos"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -832,70 +793,70 @@ msgstr "Error"
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
@@ -913,9 +874,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error en la configuración"
@@ -942,27 +903,27 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permisos"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -970,8 +931,10 @@ msgstr "Inicio"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
@@ -999,7 +962,7 @@ msgstr ""
 "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
 "ejecutando '%s'"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1007,35 +970,35 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
 "desarrolladores!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1044,12 +1007,12 @@ msgstr ""
 "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte"
 " con su Administrador!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1057,12 +1020,12 @@ msgstr ""
 "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
 "Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1071,215 +1034,166 @@ msgstr ""
 "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
 "si se supera el límite máximo"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Entradas por página"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No puedo obtener información de esquemas del servidor. ¡No es posible "
 "comprobar los esquemas!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "No se puede asignar un identificador (ID) libre:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "¡%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "¡sambaUnixIdPool no es único!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "¡No hay ID disponibles!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "¡Excedido el número de intentos máximo!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "¡No se puede asignar un identificador (ID) libre!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
 "solucionarlo"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
@@ -1292,52 +1206,48 @@ msgstr "Por favor solucione el problema y actualize la página."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "No se puede conectar a LDAP: Por favor consulte con el administrador de "
 "sistemas."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
-"está activo."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"La funcionalidad de instancias esta activa, pero no se encuentra el módulo "
-"de compresión requerido. Por favor instale '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -1360,7 +1270,7 @@ msgstr "Seleccione para mostrar objetos que tengan '%s' activado"
 msgid "Select to search within subtrees"
 msgstr "Seleccione para buscar dentro de los subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
@@ -1570,52 +1480,46 @@ msgstr "¡'%s' debe ser %d o superior!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "¡'%s' depende de '%s' - Por favor introduzca ambos valores!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
-#, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "¡Ya existe una entrada con el atributo '%s' en el sistema!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "¡El campo obligatorio '%s' está vacio!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' no está permitido:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "¡'%s' no están permitidos!"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1623,27 +1527,27 @@ msgstr "¡Extensión PHP %s no encontrada!"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Guardar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Añadir"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1651,31 +1555,31 @@ msgstr "Añadir %s"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1684,7 +1588,7 @@ msgstr ""
 "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1693,7 +1597,7 @@ msgstr ""
 "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
 "necesita eliminar las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1702,7 +1606,7 @@ msgstr ""
 "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1711,184 +1615,191 @@ msgstr ""
 "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
 "necesita añadir las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' esta todavía en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' esta todavía en uso por los objetos: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1897,37 +1808,37 @@ msgstr ""
 "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
 "el archivo de configuración!"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1936,7 +1847,7 @@ msgstr ""
 "No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
 "faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr "¡La base introducida no es válida, se ha dejado el valor anterior!"
@@ -1978,7 +1889,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2077,37 +1987,37 @@ msgstr "mientras operaba en el servidor LDAP '%s'"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2120,11 +2030,10 @@ msgstr "Por favor seleccione las entradas que desee"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2132,13 +2041,12 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descripción"
@@ -2190,8 +2098,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2253,37 +2161,38 @@ msgstr "días"
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -2315,28 +2224,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2381,8 +2295,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Enviar"
 
@@ -2391,7 +2305,7 @@ msgstr "Enviar"
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2402,7 +2316,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2476,6 +2390,10 @@ msgstr "¡Entrada desconocida '%s'!"
 msgid "All users"
 msgstr "Todos los usuarios"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2549,37 +2467,32 @@ msgstr "¡Por favor introduzca una contraseña!"
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2593,45 +2506,45 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2703,225 +2616,8 @@ msgstr "¡Bienvenido %s!"
 msgid "References"
 msgstr "Referencias"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Editar parametros de usuarios POSIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Directorio de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "Sin configurar"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Grupo primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Pertenencia a grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Cuenta"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-"El usuario debe introducir la contraseña en el primer inicio de sesión"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Sistema de seguridad"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Modo seguro"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "desactivado"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "Acceso sin restricciones"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "Permitir el acceso a estos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "Periodo de gracia activado"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "la contraseña expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "no puede cambiar la contraseña"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2948,7 +2644,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2985,259 +2681,279 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Provincia"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nombre a Mostrar"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Categoría profesional"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Gestor"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Código Postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 "La contraseña actual y la introducida como nueva son demasiado parecidas."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "La nueva contraseña es demasiado corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -3345,36 +3061,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Atributo de inicio de sesión"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Asunto"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Enlace de recuperación de clave"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3386,31 +3112,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Recuperación de clave realizada con exito"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3459,539 +3185,452 @@ msgstr "Tema"
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
-msgstr "Zona de uso horario"
-
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr "Zona de uso horario"
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activar instantaneas"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base de instantaneas"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Parámetros de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Usar caducidad de cuenta"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Mostrar resumen en listados"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Atributo de inicio de sesión"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activar instantaneas"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base de instantaneas"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modo"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "Métodos"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4090,9 +3729,8 @@ msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4281,7 +3919,7 @@ msgstr "Eliminar usuario"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4301,8 +3939,7 @@ msgid "Information"
 msgstr "Información"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4326,164 +3963,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar características posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de seguridad"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo seguro"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desactivado"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acceso sin restricciones"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Forzar GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Miembros del grupo"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4532,10 +4161,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index b2fb135c20bcc9927627c5946f7cbf89d201e12f..24178585eaf3246f8de531911207153189b46876 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -18,20 +18,20 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Idioma de instalación"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permitirá elegir su lenguaje preferido."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
@@ -41,16 +41,215 @@ msgstr ""
 " 'automático'  se utilizará el lenguaje del navegador. Ésta opción puede ser"
 " cambiada por el usuario."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automático"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Ubicación"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+"Nombre de esta conexión para mostrar en la lista de servidores de LDAP."
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de conexión"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr "URI para contactar al servidor LDAP. Usualmente comienza con ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Conexión TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr "¿Debería usarse TLS para conectarse a este servidor LDAP?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "El directorio base de LDAP"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"DN de la cuenta admin para conectarse a LDAP. La base se añade "
+"automáticamente."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN para el Administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Contraseña de Administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr "Contraseña para la cuenta de Administrador que será vinculada a LDAP."
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Estado Actual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+"Resultado del último intento al revisar la vinculación con LDAP y los "
+"esquemas básicos."
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuración de LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configuración de conexión LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este mensaje muestra una configuración básica de la conectividad de LDAP con"
+" FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "¡La vinculación anónima al servidor %s ha fallado!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Falló la vinculación con el usuario '%s'"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "¡La vinculación anónima al servidor %s ha funcionado!"
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "¡Por favor especifique su usuario y contraseña!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "¡Ha funcionado la vinculación del usuario '%s' al servidor '%s'!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Precacuión"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Error en la configuración"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completado"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Siguiente"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finalizar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Finalizar - Crear el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Crear el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Su archivo de configuración no debería tener permisos de lectura para todos "
+"los usuarios. ¡Por favor actualice los permisos!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+"No se puede acceder al archivo de configuración porque no existe o no tiene "
+"permisos de lectura sobre él."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Después de descargar y colocar el archivo en %s, por favor verifique que el "
+"usuario con el cual está ejecutándose el servidor web tiene acceso a %s. "
+"Otros usuarios no deberían tener acceso."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Verificación de extensiones y módulos PHP "
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
@@ -58,39 +257,39 @@ msgstr ""
 "Configuración de la instalación de PHP (<a href=\"?info\" "
 "target=\"_blank\">Mostrar información</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Revisión de la instalación"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Revisión básica de Extensiones PHP y compatibilidad"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Revisando la versión PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP debe tener una versión %s o superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor actualice a una versión soportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory requiere este módulo para comunicarse con su servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory requiere este módulo para una inferfaz internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -98,22 +297,22 @@ msgstr ""
 "FusionDirectory requiere este módulo para comunicarse con diferentes tipos "
 "de servidores y protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory necesita éste módulo para la integración con Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -121,36 +320,36 @@ msgstr ""
 "FusionDirectory requiere el módulo 'mhash' o bien 'sha1' para usar "
 "encripción por SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory requiere este módulo para comunicarse con un servidor IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requiere este módulo para manejar strings unicoide."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "módulo de compresión"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requiere esta extensión para manejar snapshots."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -160,18 +359,18 @@ msgstr ""
 "globales y que puedan accederse mediante scripts sin cambiar el foco. Esto "
 "puede ser un riesgo de seguridad."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Buscar por 'register_globals' en su archivo php.ini y cámbielo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP utiliza este valor para que el colector de basura borre las sesiones "
 "obsoletas."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -179,7 +378,7 @@ msgstr ""
 "Configurando este valor a 'un día' prevendrá perder sesiones y cookies antes"
 " de que realmente expiren."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -187,12 +386,12 @@ msgstr ""
 "Buscar por  'session.gc_maxlifetime' en su archivo php.ini y configurarlo a "
 "86400 o superior."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Apagado"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -200,12 +399,12 @@ msgstr ""
 "Para utilizar FusionDirectory sin problemas la opción session.auto_start  en"
 " su archivo php.ini debe estar configurada en 'Off'."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Buscar  'session.auto_start'  en su archivo php.ini y configurarlo en 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -214,14 +413,14 @@ msgstr ""
 "que esto ¡puede causar errores que no son reproducibles! aumente la memoria "
 "para instalaciones grandes."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "Buscar 'memory_limit' en su archivo php.ini y configurarlo con '128MB' o "
 "superior."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -229,16 +428,16 @@ msgstr ""
 "Esta opción afecta el manejo de la salida PHP. Deshabilitar esta opción con "
 "'off' mejorará el rendimiento."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 "Busca 'omplicit_flush' en su archivo php.ini y lo establece como 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "El tiempo de ejecución debería ser al menos de 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -246,7 +445,7 @@ msgstr ""
 "Busca 'max_execution_time' en su archivo php.ini y lo establece como '30' o "
 "superior."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -254,17 +453,17 @@ msgstr ""
 "Incrementa la seguridad del servidor estableciendo 'expose_php' como 'Off'. "
 "PHP no enviará información de su  servidor en este caso."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Busca 'expose_php' en su archivo php.ini y lo establece como 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Incrementa el rendimiento del servidor estableciendo 'magic_quotes_gpc' como"
 " 'Off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -272,41 +471,28 @@ msgstr ""
 "Busca  'zend.ze1_compatibility_mode' en su archivo php.ini y lo establece "
 "como 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenido"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenido al asistente de configuración de FusionDirectory."
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Mensaje de bienvenida"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Revisión de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Se va a analizar la compatibilidad entre LDAP y FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Otorgar todos los permisos en usuarios que pertenezcan a dicha rama."
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
@@ -314,91 +500,84 @@ msgstr ""
 "Permitir a los usuarios editar su propia información (Pestaña de Inicio y "
 "posix, usar únicamente en base)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 "Permitir a los usuarios editar su propia contraseña (Solo en las pestañas "
 "POSIX e Inicio)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Revisar las clases del objeto 'root'"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Revisar los permisos para la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Revisar si existen Divisiones ocultas"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Falló"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "¡No se encuentra el objeto clase '%s' de FusionDirectory!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Por favor verifique su instalación."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -407,51 +586,35 @@ msgstr ""
 "No es posible utilizar el tipo de objeto estructurado de su objeto 'root'. "
 "Por favor intente agregar el objeto clase '%s' manualmente."
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 "El usuario \"%s\" especificado no tiene acceso completo a la base de datos "
 "LDAP."
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 "El usuario \"%s\" especificado no tiene acceso completo a la base de datos "
 "ldap."
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Precacuión"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -460,332 +623,132 @@ msgstr ""
 "Se encontraron %s usuario(s) que no estarán visibles en FusionDirectory o "
 "que están incompletos."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Migración de Usuario"
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "No se puede migrar la entrada \"%s\":"
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Se encontraron cuentas administrativas de FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Se encontraron grupos administrativos de FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-"Usted debe ejecutar <i>fusiondirectory-setup-migrate-acls</i> después de "
-"salvar su archivo de configuración al terminar la configuración general para"
-" migrarlo. <br/>"
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr "No hay un administrador válido de FusionDirectory 1.0.8  en su LDAP."
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Crear"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr ""
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador de FusionDirectory en su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Crear"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Dar permisos en todos los objetos."
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "Los roles ACL por defecto no han sido insertados"
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "No se encuentran algunos de los roles ACL por defecto"
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "Los roles ACL por defecto han sido insertados"
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "No es posible agregar el rol ACL \"%s\":"
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "Se encontraron %s usuario(s) fuera del árbol configurado \"%s\"."
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios dentro del árbol configurado"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr "¡No se pueden mover entradas en la División seleccionada!"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "La entrada será movida desde "
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias serán actualizadas"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
-msgstr "Se encontraron %s grupos fuera del árbol configurado '%s'."
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr "Mover grupos dentro del árbol configurado"
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"Se encontraron %s Division(es) que no serán visibles en FusionDirectory."
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr "Migración de Divisiones."
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Ubicación"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-"Nombre de esta conexión para mostrar en la lista de servidores de LDAP."
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de conexión"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr "URI para contactar al servidor LDAP. Usualmente comienza con ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Conexión TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "¿Debería usarse TLS para conectarse a este servidor LDAP?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "El directorio base de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-"DN de la cuenta admin para conectarse a LDAP. La base se añade "
-"automáticamente."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN para el Administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Contraseña de Administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr "Contraseña para la cuenta de Administrador que será vinculada a LDAP."
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Estado Actual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-"Resultado del último intento al revisar la vinculación con LDAP y los "
-"esquemas básicos."
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuración de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configuración de conexión LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Este mensaje muestra una configuración básica de la conectividad de LDAP con"
-" FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "¡La vinculación anónima al servidor %s ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Falló la vinculación con el usuario '%s'"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "¡La vinculación anónima al servidor %s ha funcionado!"
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "¡Por favor especifique su usuario y contraseña!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "¡Ha funcionado la vinculación del usuario '%s' al servidor '%s'!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finalizar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Finalizar - Crear el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Crear el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"Su archivo de configuración no debería tener permisos de lectura para todos "
-"los usuarios. ¡Por favor actualice los permisos!"
+msgstr "Se encontraron %s grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
+msgstr "Mover grupos dentro del árbol configurado"
+
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
-"No se puede acceder al archivo de configuración porque no existe o no tiene "
-"permisos de lectura sobre él."
+"Se encontraron %s Division(es) que no serán visibles en FusionDirectory."
+
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
+msgstr "Migración de Divisiones."
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
-"Después de descargar y colocar el archivo en %s, por favor verifique que el "
-"usuario con el cual está ejecutándose el servidor web tiene acceso a %s. "
-"Otros usuarios no deberían tener acceso."
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Error en la configuración"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Completado"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenido al asistente de configuración de FusionDirectory."
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Siguiente"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Mensaje de bienvenida"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -805,17 +768,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡El objectType especificado está vacío o es inválido!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Enviar"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Arriba"
 
@@ -842,24 +805,19 @@ msgstr "Seleccionar todo"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -868,70 +826,70 @@ msgstr "Error"
 msgid "created by"
 msgstr "creado por"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Ir a la División raíz"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Subir una División"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr "Ir a la División del usuario"
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Refrescar lista"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Cortar"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Cortar esta entrada"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Restaurar 'snapshots'"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaurar 'snapshot'"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Crear 'snapshot'"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Crear un nuevo 'snapshot' de este objeto"
 
@@ -951,9 +909,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error de configuración"
@@ -979,27 +937,27 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "El canal requerido no existe. Por favor contacte a su administrador."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permisos"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "No se puede pegar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -1007,8 +965,10 @@ msgstr "Usuario"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
@@ -1034,7 +994,7 @@ msgstr ""
 "Error fatal: No se puede ejemplificar la clase '%s' - intente ejecutar '%s' "
 "para arreglar esto."
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1042,12 +1002,12 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATAL: Error conectándose a LDAP. El servidor dijo: '%s'"
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -1055,11 +1015,11 @@ msgstr ""
 "¡Login (uid) no es un valor único en el árbol LDAP!. Por favor contacte a su"
 " administrador."
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -1067,11 +1027,11 @@ msgstr ""
 "Al parecer tu contraseña expiró. Por favor acceda a<a "
 "href=\"recovery.php\">Recuperar contraseña</a> y cámbiela."
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Error mientras agregando un bloqueo. ¡Contacte a los desarrolladores!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1080,12 +1040,12 @@ msgstr ""
 "No se puede crear un bloqueo de información en el árbol de 'LDAP'. ¡Por "
 "favor contacte a su administrador!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP respondió: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1093,97 +1053,89 @@ msgstr ""
 "Se encontraron varios 'locks' en el objeto lo cual impide bloquearlo. Esto "
 "no debería suceder - borrando varias referencias."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuar de todos modos"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar de todos modos"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Usted está a punto de editar las entradas de LDAP: %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Resultados por página"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1192,64 +1144,60 @@ msgstr ""
 "El archivo '%s' no se puede borrar. Intente ejecutar fusiondirectory-setup-"
 "check-directories para arreglar los permisos."
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP - Advertencia"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No se puede traer información del 'schema' desde el servidor. ¡No se puede "
 "validar el schema'"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -1257,13 +1205,13 @@ msgstr ""
 "Usted ha instalado el plugin 'Mixed Groups', pero la configuración de su "
 "esquema no lo soporta."
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -1271,55 +1219,18 @@ msgstr ""
 "Su esquema tiene configurado soporte para 'Mixed Groups', pero este plugin "
 "no está presente."
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "!sambaUnixIdPool no es un valor único!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "No se encuentra el archivo '%s' - por favor ejecute '%s' para  arreglar "
 "esto."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
@@ -1332,52 +1243,48 @@ msgstr "Por favor solucione el error anterior y recargue la página."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "La Zona Horaria \"%s\" en su configuración no es válida."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "No se puede contactar a LDAP. Por favor contacte al adminsitrador del "
 "sistema."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"La característica 'snapshot' está habilitada, pero la variable '%s' "
-"requerida no está configurada."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"La funcionalidad de 'snapshot' está habilitada, pero el módulo de compresión"
-" requerido no se encuentra. Por favor instale '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -1400,7 +1307,7 @@ msgstr "Elegir para listar todos los objetos que posean '%s' habilitado."
 msgid "Select to search within subtrees"
 msgstr "Seleccione para buscar dentro de subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
@@ -1609,52 +1516,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1662,27 +1563,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Salvar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Agregar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Agregar %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1690,31 +1591,31 @@ msgstr "Agregar %s"
 msgid "Delete"
 msgstr "Borrar"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Borrar %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta no tiene extensiones %s válidas!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1723,7 +1624,7 @@ msgstr ""
 "Ésta cuenta tiene %s configuraciones habilitadas. Usted puede "
 "deshabilitarlas haciendo clic debajo."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1732,7 +1633,7 @@ msgstr ""
 "Ésta cuenta tiene  %s configuraciones habilitadas. ¡Para deshabilitarlas "
 "deberá borrar el %s de configuraciones primero!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1741,7 +1642,7 @@ msgstr ""
 "Ésta cuenta tiene %s configuraciones deshabilitadas. Usted puede "
 "habilitarlas haciendo clic debajo."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1750,221 +1651,228 @@ msgstr ""
 "Ésta cuenta tiene %s configuraciones deshabilitadas. ¡Para habilitarlas "
 "usted deberá agregar el %s de configuraciones primero!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Agregar %s configuraciones "
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Borrar %s configuraciones "
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "leer operación"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "agregar operación"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modificar operación"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "borrar operación"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "buscar operación"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s falló!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "¡La operación en LDAP ha fallado!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "¡La subida del archivo ha fallado!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "¡La subida del archivo: %s ha fallado!"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Falló la comunicación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "¡Falló la comunicación con el servicio de infraestructura: %s!"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Este '%s' sigue en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Este '%s' sigue en uso."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "No se puede eliminar el archivo '%s'!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede borrar el directorio '%s'!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1973,7 +1881,7 @@ msgstr ""
 "No se puede inicializar la clase '%s'! ¿Quizás hay algún plugin mal "
 "instalado en su configuración de FusionDirectory?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -2015,7 +1923,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Snapshots"
 
@@ -2113,37 +2020,37 @@ msgstr "mientras se realizan operaciones en el servidor LDAP %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open falló al ejecutar ldapsearch"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2156,11 +2063,10 @@ msgstr "Por favor elija las entradas que desea"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2168,13 +2074,12 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descripción"
@@ -2226,8 +2131,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2289,37 +2194,38 @@ msgstr "días"
 msgid "From template"
 msgstr "A partir de plantilla"
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr "%s plantilla"
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Error al filtrar"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Usted no tiene permitido crear un 'snashot' para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Usted no está autorizado para restaurar un 'snapshot' para %s"
@@ -2353,28 +2259,33 @@ msgstr ""
 "No es posible calcular dn: No se encuentra el objectType infos desde la "
 "pestaña clase \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Ya existe una entrada con el mismo dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "La entrada %s no existe"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Pestaña \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2419,8 +2330,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Subir"
 
@@ -2429,7 +2340,7 @@ msgstr "Subir"
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2440,7 +2351,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
@@ -2516,6 +2427,10 @@ msgstr "¡Entrada desconocida '%s'!"
 msgid "All users"
 msgstr "Todos los usuarios"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2592,36 +2507,31 @@ msgstr "¡Por favor especifique su contraseña!"
 msgid "Please check the username/password combination."
 msgstr "Por favor verifique su combinación de usuario/contraseña"
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. ¡Por favor contacte a su administrador!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2636,45 +2546,45 @@ msgstr ""
 "La configuración %s/%s de FusionDirectory no tiene permisos de lectura. "
 "Abortado."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "No se encontró la cuenta de usuario: \"%s\""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Se encontraron varias cuentas identificadas como: \"%s\""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contacte a su administrador, hubo un problema con el servidor de correo."
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Este token es inválido"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Hay un problema con el servidor de correo, la confirmación de email no será "
@@ -2750,235 +2660,8 @@ msgstr "¡Bienvenido  %s!"
 msgid "References"
 msgstr "Referencias"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Editar configuración POSIX de los usuarios"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "'Home' del usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "La ruta al nuevo directorio 'home' del usuario."
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr "Qué 'shells' deberían usarse cuando este usuario inicie sesión."
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "Aún sin configurar"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Grupo Primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Grupo primario para este usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Estado de la cuenta Unix de este usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr "Forzar 'id' de usuario/grupo "
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr "Forzar los valores 'id' y 'group id' para éste usuario."
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr "id de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr "Forzar valor 'id' para este usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr "id de Grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr "Forzar valor 'Group id' para este usuario."
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Pertenencia a grupos"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Cuenta de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "El usuario debe cambiar su contraseña en el primer inicio de sesión."
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-"El usuario debe cambiar su contraseña en el primer inicio de sesión "
-"(necesita un valor de retraso antes de forzar el cambio de contraseña)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Retraso antes de forzar el cambio de contraseña (días)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"El usuario será forzado a cambiar su contraseña después de este número de "
-"días (deje vacío para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Fecha de caducidad para la contraseña"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"La fecha tras la cual la contraseña de este usuario va a caducar (deje vacío"
-" para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Retraso de inactividad antes de deshabilitar el usuario (días)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Luego de que caduque la contraseña del usuario, tiempo máximo de retraso "
-"antes de deshabilitar la cuenta del usuario (deje vacío para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-"Retraso para avisar al usuario sobre el vencimiento de su contraseña (días)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"El usuario será advertido esta cantidad de días antes de que su contraseña "
-"caduque (deje vacío para deshabilitar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Confianza del Sistema"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Modo de Confianza"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Tipo de autorización para ésos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "deshabilitado"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "Acceso Completo"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "Permitir acceso a ésos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Permitir a este usuario conectarse a esta lista de hosts."
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "expirado"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "Período de gracia activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "Contraseña expirada"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "Contraseña no modificable"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr "Grupo del usuario %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Grupos y Roles"
 
@@ -3005,7 +2688,7 @@ msgid "Password hash method to use"
 msgstr "Tipo de 'hash' para la contraseña"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -3042,163 +2725,167 @@ msgstr "Información de Cuentas de Usuario"
 msgid "User account"
 msgstr "Cuenta de Usuario"
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Apellido de este usuario"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Primer nombre"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Primer nombre de este usuario"
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Descripción corta para éste usuario"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Imagen"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "El avatar para este usuario"
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Información de contacto Profesional"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Ubicación"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Dirección postal de trabajo"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Habitación Nro."
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Número telefónico de trabajo"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Celular de trabajo"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Bíper"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Bíper laboral"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Nro. Fax de trabajo"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página web"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Página web personal"
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Información de cuenta"
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Cuenta de este usuario"
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Contraseña del usuario"
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Información de contacto 'Personal'"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Dirección personal"
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Código postal"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Teléfono de domicilio personal"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Información Profesional"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Tratamiento 'Sr, Sra...'"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3206,78 +2893,94 @@ msgstr ""
 "Tratamiento 'Dr, Ing, Sr, Sra ...' en un contexto profesional. Cada "
 "tratamiento es un valor de sus múltiples atributos."
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "División No."
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número de División"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Empleado N°"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Mánager"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "¡No se pudo encontrar la política \"%s\" en LDAP!"
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Usted no tiene permitido cambiar su propia contraseña."
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 "Usted debe esperar %d segundos antes de cambiar su contraseña de nuevo."
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "La contraseña está en el historial de viejas contraseñas."
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "La contraseña no será cambiada por este valor"
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Usted debe especificar su contraseña actual para poder proceder."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3285,20 +2988,20 @@ msgstr ""
 "Las contraseñas que usted ingresó como \"Nueva contraseña\" y \"Repetir "
 "nueva contraseña\" no coinciden."
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "La contraseña anterior y la nueva son muy parecidas."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "La contraseña nueva es muy corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "La contraseña posiblemente contiene caracteres 'Unicoide' que son "
@@ -3413,29 +3116,39 @@ msgstr ""
 "Los usuarios también podrán una dirección alternativa para recuperar su "
 "contraseña."
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Cuenta de Usuario"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Correo principal"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Asunto"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Asunto del correo principal"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Enlace para recuperar contraseña"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr "Mensaje (primer %s es Cuenta de usuario,  el segundo es 'Enlace')"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3445,7 +3158,7 @@ msgstr ""
 "contraseña. Utilice %s para la cuenta de usuario y el enlace de recuperación"
 " de contraseña."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3457,24 +3170,24 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Email secundario"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Asunto del email secundario"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] ¡Recuperación de contraseña satisfactoria!"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Mensaje (%s es cuenta de usuario)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3483,7 +3196,7 @@ msgstr ""
 "Mensaje del segundo correo enviado al confirmar el cambio de contraseña. "
 "Utilice %s para la cuenta de usuario."
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3543,61 +3256,108 @@ msgstr "Zona Horaria"
 msgid "Timezone to be used"
 msgstr "Zona Horaria a utilizar"
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Configuración del esquema 'LDAP'"
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr "Configuración del 'Núcleo'"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Tamaño límite LDAP"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr "Determine cuántas entradas se traerán de LDAP por defecto."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Editar bloqueo"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Mientras tanto, revisar si una entrada que está siendo editada ha sido "
+"modificada desde fuera de FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Habilitar escritura de logs"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Escritura de eventos en logs de FusionDirectory"
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr "Validación del esquema 'LDAP'"
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 "Habilita la validación del esquema 'LDAP' durante el inicio de sesión."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Habilitar snapshots"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Permite que usted salve ciertos estados o entradas para luego restaurarlas."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base para Snapshot "
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "La base donde los snapshots deberían ser almacenados dentro de LDAP."
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Configuraciones de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "'hash' de contraseña por defecto."
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "'hash' por defecto"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Forzar 'hash' por defecto"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Forzar el uso del 'hash' de Contraseña por defecto."
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Longitud mínima de contraseña"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Longitud máxima de contraseña para usuarios"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Diferencia mínima entre contraseñas"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 "Cantidad mínima de caracteres distintos a partir de la última contraseña"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Expiración de la cuenta de usuario"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -3606,81 +3366,33 @@ msgstr ""
 "sesión en FusionDirectory y fuerza la renovación de contraseña o bloqueo de "
 "cuenta."
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Valor que será almacenado en el atributo 'userPassword'"
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Configuración del 'Núcleo'"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Muestra un resumen en los listados."
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Determina cuando una barra de estado será mostrada al final de listas, en un"
-" resumen corto y cantidad de elementos en la lista."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Editar bloqueo"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Mientras tanto, revisar si una entrada que está siendo editada ha sido "
-"modificada desde fuera de FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Habilitar escritura de logs"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Escritura de eventos en logs de FusionDirectory"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Tamaño límite LDAP"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Determine cuántas entradas se traerán de LDAP por defecto."
-
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Cuenta de Usuario y sesión"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Cuenta de Usuario"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Que atributo LDAP debería usarse como 'cuenta de usuario' en el inicio de "
 "sesión."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forzar las conexiones encriptadas"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3688,301 +3400,211 @@ msgstr ""
 "Habilita revisiones de seguridad con PHP para forzar el acceso encriptado "
 "(https) en la interfaz web."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Alertar si la sesión no se encuentra encriptada"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "mostrará un mensaje de advertencia al usuario cuando se utilice http en vez "
 "de https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Tiempo de vida de la sesión "
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Habilitar snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-"Permite que usted salve ciertos estados o entradas para luego restaurarlas."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base para Snapshot "
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "La base donde los snapshots deberían ser almacenados dentro de LDAP."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Ruta de la llave "
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 "Ruta donde se encuentra la llave de FusionDirectory. Por el momento, sin "
 "uso."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Ruta del certificado"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr "Ruta donde se encuentra el certificado. Por el momento, sin uso."
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Path del certificado CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Ruta del certificado CA. Se utiliza para validar el equipo con el 'Servidor "
 "Argonaut'."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Equipo"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Almacenamiento de 'Usuarios' y 'Grupos'"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Atributo DN para 'Usuarios'"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Atributo al inicio del \"dn\" de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Patrón para CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr "Este es el patrón que se usará para crear el campo de 'nombre común'"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Politica de nombres"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Habilita la validación estricta de nombres para usuarios o grupos."
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr "Grupo/usuario min id"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-"El número 'id' mínimo asignable a un usuario o grupo para evitar fallas de "
-"seguridad como cuentas de usuario con id '0'."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Siguiente id hook"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-"Un script que buscará el siguiente número \"id\" libre para usuarios o "
-"grupos."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Número base para 'id' de usuario"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Dónde buscar un id libre de usuario."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Número base para 'id' de grupo"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Dónde buscar un id libre de grupo"
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Usuarios RDN"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "La rama donde los usuarios están guardados."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Grupos RDN"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "La rama donde se guardan los grupos."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "ACL Rol RDN"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "La rama donde los rol ACL están almacenados."
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Método para asignar 'ids'"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Método para asignar 'ids' de grupo/usuario"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradicional"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Samba unix id pool"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Pool user id min"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
-"Valor mínimo para el valor 'id' del usuario cuando utilice el método 'pool'"
 
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Pool user id max"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
-"Valor máximo para el valor 'id' del usuario cuando utilice el método 'pool'"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Pool group id min"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Valor mínimo para id de 'grupo' cuando se utilice el método 'pool'"
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
-msgstr "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Valor máximo para el group id cuando se utilice el método pool."
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Rastreo de errores"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Mostrar errores"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3991,11 +3613,11 @@ msgstr ""
 "estar deshabilitado en entornos productivos, ya que, en algunos casos "
 "podrían mostrarse contraseñas allí."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo máximo de consultas LDAP."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -4003,11 +3625,11 @@ msgstr ""
 "Detenga las acciones sobre LDAP si no hay respuesta después del tiempo "
 "especificado en segundos."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Escribir logs de las estadísticas LDAP."
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -4015,55 +3637,89 @@ msgstr ""
 "Registrar estadísticas de tiempo de LDAP en 'syslog'. Esto puede ser útil "
 "para encontrar problemas o filtros de búsqueda erróneos."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel del 'Rastreo de Errores'"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Mostrar determinados datos en cada página de carga."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Muestra un resumen en los listados."
+
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+"Determina cuando una barra de estado será mostrada al final de listas, en un"
+" resumen corto y cantidad de elementos en la lista."
+
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr "Mostrar pestaña de ACL en todos los objetos."
+
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+"Para el uso de permisos ACLs muy específicos usted podría requerir dar "
+"acceso en un objeto particular."
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks"
+msgstr "Hooks"
+
+#: plugins/config/class_configInLdap.inc:387
 msgid "Hooks that are called when specific actions happens"
 msgstr "'Hooks' que son llamados cuando suceden acciones específicas."
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "Pestaña"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:391
 msgid "The tab that this hook concerns"
 msgstr "La pestaña que corresponde a este 'hook'"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "modo"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:396
 msgid "When to call this command"
 msgstr "Cuándo llamar este comando"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:403
 msgid "The command that will be called"
 msgstr "La línea de comandos que será usada"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Hooks"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:417
 msgid "Display hook output"
 msgstr "Mostrar la salida del 'hook'"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:418
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -4071,42 +3727,6 @@ msgstr ""
 "Si se  habilita, cuando un 'hook' termine exitosamente se mostrará una "
 "ventana de diálogo al usuario."
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Shells disponibles"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Shells POSIX disponibles para usuarios de FD."
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Mostrar pestaña de ACL en todos los objetos."
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
-"Para el uso de permisos ACLs muy específicos usted podría requerir dar "
-"acceso en un objeto particular."
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr ""
-
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
 msgstr "Plugins"
@@ -4207,9 +3827,8 @@ msgstr "división"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4400,7 +4019,7 @@ msgstr "Borrar usuario"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4420,8 +4039,7 @@ msgid "Information"
 msgstr "Información"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Nombre de este grupo"
 
@@ -4445,129 +4063,150 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Agregar usuarios al rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Administrar grupos y roles"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Editar propiedades de Rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar propiedades posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Mostrar grupos del usuario"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Mostrar roles de Profesionales"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Mostrar grupos de aplicación"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Mostrar grupos de servidores"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Mostrar grupos de estaciones de trabajo"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Mostrar grupos de Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Mostrar grupos de Terminales"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Mostrar grupos de impresión"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Mostrar grupos de teléfono"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Tipo desconocido: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "¡dn: %s Inexsitente!"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objeto grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Datos del 'objeto grupo'"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "GRupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Una descripción corta de este grupo."
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objetos miembro"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objetos miembro de este grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Confianza del Sistema"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo de Confianza"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Tipo de autorización para ésos equipos"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "deshabilitado"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acceso Completo"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir acceso a ésos equipos"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 "Habilitar solamente a éste grupo para conectarse a ésta lista de equipos."
 
-#: plugins/admin/groups/class_ogroup.inc:319
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -4578,35 +4217,6 @@ msgstr ""
 msgid "List of groups"
 msgstr "Lista de Grupos"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr "Información de Grupo POSIX"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr "Grupo POSIX"
-
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr "Grupo de Usuarios POSIX"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Forzar GID"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
-msgstr "Forzar GID para éste grupo"
-
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
-msgstr "Valor GID para éste grupo"
-
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Miembros del Grupo"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4654,10 +4264,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr "Panel de gestión de roles ACL"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "¿Se aplicará en todo el subárbol o solo en la base?"
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index ab0b1033131d900e669fb809ce0c3eedd0bb4271..977624373eb4347ec158b02bca918f0ec0a7b4b3 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -18,74 +18,266 @@ msgstr ""
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Selección de idiomas"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permite seleccionar su idioma preferido"
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nombre de la localización"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de conexión"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Conexión TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN del administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Contraseña de administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Estado actual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuración LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Conectividad LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este dialogo realiza la configuración básica de la conectividad LDAP para "
+"FusionDirectory"
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "¡La conexión como usuario '%s' ha fallado!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Reintento"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La conexión anónima al servidor '%s' ha tenido exito."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Refresco"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "¡Por Favor especifique un usuario y contraseña!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Aviso"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Error de configuración"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completado"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Siguiente"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Terminar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Terminar - Escribir el archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Escribir archivo de configuración"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"El fichero de configuración es universalmente legible. ¡Por favor modifique "
+"los permisos del archivo!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "En estos momentos la configuración no es accesible o no existe."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
+"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
+"mientras que otros usuarios no deben poder."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Comprobaciones de módulos y extensiones PHP"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Comprobación de la instalación"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Comprobación básica de la versión de PHP y las extensiones."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Comprobando la versión de PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP debe ser versión '%s' o superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor actualize a la versión soportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory requiere este modulo para una interfaz internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -93,22 +285,22 @@ msgstr ""
 "FusionDirectory requiere este modulo para comunicarse con distintos tipos de"
 " servidores y protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory requiere este modulo para la integración con Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -116,36 +308,36 @@ msgstr ""
 "FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
 "encripción SSHA"
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requiere este modulo para manejar cadenas unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requiere esta extensión para manejar imágenes."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "modulo de compresión"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requiere esta extensión para manejar capturas."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -155,17 +347,17 @@ msgstr ""
 "globales de tal manera que sean accesible desde scripts sin que cambien su "
 "ámbito. Esto puede ser un problema de seguridad."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Busque 'register_globals' en su php.ini y modifíquelo por 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP usa este valor en el recolector de basura para eliminar las sesiones "
 "antiguas."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -173,19 +365,19 @@ msgstr ""
 "Ajustando este valor a un día impedirá la perdida de sesiones y cookies "
 "antes de que realmente se desconecte por tiempo."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 "Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Off"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -193,22 +385,22 @@ msgstr ""
 "Para poder usar FusionDirectory sin problemas, la opción session.auto_start "
 "debe estar configurada en 'Off' en su php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr "Busque 'session.auto_start' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -216,22 +408,22 @@ msgstr ""
 "Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
 "opción poniéndola en off para mejorar el rendimiento."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Busque 'implicit_flush' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 "Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -240,145 +432,125 @@ msgstr ""
 "'off'. PHP no debería enviar ningún tipo de información sobre el servidor "
 "que esta ejecutando la aplicación."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Busque 'expose_php' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenido"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenido al asistente de configuración de FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Mensaje de Bienvenida"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Inspección LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analizar el arbol LDAP actual por compatibilidad con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Analizando objetos en la entrada raíz"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Comprobando usuarios invisibles"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Comprobando súper administrador"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Comprobando cuentas fuera del árbol de usuarios"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Comprobando grupos fuera del árbol de grupos"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Comprobando departamentos invisibles"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Comprobando números UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Objeto '%s' de FusionDirectory faltante!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Por favor compruebe su instalación"
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -387,47 +559,31 @@ msgstr ""
 "No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
 "intente añadir la clase de objeto '%s' manualmente."
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Aviso"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -436,322 +592,132 @@ msgstr ""
 "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
 "incompletos."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Crear"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Roles"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Crear"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Mover usuarios al árbol de usuarios configurado"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1375
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nombre de la localización"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de conexión"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Conexión TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN del administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Contraseña de administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Estado actual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuración LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Conectividad LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Este dialogo realiza la configuración básica de la conectividad LDAP para "
-"FusionDirectory"
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "¡La conexión anónima al servidor '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "¡La conexión como usuario '%s' ha fallado!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Reintento"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "La conexión anónima al servidor '%s' ha tenido exito."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Refresco"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "¡Por Favor especifique un usuario y contraseña!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "¡La conexión como usuario '%s' al servidor '%s' ha tenido exito!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Terminar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Terminar - Escribir el archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Escribir archivo de configuración"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"El fichero de configuración es universalmente legible. ¡Por favor modifique "
-"los permisos del archivo!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "En estos momentos la configuración no es accesible o no existe."
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
-"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
-"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
-"mientras que otros usuarios no deben poder."
-
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Error de configuración"
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Completado"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenido al asistente de configuración de FusionDirectory"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Siguiente"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Mensaje de Bienvenida"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -771,17 +737,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡Se ha indicado un objectType vacio o no válido!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Enviar"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Arriba"
 
@@ -808,24 +774,19 @@ msgstr "Seleccione todos"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -834,70 +795,70 @@ msgstr "Error"
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acciones"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
@@ -915,9 +876,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error en la configuración"
@@ -944,27 +905,27 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permisos"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -972,8 +933,10 @@ msgstr "Inicio"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
 
@@ -1001,7 +964,7 @@ msgstr ""
 "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
 "ejecutando '%s'"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1009,35 +972,35 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
 "desarrolladores!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1046,12 +1009,12 @@ msgstr ""
 "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte"
 " con su Administrador!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1059,12 +1022,12 @@ msgstr ""
 "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
 "Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1073,215 +1036,166 @@ msgstr ""
 "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
 "si se supera el límite máximo"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Entradas por página"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No puedo obtener información de esquemas del servidor. ¡No es posible "
 "comprobar los esquemas!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "No se puede asignar un identificador (ID) libre:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "¡%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "¡sambaUnixIdPool no es único!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "¡No hay ID disponibles!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "¡Excedido el número de intentos máximo!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "¡No se puede asignar un identificador (ID) libre!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
 "solucionarlo"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
@@ -1294,52 +1208,48 @@ msgstr "Por favor solucione el problema y actualize la página."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "No se puede conectar a LDAP: Por favor consulte con el administrador de "
 "sistemas."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
-"está activo."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"La funcionalidad de instancias esta activa, pero no se encuentra el módulo "
-"de compresión requerido. Por favor instale '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -1362,7 +1272,7 @@ msgstr "Seleccione para mostrar objetos que tengan '%s' activado"
 msgid "Select to search within subtrees"
 msgstr "Seleccione para buscar dentro de los subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
@@ -1572,52 +1482,46 @@ msgstr "¡'%s' debe ser %d o superior!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "¡'%s' depende de '%s' - Por favor introduzca ambos valores!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
-#, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "¡Ya existe una entrada con el atributo '%s' en el sistema!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "¡El campo obligatorio '%s' está vacio!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' no está permitido:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "¡'%s' no están permitidos!"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1625,27 +1529,27 @@ msgstr "¡Extensión PHP %s no encontrada!"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Guardar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Añadir"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1653,31 +1557,31 @@ msgstr "Añadir %s"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1686,7 +1590,7 @@ msgstr ""
 "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1695,7 +1599,7 @@ msgstr ""
 "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
 "necesita eliminar las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1704,7 +1608,7 @@ msgstr ""
 "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
 "aquí"
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1713,184 +1617,191 @@ msgstr ""
 "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
 "necesita añadir las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' esta todavía en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' esta todavía en uso por los objetos: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1899,37 +1810,37 @@ msgstr ""
 "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
 "el archivo de configuración!"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Instale y active el module Pear %s. "
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1938,7 +1849,7 @@ msgstr ""
 "No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
 "faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr "¡La base introducida no es válida, se ha dejado el valor anterior!"
@@ -1980,7 +1891,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2079,37 +1989,37 @@ msgstr "mientras operaba en el servidor LDAP '%s'"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2122,11 +2032,10 @@ msgstr "Por favor seleccione las entradas que desee"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2134,13 +2043,12 @@ msgstr "Nombre"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descripción"
@@ -2192,8 +2100,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2255,37 +2163,38 @@ msgstr "días"
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -2317,28 +2226,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2383,8 +2297,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Enviar"
 
@@ -2393,7 +2307,7 @@ msgstr "Enviar"
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2404,7 +2318,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2478,6 +2392,10 @@ msgstr "¡Entrada desconocida '%s'!"
 msgid "All users"
 msgstr "Todos los usuarios"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2551,37 +2469,32 @@ msgstr "¡Por favor introduzca una contraseña!"
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2595,45 +2508,45 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2705,225 +2618,8 @@ msgstr "¡Bienvenido %s!"
 msgid "References"
 msgstr "Referencias"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Editar parametros de usuarios POSIX"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Directorio de usuario"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "Sin configurar"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Grupo primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Pertenencia a grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Cuenta"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-"El usuario debe introducir la contraseña en el primer inicio de sesión"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Sistema de seguridad"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Modo seguro"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "desactivado"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "Acceso sin restricciones"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "Permitir el acceso a estos equipos"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "Periodo de gracia activado"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "activo"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "la contraseña expiró"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "no puede cambiar la contraseña"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2950,7 +2646,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2987,259 +2683,279 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Provincia"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nombre a Mostrar"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Categoría profesional"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Gestor"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Código Postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 "La contraseña actual y la introducida como nueva son demasiado parecidas."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "La nueva contraseña es demasiado corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -3347,36 +3063,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Atributo de inicio de sesión"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Asunto"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Enlace de recuperación de clave"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3388,31 +3114,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Recuperación de clave realizada con exito"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3461,539 +3187,452 @@ msgstr "Tema"
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
-msgstr "Zona de uso horario"
-
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr "Zona de uso horario"
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activar instantaneas"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base de instantaneas"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Parámetros de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Usar caducidad de cuenta"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Mostrar resumen en listados"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Atributo de inicio de sesión"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activar instantaneas"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base de instantaneas"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Puerto"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modo"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "Métodos"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4092,9 +3731,8 @@ msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4283,7 +3921,7 @@ msgstr "Eliminar usuario"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4303,8 +3941,7 @@ msgid "Information"
 msgstr "Información"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4328,164 +3965,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar características posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de seguridad"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo seguro"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desactivado"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acceso sin restricciones"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Forzar GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Miembros del grupo"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4534,10 +4163,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 54bd606c597a531139b1f5d6aac375ac74b02d18..cb0d0500de3be1591497686d0d9318a394f8c0b5 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "خطا"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "خطای LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "خطا"
@@ -797,70 +758,70 @@ msgstr "خطا"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "جواز"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr "خطا"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "فایل '%s' را نمی توانم پیدا کنم برای رفع مشکل دستور '%s' را بزنید."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
-#, php-format
-msgid "The required field %s is empty!"
-msgstr ""
-
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,280 +1499,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1906,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2004,37 +1918,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2047,11 +1961,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2059,13 +1972,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2117,8 +2029,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2180,37 +2092,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2242,28 +2155,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2308,8 +2226,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2318,7 +2236,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2329,7 +2247,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2403,6 +2321,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2476,36 +2398,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2433,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2621,224 +2538,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2865,7 +2566,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2902,258 +2603,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "اطلاعات شخصی"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "فامیل"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "نام"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "آدرس"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "شماره اتاق."
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "شماره اتاق"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "تلفن"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "تلفن همراه"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "پیجر"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "آدرس پستی منزل"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "شماره تماس خصوصی"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "شماره تلفن منزل"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "اطلاعات سازمان"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "دپارتمان"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "شماره دپارتمان."
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "شماره دپارتمان"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "شماره کارمندی."
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "شماره کارمندی"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "کد پستی"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "کلمه عبور جدید"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3261,36 +2982,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3302,31 +3033,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3380,530 +3111,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4002,9 +3646,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4193,7 +3836,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4213,8 +3856,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4238,163 +3880,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4444,10 +4078,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 79217a5e56b113554999687bcf14aabca9fc1eab..ad49883ff632414248ef2bf8620957de1a17dd3f 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Varoitus"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Varoitus"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Luo"
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Virhe"
@@ -797,70 +758,70 @@ msgstr "Virhe"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Lupa"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "Peruta"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Talenna"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,280 +1499,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1906,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2004,37 +1918,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2047,11 +1961,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2059,13 +1972,12 @@ msgstr "Nimi"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Kuvaus"
@@ -2117,8 +2029,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2180,37 +2092,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2242,28 +2155,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2308,8 +2226,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2318,7 +2236,7 @@ msgstr ""
 msgid "Download"
 msgstr "Lataa"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2329,7 +2247,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2403,6 +2321,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2476,36 +2398,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2433,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2620,224 +2537,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2864,7 +2565,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2901,258 +2602,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Etunimi"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Valtio"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Osoite"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Puhelin"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobiili"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Faksi"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3260,36 +2981,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3301,31 +3032,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3379,530 +3110,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Portti"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4001,9 +3645,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4192,7 +3835,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4212,8 +3855,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4237,163 +3879,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4443,10 +4077,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 31aaae06c77dfdfbcdaeec59dd25bb1ccd1f7acd..891171ed05a48745a6c12cd4824557a56570a52f 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -18,20 +18,20 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Configuration de la langue"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
@@ -41,16 +41,218 @@ msgstr ""
 " la langue demandée par le navigateur. Ce paramètre peut être configuré par "
 "utilisateur."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatique"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr "Connexion LDAP"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nom de l'emplacement"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr "Nom de cette connexion à afficher dans la liste des serveurs LDAP"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI de connexion"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+"URI pour contacter le serveur LDAP. Commence habituellement par ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Connexion TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+"Est ce que TLS doit être utilisé pour se connecter à ce serveur LDAP ?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "La base de l’annuaire LDAP"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Authentification"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"DN du compte admin à utiliser pour la liaison au LDAP. La base est "
+"automatiquement ajoutée."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN de l'administrateur"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Mot de passe administrateur"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+"Mot de passe pour le compte administrateur à utiliser pour la liaison au "
+"LDAP"
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Statut"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Statut actuel"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+"Résultat de la dernière tentative de liaison LDAP et vérification des "
+"schémas de base"
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuration LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configuration de la connexion LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Cette page permet la configuration de base de l'annuaire LDAP pour "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "La connexion anonyme sur le serveur '%s' à échoué !"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "la connexion comme l'utilisateur '%s' à échoué !"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Réessayer"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La connexion anonyme sur le serveur '%s' à réussi."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Veuillez introduire un utilisateur et un mot de passe !"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "La connexion comme l'utilisateur '%s' au serveur '%s' à réussi !"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+"%s\n"
+"Schema \"%s\": %s"
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Avertissement"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Erreur d'installation"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Terminé"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Suivant"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bienvenue"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Terminé"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Fini - écrire le fichier de configuration"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Ecrire le fichier de configuration"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Votre fichier de configuration est lisible par tout le monde. Veuillez "
+"modifier les permissions !"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Le fichier de configuration ne peut être lu ou n'existe pas."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le"
+" serveur web puisse lire %s. Vous pouvez exécuter les commandes suivantes "
+"pour réaliser cette opération:"
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Extension PHP et vérification de celles-ci"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
@@ -58,41 +260,41 @@ msgstr ""
 "Configuration de PHP (<a href=\"?info\" target=\"_blank\">montrer les "
 "informations)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Vérification de l'installation"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 "Vérification de base de la version de PHP et des extensions nécéssaires."
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Vérification de la version de PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP doit être à la version %s ou supérieure."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Veuillez faire la mise à jour vers une version supportée."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory à besoin de ce module pour dialoguer avec votre annuaire "
 "ldap."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory à besoin de ce module pour afficher l'interface multilingue."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -100,14 +302,14 @@ msgstr ""
 "FusionDirectory à besoin de ce module pour dialoguer avec les différents "
 "types de serveurs et de protocoles."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 "FusionDirectory a besoin de ce module pour encoder les variables pour "
 "l'utilisation dans du javascript."
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
@@ -115,11 +317,11 @@ msgstr ""
 "FusionDirectory a besoin de ce module pour filtrer les variables avec un "
 "filtre spécifique"
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory à besoin de ce module pour dialoguer avec Samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -127,39 +329,39 @@ msgstr ""
 "FusionDirectory à besoin du module 'mash' ou 'sha1' pour l'utilisation du "
 "cryptage SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory à besoin de ce module pour dialoguer avec un serveur IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 "FusionDirectory a besoin  de ce module pour gérer les chaînes de caractère "
 "unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory a besoin  de ce module pour gérer les images."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "Module de compression"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 "FusionDirectory a besoin de ce module pour gérer les copie instantanées."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -169,17 +371,17 @@ msgstr ""
 "globales afin que les scripts puissent y accéder sans changer la porté des "
 "variables. Cela peut constituer un risque de sécurité."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Recherchez l'option 'register_globals' dans votre php.ini et mettez la à "
 "'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr "PHP utilise cette variable pour effacer des anciennes sessions."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -187,7 +389,7 @@ msgstr ""
 "Mettre cette valeur à 1 jour permet d'éviter de perde les cookies et les "
 "sessions avant qu'elles soient réellement expirées."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -195,12 +397,12 @@ msgstr ""
 "Cherchez pour 'session.gc_maxlifetime' dans votre php.ini et mettez le à "
 "86400 ou plus haut."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Eteint"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -208,13 +410,13 @@ msgstr ""
 "Pour pouvoir utiliser FusionDirectory sans problèmes, la variable "
 "session.auto_register doit être à 'Off' dans votre php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Recherchez la variable session.auto_register  et mettez la à 'Off' dans "
 "votre php.ini."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -223,14 +425,14 @@ msgstr ""
 "128MB causera des erreurs imprévisibles, qui ne seront pas reproductibles ! "
 "Augmentez la mémoire pour les installations plus complexes."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "Recherchez 'memory_limit' dans votre fichier php.ini votre et mettez le à "
 "'128M' ou plus haut."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -238,15 +440,15 @@ msgstr ""
 "Cette option défini la gestion des sorties, mettez cette option à 'Off', "
 "pour améliorer la performance."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Recherchez 'implicit_flush' dans votre php.ini et mettez le à 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Le temps d'exécution doit être au moins de 30 secondes."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -254,7 +456,7 @@ msgstr ""
 "Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à "
 "'30' ou plus."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -262,17 +464,17 @@ msgstr ""
 "Augmentez la sécurité de votre serveur en mettant l'option expose_php à "
 "'Off'. PHP n'enverra pas d'information a propos du serveur."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Recherchez 'expose_php' dans votre php.ini et mettez le à 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Améliorez la performance de votre serveur en mettant magic_quotes_gpc à "
 "'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -280,42 +482,29 @@ msgstr ""
 "Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et "
 "mettez la à 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bienvenue"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bienvenue à l'assistant de configuration FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Le message d'accueil"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrer"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Vérification de l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 "Analyse de votre annuaire LDAP pour la compatibilité avec FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Donner tout les droits au utilisateurs sur cette branche"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
@@ -323,91 +512,84 @@ msgstr ""
 "Permettre au utilisateurs d'éditer leur propre information (tab générique et"
 " posix, a n'utiliser que sur la base)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 "Permettre au utilisateurs de changer leur mot de passe (a utiliser que sur "
 "la base)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Inspecter les classes d'objets de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Vérification des permissions sur l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Vérification des utilisateurs invisibles"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Vérification du superadministrateur"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Vérification des rôles ACL et groupes par défaut"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Vérification d'utilisateurs en dehors de la branche people"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Vérification des groupes en dehors de la branche groups"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Vérification des départements invisibles"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Vérification pour les uid en double"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr "Recherche de GID en double"
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "La requête LDAP à échoué"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr "L'objet racine est probablement manquant."
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Echec"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Object class FusionDirectory obligatoire '%s' manquante !"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Veuillez vérifier votre installation."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -416,47 +598,31 @@ 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:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr "L'utilisateur \"%s\" n'a pas un accès complet à votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr "L'utilisateur \"%s\" n'a pas un accès complet à votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Avertissement"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -465,340 +631,135 @@ msgstr ""
 "J'ai trouvé %s utilisateur(s) qui ne seront pas visibles dans ans "
 "FusionDirec."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Migration des utilisateurs"
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Erreur de migration"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Impossible de migrer l'entrée '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Compte administratifs de FusionDirectory 1.0.7 trouvés : %s"
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Comptes administratifs de FusionDirectory 1.0.7 trouvés : %s"
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-"Vous pouvez exécuter <i>fusiondirectory-setup --migrate-acls</i> après avoir"
-" sauvegardé le fichier de configuration à la fin de l'installation pour "
-"migrer les acls. <br/>"
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-"Il n'y a pas d'administrateurs FusionDirectory 1.0.8 valide dans votre "
-"annuaire LDAP."
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Créer"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Groupes"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Rôles"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 "Il n'y a pas d'administrateurs FusionDirectory dans votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Créer"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Donner tous les droits sur tous les objets"
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "Les ACL par défaut n'ont pas été insérées"
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Certaines ACL par défaut sont manquantes"
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "Les ACL par défaut on été insérées"
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Impossible d’ajouter un rôle ACL pour '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "%s utilsateur(s) trouvé(s) en dehors de la branche configurée \"%s\"."
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Bouger les utilisateurs dans la branche utilisateur configurée"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 "Impossible de déplacer les utilisateurs vers le département spécifié !"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "Les entrées seront déplacées depuis"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "vers"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "J'ai trouvé %s groupes en dehors de la branche configurée '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Déplacer les groupes dans la branche configurée"
 
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"J'ai trouvé %s département(s) qui ne seront pas visible dans "
-"FusionDirectory."
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr "Migration des départements"
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr "%s valeurs dupliquées trouvées pour l'attribut \"uidNumber\" : %s"
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr "%s valeurs dupliquées trouvées pour l'attribut \"gidNumber\" : %s"
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr "Connexion LDAP"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nom de l'emplacement"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr "Nom de cette connexion à afficher dans la liste des serveurs LDAP"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI de connexion"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-"URI pour contacter le serveur LDAP. Commence habituellement par ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Connexion TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-"Est ce que TLS doit être utilisé pour se connecter à ce serveur LDAP ?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "La base de l’annuaire LDAP"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Authentification"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-"DN du compte admin à utiliser pour la liaison au LDAP. La base est "
-"automatiquement ajoutée."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN de l'administrateur"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Mot de passe administrateur"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-"Mot de passe pour le compte administrateur à utiliser pour la liaison au "
-"LDAP"
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Statut"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Statut actuel"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-"Résultat de la dernière tentative de liaison LDAP et vérification des "
-"schémas de base"
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuration LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configuration de la connexion LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Cette page permet la configuration de base de l'annuaire LDAP pour "
-"FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "La connexion anonyme sur le serveur '%s' à échoué !"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "la connexion comme l'utilisateur '%s' à échoué !"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Réessayer"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "La connexion anonyme sur le serveur '%s' à réussi."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Rafraîchir"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Veuillez introduire un utilisateur et un mot de passe !"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "La connexion comme l'utilisateur '%s' au serveur '%s' à réussi !"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-"%s\n"
-"Schema \"%s\": %s"
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Terminé"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Fini - écrire le fichier de configuration"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Ecrire le fichier de configuration"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"Votre fichier de configuration est lisible par tout le monde. Veuillez "
-"modifier les permissions !"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Le fichier de configuration ne peut être lu ou n'existe pas."
-
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
-"Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le"
-" serveur web puisse lire %s. Vous pouvez exécuter les commandes suivantes "
-"pour réaliser cette opération:"
+"J'ai trouvé %s département(s) qui ne seront pas visible dans "
+"FusionDirectory."
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Erreur d'installation"
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
+msgstr "Migration des départements"
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Terminé"
+#: setup/class_setupStepMigrate.inc:1298
+#, php-format
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
+msgstr "%s valeurs dupliquées trouvées pour l'attribut \"uidNumber\" : %s"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Suivant"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr "%s valeurs dupliquées trouvées pour l'attribut \"gidNumber\" : %s"
+
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bienvenue à l'assistant de configuration FusionDirectory"
+
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Le message d'accueil"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -818,17 +779,17 @@ msgstr "Option %s invalide !"
 msgid "Specified objectType is empty or invalid!"
 msgstr "Le type d'objet spécifié est vide ou invalide !"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Soumettre"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Au dessus"
 
@@ -855,24 +816,19 @@ msgstr "Sélectionner tout"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erreur"
@@ -881,70 +837,70 @@ msgstr "Erreur"
 msgid "created by"
 msgstr "Crée par"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Aller au département de base"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr "Aller au département des utilisateurs"
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Actions"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Couper"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouveau snapshot depuis cet objet"
 
@@ -964,9 +920,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erreur de configuration"
@@ -994,27 +950,27 @@ msgstr ""
 "Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
 "système."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permissions"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Tout annuler"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Impossible de coller"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -1022,8 +978,10 @@ msgstr "Identifiant"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modèle"
 
@@ -1053,7 +1011,7 @@ msgstr ""
 "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
 "'%s' pour essayer de régler le problème"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1061,14 +1019,14 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Erreur Fatale"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, 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'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -1076,11 +1034,11 @@ msgstr ""
 "Ce login (uid) n'est pas unique au sein de l’annuaire LDAP. Veuillez "
 "contacter votre administrateur système."
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -1088,11 +1046,11 @@ msgstr ""
 "Il semble que votre mot de passe soit expiré. Veuillez utilisez <a "
 "href=\"recovery.php\">la récupération de mot de passe</a> pour le changer."
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 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:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1101,12 +1059,12 @@ msgstr ""
 "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
 "Veuillez contacter votre administrateur !"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Le serveur LDAP à retourné: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1114,12 +1072,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:859
+#: include/functions.inc:875
 #, 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:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1128,85 +1086,77 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurer"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, 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:1492
-msgid "Entries per page"
-msgstr "Entrées par page"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Appliquer le filtre"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sO"
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiO"
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiO"
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiO"
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiO"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiO"
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiO"
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiO"
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiO"
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1216,67 +1166,62 @@ msgstr ""
 "\"fusiondirectory-setup --check-directories\" sur le serveur FusionDirectory"
 " pour corriger les permissions de fichiers"
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier de revision !"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr "Impossible de lire le fichier de révision !"
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-"'nextIdHook' n'est pas disponible. Utilisation de la base par défaut !"
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 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:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr "schéma principal de FusionDirectory"
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr "Schéma utilisé pour stocker la configuration de FusionDirectory"
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 "Utilisé pour stocker l'autorisation de connexion chez les utilisateurs ou "
 "les groupes."
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr "Utilisé pour stocker les modèles"
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr "Utilisé pour stocker des informations POSIX."
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr "Object class obligatoire \"%s\" manquante !"
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr "Object class facultative \"%s\" manquante !"
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -1284,7 +1229,7 @@ msgstr ""
 "Vous avez installé le plugin «mixed groups», mais vos schéma ne sont pas "
 "compatibles."
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
@@ -1292,7 +1237,7 @@ msgstr ""
 "Pour pouvoir utiliser «mixed groups» l’objectClass «posixGroup» doit être "
 "auxiliaire («AUXILIARY»)"
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -1300,54 +1245,17 @@ msgstr ""
 "Vos schémas sont fait pour utiliser des «mixed groups», mais ce plugin n’est"
 " pas installé."
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "L’objectClass «posixGroup» doit être structurelle («STRUCTURAL»)"
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr "Méthode d'allocation inconnue pour \"%s\" !"
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr "Le temps d'attente du verrou a été dépassé. Verrou ignoré pour %s !"
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Impossible d'assigner un ID libre :"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool n'est pas unique !"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "Pas d' ID disponibles !"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "Nombre maximum d'essais dépassés !"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Impossible d'assigner un ID libre !"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Tout les objets dans cette catégorie"
 
@@ -1361,12 +1269,12 @@ msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 "Le fuseau horaire '%s' indiqué dans votre configuration est invalide. "
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Erreur XML dans fusiondirectory.conf: %s à la ligne %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
@@ -1376,40 +1284,36 @@ msgstr ""
 " :%s<br/>\\nVeuillez vérifier que vous n'utilisez pas un fichier "
 "fusiondirectory.secrets alors que vos mots de passe ne sont pas chiffrés."
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 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:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr "La location \"%s\" n'est pas présente dans le fichier de configuration"
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"La fonctionnalité pour les copie instantanées est activée, mais la variable "
-"requise '%s' n'est pas configurée."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 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_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Toutes les catégories"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mon Compte"
 
@@ -1432,7 +1336,7 @@ msgstr "Sélectionnez pour lister les objets qui ont '%s' activés"
 msgid "Select to search within subtrees"
 msgstr "Sélectionner pour chercher dans le sous arbre"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Chercher dans les sous arbre"
 
@@ -1644,52 +1548,46 @@ msgstr "'%s' doit être à la version %d ou plus grand !"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dépend de '%s' - veuillez indiquer les deux valeurs !"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
-#, 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 !"
+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/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
-msgstr "L’entrée '%s' utilise déjà l'attribut \"%s\" !"
+msgid "The entry '%s' already use this '%s' attribute!"
+msgstr "L’entrée '%s' utilise déjà l'attribut '%s' !"
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr "Le champ obligatoire %s n'est pas rempli !"
+msgid "The required field '%s' is empty!"
+msgstr "Le champ obligatoire '%s' n'est pas rempli !"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr "Exemple :"
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Le champ '%s' contient des caractères invalides"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' n'est pas permis :"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' n'est pas autorisé !"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Extension PHP %s manquante !"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1697,27 +1595,27 @@ msgstr "Extension PHP %s manquante !"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Appliquer"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Sauver"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Ajouter"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Ajouter %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1725,31 +1623,31 @@ msgstr "Ajouter %s"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Supprimer %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Editer..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Editer %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Retour"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Ce compte n'a pas d'extensions %s valides !"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1758,7 +1656,7 @@ msgstr ""
 "Ce compte possède l'extension %s activée. Vous pouvez la supprimer en "
 "cliquant sur le bouton ci-dessous."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1767,7 +1665,7 @@ msgstr ""
 "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/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1776,7 +1674,7 @@ msgstr ""
 "Ce compte possède les paramètres %s desactivés. Vous pouvez les activer en "
 "cliquant ci dessous."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1785,186 +1683,193 @@ msgstr ""
 "Ce compte possède les paramètres %s désactivés. Pour les activer, vous devez"
 " au préalable ajouter les paramètres %s !"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Ajouter les paramètres %s"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Effacer les paramètres %s"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 "Cliquez sur le bouton 'Éditer' ci-dessous pour changer les informations dans"
 " cette boite de dialogue"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Janvier"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Février"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Mars"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Avril"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Juin"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Juillet"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Août"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Septembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Octobre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Décembre"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lundi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Vendredi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Samedi"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lecture"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "ajout"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modification"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "suppression"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "recherche"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "authentification"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La requête LDAP %s à échoué !"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "La requête LDAP à échoué !"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objet"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Le téléchargement à échoué !"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Le téléchargement à échoué : %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Erreur de communication avec le service d'infrastructure !"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Erreur de communication avec le service d'infrastructure : %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Ce '%s' est en cours d'utilisation par : %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Ce '%s' est toujours en utilisation."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Ce '%s' est en utilisation par les objets : %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Le fichier '%s' n'existe pas !"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Impossible de lire le fichier '%s' !"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Impossible d'écrire dans le fichier '%s' !"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1973,37 +1878,37 @@ msgstr ""
 "La valeur de '%s' est actuellement vide ou non valide, veuillez vérifier "
 "votre fichier de configuration !"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Impossible d'effacer le fichier '%s' !"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Impossible de créer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Impossible d'effacer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Vérification du support pour %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installer et activer le module PHP %s."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installer et activer le module Pear %s."
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -2012,7 +1917,7 @@ msgstr ""
 "Impossible d'initialiser la classe '%s' ! Peut être manque t'il une "
 "extension dans votre installation de FusionDirectory ?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -2056,7 +1961,6 @@ msgid "Restoring snapshots"
 msgstr "Restauration d’instantanés"
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Copie instantanée"
 
@@ -2162,43 +2066,43 @@ msgstr "lors de l'opération sur le serveur LDAP %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open à échoue lors de l’exécution de ldapsearch"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 "Erreur ligne %s, la première ligne d'une entrée ne peut pas commencer par un"
 " espace"
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 "Erreur ligne %s, les références à un fichier externe ne sont pas prises en "
 "charge."
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr "Erreur ligne %s, l'attribut  \"%s\" n'a pas de valeur"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr "Erreur ligne %s, une entrée ne peut avoir qu'un seul dn"
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr "Erreur ligne %s, une d'entrée doit commencer par le dn"
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 "Erreur lors de l'importation du dn : \"%s\", veuillez vérifier votre fichier"
 " LDIF à partir de la ligne %s !"
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2213,11 +2117,10 @@ msgstr "Veuillez sélectionner les entrées désirées"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2225,13 +2128,12 @@ msgstr "Nom"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Description"
@@ -2283,8 +2185,8 @@ msgstr "Editer"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2348,38 +2250,39 @@ msgstr "jours"
 msgid "From template"
 msgstr "Depuis un modèle"
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr "%s modèle"
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Afficher %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Erreur de Filtre"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Le filtre est incomplet !"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, 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/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, 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."
@@ -2413,17 +2316,17 @@ msgstr ""
 "Impossible de générer le dn : pas d’infos sur le type d’objet pour la classe"
 " d’onglet \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Il existe déjà une entrée avec le même dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "L'entrée %s n'existe pas"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
@@ -2432,12 +2335,17 @@ msgstr ""
 "modifications qui peuvent être faites par d'autres seront perdus si vous "
 "enregistrez cette entrée!"
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr "Service \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Onglet \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Champ inconnu \"%s\""
@@ -2484,8 +2392,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Télécharger"
 
@@ -2494,7 +2402,7 @@ msgstr "Télécharger"
 msgid "Download"
 msgstr "Téléchargement"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2507,7 +2415,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "La valeur du champ multivalué \"%s\" n'est pas un tableau"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valeur invalide: %s"
@@ -2584,6 +2492,10 @@ msgstr "Entrée inconnue '%s'  !"
 msgid "All users"
 msgstr "Tout les utilisateurs"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Appliquer le filtre"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2665,42 +2577,33 @@ msgstr "Veuillez introduire votre mot de passe !"
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Aucune valeur trouvée dans l'entête HTTP \"%s\""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 "L'utilisateur \"%s\" mentionné dans l’entête n'existe pas dans l'annuaire "
 "LDAP "
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
-"L'utilisateur \"%s\" mentionné dans l’entête correspond à plusieurs "
-"personnes  dans l'annuaire LDAP "
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "L'utilisateur CAS \"%s\" n'existe pas dans l'annuaire LDAP "
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-"L'utilisateur CAS \"%s\" correspond à plusieurs personnes  dans l'annuaire "
-"LDAP "
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2715,48 +2618,48 @@ msgstr ""
 "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
 "Abandon."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Adresse de courriel"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Aucun compte utilisateur trouvé avec l'identifiant \"%s\""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Plusieurs comptes trouvés avec le login \"%s\""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr "Il n'y a pas de compte qui utilise le courriel \"%s\""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Il y a plusieurs comptes qui utilisent le courriel \"%s\""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 "L'utilisateur correspondant au courriel \"%s\" est verrouillé. Veuillez "
 "contacter votre administrateur système !"
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contactez votre administrateur système, il y a eu un problème avec l'envoi "
 "du message"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Le token n'est pas valable"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Un problème est survenu avec le serveur de messagerie, le mail de "
@@ -2833,240 +2736,8 @@ msgstr "Bienvenue %s !"
 msgid "References"
 msgstr "Références"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Editer les paramètres Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Répertoire Home"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "Chemin du répertoire \"home\" de cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr "Shell à utiliser lors de la connexion de l’utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "non configuré"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Groupe principal"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Groupe principal de cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Status du compte unix de l'utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr "Forcer l’id d’utilisateur/groupe"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-"Force les valeurs des ids d’utilisateur et de groupe pour cet utilisateur."
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr "Id d’utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr "Id d’utilisateur à utiliser pour cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr "Id de groupe"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr "Id de groupe à utiliser pour cet utilisateur"
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Appartenance au groupe"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Compte"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-"L'utilisateur doit changer son mot de passe lors de sa première connexion"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-"L'utilisateur doit changer son mot de passe lors du premier connexion "
-"(laisser vide pour désactiver la fonctionnalité)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr "Délai minimum entre les changements de mot de passe (jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-"L'utilisateur ne sera pas habilité à changer son mot de passe avant ce "
-"nombre de jour (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Délai avant de forcer le changement de mot de passe (en jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"L'utilisateur sera forcé de changer son mot de passe après ce nombre de jour"
-" (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Date d'expiration du mot de passe"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Date après laquelle le mot de passe de l'utilisateur va expiré (laisser vide"
-" pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Délai d'inactivité avant de désactiver l'utilisateur (en jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Délai maximum d'inactivité après l'expiration du mot de passe avant que "
-"l'utilisateur soit désactivé (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-"Délai avant d'avertir l'utilisateur de l'expiration de son mot de passe (en "
-"jours)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"L'utilisateur sera averti de ce nombre de jour restant avant l'expiration de"
-" ce mot de passe (laisser vide pour désactiver)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Système de Confiance"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Mode de confiance"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Type d'autorisation pour ces hôtes"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "désactivé"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "accès complet"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "permettre l'accès a ces hôtes"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Autoriser seulement cet utilisateur à se connecter sur cet hôte"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automatique"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "expire"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "temps de grâce activé"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "actif"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "mot de passe expiré"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "mot de passe non modifiable"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr "Groupe de l'utilisateur %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Groupes et rôles"
 
@@ -3093,7 +2764,7 @@ msgid "Password hash method to use"
 msgstr "Format de stockage des mots de passe"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -3130,165 +2801,169 @@ msgstr "Information du compte utilisateur"
 msgid "User account"
 msgstr "Compte utilisateur"
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr "Statut de verrouillage de l'utilisateur"
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Prénom"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Prénom"
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Une courte description de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Photo"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "L'avatar pour cet utilisateur"
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Information de contact organisationnelles"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Lieu"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Adresse postale professionnelle"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Téléphone"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Numéro de téléphone professionnel"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Numéro de GSM professionnel "
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Numéro de bip professionnel"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Numéro de fax professionnel"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Site web personnel"
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Compte utilisateur"
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Identifiant de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Mot de passe de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Informations personnelles"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nom à afficher"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 "Nom de l'utilisateur tel qu'il devrait apparaître. Utilisé par le carnet "
 "d'adresse Exchange."
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Adresse postale"
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titre"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3296,79 +2971,95 @@ msgstr ""
 "Titre d'une personne dans leur contexte organisationnel. Chaque titre est "
 "une valeur de cet attribut multivalué"
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Entreprise"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr "Département auquel l'utilisateur appartient"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Responsable"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr "Rue"
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Code postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "La ppolicy \"%s\" n’a pas été trouvée dans le LDAP !"
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Vous n’êtes pas autorisé à changer votre mot de passe"
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 "Vous devez attendre %d secondes avant de changer votre mot de passe à "
 "nouveau"
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Le mot de passe est dans l'historique des mots de passe récents"
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "Le nouveau mot de passe est le même que l’ancien"
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 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/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3376,20 +3067,20 @@ msgstr ""
 "Les mots de passe entrés dans les champs 'Nouveau mot de passe' et celui "
 "dans le champ 'Répéter le nouveau mot de passe' ne concordent pas."
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Le nouveau et l'ancien mot de passe sont trop similaires."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Le nouveau mot de passe est trop court."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 "Le mot de passe contient probablement des caractères Unicode qui sont "
@@ -3503,30 +3194,42 @@ msgstr ""
 "Les utilisateurs pourront entre une adresse de messagerie alternative pour "
 "récupérer leur mot de passe"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Attribut de connexion"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+"Habituellement uid, mais vous pouvez utiliser quelque chose d'autre par "
+"exemple dans le cas d'utilisation d'un SSO"
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Premier message"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Sujet"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Sujet du premier message"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] lien de reinitialisation du mot de passe"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 "Corps du message (le premier %s est l'identifiant, le second est le lien)"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3535,7 +3238,7 @@ msgstr ""
 "Corps du premier message, envoyé lorsque l'utilisateur demande un nouveau "
 "mot de passe. Utilisez %s pour l'identifiant et le lien de récupération."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3554,24 +3257,24 @@ msgstr ""
 "\n"
 "Ceci est seulement valide pour 10 minutes"
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Second message"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Sujet du second message"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Réinitialisation du mot de passe réussi !"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Corps du message (%s est l'identifiant)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3580,7 +3283,7 @@ msgstr ""
 "Corps du second message, envoyé pour confirmer le mot de passe a été changé."
 " Utilisez %s pour l'indentifiant de l'utilisateur."
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3641,59 +3344,108 @@ msgid "Timezone to be used"
 msgstr "Fuseau horaire à utiliser"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Installation des schémas"
+msgid "Core settings"
+msgstr "Paramétrage de base"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "nombre maximal d'objet LDAP retournés"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr "Définit le nombre maximal d'objets LDAP recupérés par défaut"
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Édition du verrouillage"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Vérifie si une entrée en cours d'édition a été modifié par une application "
+"autre que FusionDirectory dans le même temps"
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Activer la journalisation"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Activer la journalisation coté FusionDirectory"
+
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
+msgstr "Validation des schémas"
+
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr "Activer la validation des schéma lors de la connexion"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activer la copie instantanée"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Cela vous permet de sauver certaines entrées et de les restaurer plus tard"
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
-msgstr "Validation des schémas"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base pour les snapshots"
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
-msgstr "Activer la validation des schéma lors de la connexion"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+"Branche LDAP à l'intérieur de laquelle les copies instantanés d'objets "
+"seront stockés"
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Préférences pour les mots de passe"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Méthode de hachage des mots de passe par défaut"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Méthode de hachage à utiliser par défaut"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Forcer la méthode de hachage par défaut"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 "Forcer l'utilisation de la méthode de hachage des mots de passe par défaut "
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Taille minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Longueur minimum des mots de passe utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Différence minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Nombre de caractères différents par rapport au précédent mot de passe"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Utiliser l'expiration du compte"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -3702,80 +3454,32 @@ msgstr ""
 "FusionDirectory et renouvellement forcé des mots de passe ou blocage du "
 "compte"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "Royaume pour la connexion SASL"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "Opération Extérieur SASL"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attribut à stocker dans l'attribut 'userPassword'"
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Paramétrage de base"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Afficher les sommaires dans les listes"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Détermine si une barre d'état sera affichée en bas de la liste pour indiquer"
-" les nombres et types d'objets affichés"
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Édition du verrouillage"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Vérifie si une entrée en cours d'édition a été modifié par une application "
-"autre que FusionDirectory dans le même temps"
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Activer la journalisation"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Activer la journalisation coté FusionDirectory"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "nombre maximal d'objet LDAP retournés"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Définit le nombre maximal d'objets LDAP recupérés par défaut"
-
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "connexion et session"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Attribut de connexion"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Attribut LDAP utilisé comme identifiant de connexion lors de la connexion"
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Force les connexions cryptées"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3783,293 +3487,183 @@ msgstr ""
 "Activer les vérifications PHP de sécurité pour activer HTTPS lors de l’accès"
 " à l'interface web"
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Avertir si la session ne sera pas cryptée"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "Affiche un avertissement pour indiquer l'usage du protocole HTTP au lieu de "
 "HTTPS"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Durée de vie de la session"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr "Définit la durée d'une session en secondes (0 pour désactiver)."
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr "Authentification HTTP de base"
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 "Utiliser le protocole d'authentification Basic HTTP au lieu du formulaire de"
 " connexion."
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr "authentification entêtes HTTP"
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 "Utiliser d'authentification par entêtes HTTP au lieu du formulaire de "
 "connexion."
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr "Nom de l’entête"
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr "Nom de l'en-tête contenant l'identification utilisateur."
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activer la copie instantanée"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-"Cela vous permet de sauver certaines entrées et de les restaurer plus tard"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base pour les snapshots"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-"Branche LDAP à l'intérieur de laquelle les copies instantanés d'objets "
-"seront stockés"
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Clé privée"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 "Chemin vers la clef privée de FusionDirectory. Inutilisé actuellement."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Chemin du certificat"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 "Chemin vers le certificat public de FusionDirectory. Inutilisé actuellement."
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Chemin du certificat CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Chemin d'accès au CA public. Utilisé pour valider l'hôte du serveur "
 "Argonaut."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Activer CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr "CAS sera utilisé à la place de la connexion LDAP"
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr "Chemin du fichier contenant le certificat du CA public du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Hôte"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr "Hôte du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr "Port d’écoute du serveur CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr "Contexte CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr "Contexte CAS à utiliser"
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 "Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Type d'attribut pour le DN des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attribut à utiliser pour le début du DN utilisateur"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Modèle CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr "Le modèle à utiliser pour construire le common name"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Règles de de nommage strictes"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Active la vérification stricte des noms d’utilisateur et de groupe"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr "Id minimum de groupe/utilisateur"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-"L’id d’utilisateur ou de groupe minimum assignable pour éviter des risques "
-"de sécurité avec des id égales à 0."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-"Déclencheur permettant de déterminer le prochain identifiant numérique"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-"Un script à appeler pour trouver le prochain id libre pour les utilisateurs "
-"et groupes."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Départ pour les ids d’utilisateur"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Où commencer à chercher pour un nouvel id d’utilisateur libre."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Départ pour les ids de groupe"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Point de départ pour rechercher un identifiant de groupe libre"
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Chemin relatif des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Branche où sont stockés les utilisateurs."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Chemin relatif des groupes"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Branche où sont stockés les groupes"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Branche des rôles ACL"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Branche où sont stockés les ACL"
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Méthode de répartition des Id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Méthode pour allouer les ids d’utilisateur et de groupe"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Traditionnel"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Samba unix id pool"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Minimum des ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr "Valeur minimum pour les ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Maximum des ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr "Valeur maximum pour les ids d’utilisateur du réservoir"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Minimum des ids de groupe du réservoir"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Valeur minimum pour les ids de groupe du réservoir"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
-msgstr "Maximum des ids de groupe du réservoir"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Valeur maximum pour les ids de groupe du réservoir"
-
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr "Restreindre les membres du rôle"
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
@@ -4077,15 +3671,34 @@ msgstr ""
 "Lorsqu'elle est activée uniquement les utilisateurs de la même branche ou "
 "les membres des groupes de la même branche peut être ajouté à un rôle."
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:321
+msgid ""
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Deboguage"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Afficher les erreurs"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -4093,11 +3706,11 @@ msgstr ""
 "Afficher les erreurs dans la partie haute de l'écran. Cela sera a désactiver"
 " en environnement de production car des mots de passe peuvent être affichés."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Durée maximale d'une requête LDAP"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -4105,11 +3718,11 @@ msgstr ""
 "Arrêter les opérations LDAP si aucunes réponses n'est obtenue dans un délai "
 "spécifié"
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Inscrit les statistique de l'annuaire LDAP dans les journaux systèmes"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -4117,55 +3730,89 @@ msgstr ""
 "Stocker les statistiques LDAP via syslog. Cela aide à trouver les problèmes "
 "d'indexation et de mauvais filtres de recherche."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Niveau de débogage"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Afficher certaines informations sur chaque chargement de page."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Afficher les sommaires dans les listes"
+
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+"Détermine si une barre d'état sera affichée en bas de la liste pour indiquer"
+" les nombres et types d'objets affichés"
+
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr "Montrer l’onglet ACL sur tous les objets"
+
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+"Pour des configurations ACL très spécifiques où vous avez besoin de donner "
+"des droits sur un seul objet."
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr "Liste des catégories de département"
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr "Les catégories disponibles dans le menu déroulant départements"
+
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks"
+msgstr "Connexions"
+
+#: plugins/config/class_configInLdap.inc:387
 msgid "Hooks that are called when specific actions happens"
 msgstr "Déclencheurs appelés en fonction de l’exécution d’actions spécifiques"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "Onglets"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:391
 msgid "The tab that this hook concerns"
 msgstr "Onglet concerné pas ce déclencheur"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr "Mode"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:396
 msgid "When to call this command"
 msgstr "Quand appeler cette commande"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "Commande"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:403
 msgid "The command that will be called"
 msgstr "Commande qui sera appelée"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Connexions"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:417
 msgid "Display hook output"
 msgstr "Montrer le résultat du hook"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:418
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -4173,42 +3820,6 @@ msgstr ""
 "Si activé, après réussite de du hook, le résultat est affiche dans une "
 "fenêtre à l'utilisateur"
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Shells disponibles"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Shells POSIX disponibles pour les utilisateurs de FusionDirectory"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr "Shell par défaut"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr "Shell utilisé par défaut lors de l'activation du tab Unix."
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Montrer l’onglet ACL sur tous les objets"
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
-"Pour des configurations ACL très spécifiques où vous avez besoin de donner "
-"des droits sur un seul objet."
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr "Liste des catégories de département"
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr "Les catégories disponibles dans le menu déroulant départements"
-
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
 msgstr "Plugins"
@@ -4309,9 +3920,8 @@ msgstr "département"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4504,7 +4114,7 @@ msgstr "Suppression de l'utilisateur"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4524,8 +4134,7 @@ msgid "Information"
 msgstr "Information"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Nom du groupe"
 
@@ -4549,128 +4158,149 @@ msgstr "Les membres du rôle"
 msgid "Add users for the role"
 msgstr "Ajouter des utilisateurs au rôle"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Gérer les groupes et rôles"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr "Permet de gérer des groupes d'objets, des groupes POSIX et des rôles "
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Éditer les propriétés du role"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Modifier les propriétés posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Afficher les groupes utilisateurs"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Groupes principaux"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Montrer les rôles organisationnels "
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Afficher les groupes d’applications"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr "Afficher des groupes non identifiés"
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Groupes principaux"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Groupes de messagerie"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Groupes Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr "Afficher les entrées DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Afficher les groupes de serveurs"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Afficher les groupes de stations de travail"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Afficher les groupes de stations Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Afficher les groupes de terminaux"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Afficher les groupes d’imprimantes"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Afficher les groupes de téléphones"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Entrée inconnue:  '%s' "
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "le dn n'existe pas : %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Information du groupe d’objets"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Groupes"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Description courte pour ce groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Objets membres"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Objets membres de ce groupe"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Système de Confiance"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Mode de confiance"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Type d'autorisation pour ces hôtes"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "désactivé"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "accès complet"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "permettre l'accès a ces hôtes"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Autoriser seulement ce groupe à se connecter sur ces listes d'hôtes"
 
-#: plugins/admin/groups/class_ogroup.inc:319
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -4681,35 +4311,6 @@ msgstr ""
 msgid "List of groups"
 msgstr "Liste des groupes"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr "Information du groupe POSIX"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr "Groupe POSIX"
-
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr "Groupe d’utilisateurs POSIX"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Forcer le GID"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
-msgstr "Forcer la valeur du GID pour ce groupe"
-
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
-msgstr "GID de ce groupe"
-
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Membre du groupe"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4757,10 +4358,6 @@ msgstr "Boite de dialogue d’affectation ACL"
 msgid "Access control roles assignment dialog"
 msgstr "Boite de dialogue des affectations de rôles de contrôle d’accès"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Mode"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 4ba2abbe06817ad6008c8544e59af2ee441499d3..03124896417444fec1ae4d52bd7471be07fc65e6 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Felhasználók"
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Felhasználók"
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -797,70 +758,70 @@ msgstr ""
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,280 +1499,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1906,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2004,37 +1918,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2047,11 +1961,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2059,13 +1972,12 @@ msgstr "Név"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Leírás"
@@ -2117,8 +2029,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2180,37 +2092,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2242,28 +2155,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2308,8 +2226,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2318,7 +2236,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2329,7 +2247,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2403,6 +2321,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2476,36 +2398,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2433,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2620,224 +2537,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2864,7 +2565,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2901,258 +2602,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3260,36 +2981,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3301,31 +3032,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3379,530 +3110,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4001,9 +3645,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4192,7 +3835,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4212,8 +3855,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Csoport neve"
 
@@ -4237,163 +3879,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4443,10 +4077,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 9a34118f4ec06e643d84adbf6c03fabe48d02856..5dd6aeabdf47ce940cfa9df272a0ec649097680d 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,703 +17,669 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -733,17 +699,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -770,24 +736,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -796,70 +757,70 @@ msgstr ""
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -877,9 +838,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -905,27 +866,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -933,8 +894,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -958,7 +921,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -966,266 +929,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1238,46 +1152,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1300,7 +1214,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1509,52 +1423,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1562,27 +1470,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1590,280 +1498,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1905,7 +1820,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2003,37 +1917,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2046,11 +1960,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2058,13 +1971,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2116,8 +2028,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2179,37 +2091,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2241,28 +2154,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2307,8 +2225,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2317,7 +2235,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2328,7 +2246,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2402,6 +2320,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2475,36 +2397,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2515,44 +2432,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2619,224 +2536,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2863,7 +2564,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2900,258 +2601,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3259,36 +2980,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3300,31 +3031,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3378,530 +3109,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4000,9 +3644,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4191,7 +3834,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4211,8 +3854,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4236,163 +3878,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4442,10 +4076,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index 2e4aacef84839c7d19c97d493e164bff73de3582..9f94b8aea725a4190c8d510a4ebbf2f08a9010c9 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -18,20 +18,20 @@ msgstr ""
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Impostazioni della lingua"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Questa tappa ti permette di impostare la tua lingua preferita."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
@@ -41,16 +41,217 @@ msgstr ""
 "sito . Scegliendo \" automatico\" utilizzerà la lingua richiesta dal "
 "browser. Questa impostazione può essere sovrascritto per utente ."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr "Connessione LDAP"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nome del luogo"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr "Nome di questo collegamento per mostrare nell'elenco dei server LDAP"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI di connessione"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr "URI per contattare il server LDAP. Di solito inizia con ldap://"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Connessione TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr "TLS dovrebbe essere usato per connetterlo a questo server LDAP?"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr "Base del directory LDAP"
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autentificazione"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+"DN dell'account amministratore da utilizzare per il legame alla LDAP . La "
+"base viene automaticamente aggiunta."
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN dell'amministratore"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Password dell'amministratore"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+"Password dell'account amministratore da utilizzare per il legame alla LDAP ."
+" "
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Stato"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Stato attuale"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+"Risultato dell'ultimo tentativo di controllo dei vincoli LDAP e degli schemi"
+" di base."
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configurazione di LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configurazione della connessione di LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Questa finestra permette di indicare la configurazione di base di LDAP per "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "La connessione anonima sul server '%s' è fallita !"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "La connessione dell'utente '%s' è fallita !"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Riprova"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "La connessione anonima al server '%s' è riuscita."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Specifica il nome utente e la password !"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "La connessione dell'utente '%s' al server '%s' è riuscita !"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+"%s\n"
+"Schema \"%s\": %s"
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Avvertimento"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Errore di configurazione"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Completato"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Successivo"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Benvenuto"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finito"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Finito - Scrivi il file di configurazione"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Scrivi il file di configurazione"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Il file di configurazione è attualmente accessibile in lettura a tutti. "
+"Aggiorna i permessi di accesso sul file !"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+"Il file di configurazione attualmente non è leggibile oppure non esiste."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia "
+"solo l'account abilitato al server Web a poter leggere %s, mentre gli altri "
+"account non dovrebbero."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Verifica del modulo PHP e delle sue estensioni"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
@@ -58,41 +259,41 @@ msgstr ""
 "Configurazione di installazione PHP (<a href=\"?info\" "
 "target=\"_blank\">mostra informazione)</a>)"
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Verifica dell'istallazione"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 "Verifiche di base della compatibilità PHP e delle estensioni necessarie"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Controllo della versione di PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP deve essere nella versione %s o superiore."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Aggiorna ad una versione supportata."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory ha bisogno di questo modulo per poter comunicare con il "
 "server LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory ha bisogno di questo modulo per l'interfaccia multilingue."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -100,14 +301,14 @@ msgstr ""
 "FusionDirectory ha bisogno di questo modulo per comunicare con differenti "
 "tipi di server e protocolli."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 "FusionDirectory ha bisogno di questo modulo per codificare le variabili per "
 "l'uso di JavaScript."
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
@@ -115,12 +316,12 @@ msgstr ""
 "FusionDirectory richiede questo modulo per filtrare una variabile con un "
 "filtro specificato."
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 "FusionDirectory ha bisogno di questo modulo per l'integrazione di Samba"
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -128,41 +329,41 @@ msgstr ""
 "FusionDirectory richiede il modulo 'mhash' oppure 'sha1' per poter "
 "utilizzare l'algoritmo di criptaggio SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory ha bisogno di questo modulo per comunicare con il server "
 "IMAP."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 "FusionDirectory ha bisogno di questo modulo per gestire i caratteri Unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 "FusionDirectory ha bisogno di questa estensione per gestire le immagini."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "modulo di compressione"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 "FusionDirectory ha bisogno di questa estensione per gestire gli snapshot (le"
 " copie istantanee)."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -172,16 +373,16 @@ msgstr ""
 "variabili globali affinchè gli scripts possano accedervi senza cambiare la "
 "portata delle variabili. Questo puó generare un rischio per la sicurezza."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Cerca l'opzione register_globals nel tuo file php.ini e impostalo su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr "PHP utilizza questa variabile per cancellare delle vecchie sessioni."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -189,7 +390,7 @@ msgstr ""
 "Impostare questa variabile a \"1 giorno\" eviterà di perdere i coockies e le"
 " sessioni prima che siano realmente scadute."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -197,12 +398,12 @@ msgstr ""
 "Cerca la variabile 'session.gc_maxlifetime' nel tuo file php.ini e impostala"
 " a 86400 o un valore più grande."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Off"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -210,13 +411,13 @@ msgstr ""
 "Per non avere problemi nell'uso di FusionDirectory, è necessario impostare "
 "l'opzione 'session.auto_start' su 'Off' nel file php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Cerca la variabile 'session.auto_start' nel file php.ini e impostala su "
 "'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -225,14 +426,14 @@ msgstr ""
 "memoria causeranno degli errori imprevisti che non saranno riproducibili ! "
 "Aumenta la memoria per delle installazioni più complesse."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "Cerca la variabile 'memory_limit' nel file php.ini e impostala su '128MB' o "
 "un valore più grande."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -240,16 +441,16 @@ msgstr ""
 "Questa opzione influenza la gestione delle uscite. Per aumentare le "
 "prestazioni, impostala su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 "Cerca la variabile 'implicit_flush' nel file php.ini e impostala su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Il tempo di esecuzione deve essere di almeno 30 secondi."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -257,7 +458,7 @@ msgstr ""
 "Cerca la variabile 'max_execution_time' nel file php.ini e impostala su '30'"
 " o un valore più grande."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -266,18 +467,18 @@ msgstr ""
 "'Off'. PHP non trasmetterà alcuna informazione a proposito del server che "
 "stai configurando."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 "Cerca la variabile 'expose_php' nel file php.ini e impostala su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Aumenta le prestazioni del tuo server impostando la variabile "
 "'magic_quotes_gpc' su 'Off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -285,42 +486,28 @@ msgstr ""
 "Cerca la variabile 'zend.ze1_compatibility_mode' nel file php.ini e "
 "impostala su 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Benvenuto"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-"Benvenuto nell'interfaccia di aiuto alla configurazione di FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Messaggio di benvenuto"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migra"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Ispezione dell'annuario LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analisi dell'annuario LDAP per la compatibilità con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Dare tutti i diritti sugli utenti nel ramo dato"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
@@ -328,90 +515,83 @@ msgstr ""
 "Permette agli utenti di modificare le proprie informazioni (uso di scheda e "
 "posix principale solo sulla base)"
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 "Permette agli utenti di modificare la loro password (usare solo su base)"
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Ispezione delle classi di oggetti nell'oggetto radice"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Verifica del permesso di accesso al database LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Verifica degli utenti nascosti"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Verifica del super amministratore"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr "Controllo per i ruoli ed i gruppi ACL predefiniti"
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Verifica degli utenti al di fuori del ramo \"people\""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Verifica dei gruppi al di fuori del ramo \"groups\""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Verifica dei dipartimenti nascosti"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Verifica dei possibili doppioni UID"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr "Verifica dei possibili doppioni GID"
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "La richiesta al database LDAP è fallita!"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr "Forse l'\"oggetto radice\" é mancante"
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Fallito"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "L'oggetto di classe '%s' richiesto per FusionDirectory è mancante !"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Verifica la tua installazione."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -420,47 +600,31 @@ msgstr ""
 "Impossibile gestire il tipo di oggetto strutturale del tuo oggetto radice. "
 "Prova ad aggiungere manualmente la classe d'oggetto '%s'. "
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr "L'utente \"%s\" non ha accesso completo al vostro database LDAP."
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr "L'utente \"%s\" non ha pieno accesso al database LDAP."
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -469,338 +633,135 @@ msgstr ""
 "Ho trovato %s utenti(e) che non saranno visibili in FusionDirectory che sono"
 " incompleti."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr "Migrazione utente"
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Errore durante la migrazione"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr "Impossibile eseguire la migrazione di voce \"%s\":"
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "FD 1.0.7 account amministrativi trovati: %s"
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "FD 1.0.7 gruppi amministrativi trovati: %s"
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-"é possibile eseguire <i>fusiondirectory-setup --migrate-acls</i> dopo aver "
-"salvato il file do configurazione al termine della messa a punto per la "
-"migrazione."
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-"Non vi è alcun account amministratore FusionDirectory 1.0.8 valido "
-"all'interno del vostro LDAP ."
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Crea"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Utenti"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Gruppi"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Ruoli"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 "Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario "
 "LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Crea"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr "Dà tutti i diritti su ogni oggetto"
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "I ruoli ACL di default non sono stati inseriti"
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Mancano alcuni ruoli ACL di default"
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "Ruoli ACL di default sono stati inseriti"
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr "Impossibile aggiungere ruolo \"%s\" ACL "
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr "Ho trovato %s utente(i) al di fuori del ramo \"%s\" configurato."
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Sposta gli utenti nel ramo utenti configurato nell'annuario"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr "Impossibile spostare le entrate nel dipartimento richiesto!"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr "L'entrata verrà spostata"
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "verso"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Le seguenti reference saranno aggiornate"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Ho trovato %s gruppi al di fuori del ramo '%s' configurato."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr "Sposta i gruppi nel ramo di gruppi configurato"
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
-"Ho trovato %s departimenti(o) che non saranno visibili in FusionDirectory."
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr "Migrazione Dipartilento"
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr "Trovati %s valori duplicati per l'attributo \"uidNumber\":%s"
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr "Trovati %s valori duplicati per l'attributo \"gidNumber\":%s"
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr "Connessione LDAP"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nome del luogo"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr "Nome di questo collegamento per mostrare nell'elenco dei server LDAP"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI di connessione"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr "URI per contattare il server LDAP. Di solito inizia con ldap://"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Connessione TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr "TLS dovrebbe essere usato per connetterlo a questo server LDAP?"
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr "Base del directory LDAP"
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autentificazione"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-"DN dell'account amministratore da utilizzare per il legame alla LDAP . La "
-"base viene automaticamente aggiunta."
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN dell'amministratore"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Password dell'amministratore"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-"Password dell'account amministratore da utilizzare per il legame alla LDAP ."
-" "
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Stato"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Stato attuale"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-"Risultato dell'ultimo tentativo di controllo dei vincoli LDAP e degli schemi"
-" di base."
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configurazione di LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configurazione della connessione di LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Questa finestra permette di indicare la configurazione di base di LDAP per "
-"FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "La connessione anonima sul server '%s' è fallita !"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "La connessione dell'utente '%s' è fallita !"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Riprova"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "La connessione anonima al server '%s' è riuscita."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Aggiorna"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Specifica il nome utente e la password !"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "La connessione dell'utente '%s' al server '%s' è riuscita !"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-"%s\n"
-"Schema \"%s\": %s"
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finito"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Finito - Scrivi il file di configurazione"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Scrivi il file di configurazione"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"Il file di configurazione è attualmente accessibile in lettura a tutti. "
-"Aggiorna i permessi di accesso sul file !"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-"Il file di configurazione attualmente non è leggibile oppure non esiste."
+"Ho trovato %s departimenti(o) che non saranno visibili in FusionDirectory."
+
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
+msgstr "Migrazione Dipartilento"
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-"Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia "
-"solo l'account abilitato al server Web a poter leggere %s, mentre gli altri "
-"account non dovrebbero."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
+msgstr "Trovati %s valori duplicati per l'attributo \"uidNumber\":%s"
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Errore di configurazione"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr "Trovati %s valori duplicati per l'attributo \"gidNumber\":%s"
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Completato"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr ""
+"Benvenuto nell'interfaccia di aiuto alla configurazione di FusionDirectory"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Successivo"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Messaggio di benvenuto"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -820,17 +781,17 @@ msgstr "Opzione '%s' non valida!"
 msgid "Specified objectType is empty or invalid!"
 msgstr "Il tipo d'oggetto specificato è vuoto oppure non è valido !"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Invia"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Sopra"
 
@@ -857,24 +818,19 @@ msgstr "Seleziona tutto"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Errore"
@@ -883,70 +839,70 @@ msgstr "Errore"
 msgid "created by"
 msgstr "Creato da"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Sali di un dipartimento"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr "Vai al dipartimento dell'utente"
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Ricarica la lista"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Azioni"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Copia"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Taglia"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Incolla"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Taglia questa voce"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Copia questa voce"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Restaura le 'copie istantanee'"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Lista d'esportazione"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaura la 'copia istantanea'"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Crea una 'copia istantanea'"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
 
@@ -966,9 +922,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Errore di configurazione"
@@ -996,27 +952,27 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Il canale richiesto non esiste! Contatta l'amministratore del sistema."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Autorizzazioni"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annulla tutto"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Impossibile incollare"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -1024,8 +980,10 @@ msgstr "Nome utente"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modello"
 
@@ -1054,7 +1012,7 @@ msgstr ""
 "Errore fatale: impossibile inizializzare la classe '%s' - esegui '%s' per "
 "porre rimedio al problema"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1062,13 +1020,13 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Errore fatale"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "Fatale: Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -1076,11 +1034,11 @@ msgstr ""
 "Il login (uid) non é unico all'interno della struttura LDAP. Per favore "
 "contattare il vostro amministratore di sistema."
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Errore di autentificazione"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
@@ -1088,11 +1046,11 @@ msgstr ""
 "Sembrerebbe che la password sia scaduta. Per favore utilizzare <a "
 "href=\"recovery.php\"> recupero password </a> per cambiarla"
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Errore all'aggiunta di un bloccaggio. Contatta i programmatori !"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1101,12 +1059,12 @@ msgstr ""
 "Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta "
 "l'amministratore del sistema !"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Il server LDAP ha risposto: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1114,12 +1072,12 @@ msgstr ""
 "Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. "
 "Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Il valore limite dell'entries %d è stato superato !"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1128,85 +1086,77 @@ msgstr ""
 "Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo "
 "stesso valore è superato"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configura"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Prosegui comunque"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Modifica malgrado l'avvertimento"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sei sul punto di modificare la/le voce/voci %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Voci per pagina"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Applica filtro"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1215,67 +1165,63 @@ msgstr ""
 "Il file '%s' non puó essere rimosso. Prova ad usare fusiondirectory-setup "
 "--check-directories per correggerne i privilegi di accesso."
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Impossibile scrivere il file di revisione !"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr "Impossibile leggere il file di revisione!"
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'prossimo Hook ID\" non é disponibile. Usa una base predefinita!"
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Avvertimento LDAP"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Impossibile trovare informazioni sugli schemi a partire dal server. Nessuna "
 "verifica degli schemi è stata effettuata !"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr "Schema principale di FusionDirectory"
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 "Schema utilizzato per memorizzare la configurazione di FusionDirectory"
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 "Utilizzato per memorizzare le informazioni in modalità fiducia in utenti o "
 "gruppi."
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr "Usato per memorizzare i modelli."
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr "Usato per memorizzare le informazioni POSIX."
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr "Manca la classe di oggetti necessaria \"%s\"!"
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr "Manca classe di oggetti optional \"%s\"!"
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(i) disponibile(i)"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
@@ -1283,13 +1229,13 @@ msgstr ""
 "Avete installato il plugin di gruppi misti, ma la configurazione dello "
 "schema non supporta questo."
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr "Per usare gruppi misti l'objetClass \"posixGroup\" deve essere AUSILIARIO"
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
@@ -1297,54 +1243,17 @@ msgstr ""
 "Il vostro schema é configurato per supportare gruppi misti, ma manca il "
 "plugin."
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr "L'objectClass \"posixGroup\" deve essere STRUTTURALE"
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr "Metodo di assegnazione ID \"%s\" sconosciuto!"
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr "Timeout durante l'attesa per il blocco. Ignorare blocco da %s!"
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Impossibile assegnare un ID libero:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool non è univoco !"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "nessun ID disponibile !"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "Il numero massimo di tentativi è stato superato"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Impossibile assegnare un ID libero!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Tutti gli oggetti in questa categoria"
 
@@ -1359,12 +1268,12 @@ msgstr ""
 "L'impostazione  \"%s\" del fuso orario nella vostra configurazione non é "
 "valida."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Errore XML nel file fusiondirectory.conf: %s alla linea %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
@@ -1373,39 +1282,35 @@ msgstr ""
 "Sembra che si stia tentando di decodificare qualcosa che non è codificato : \n"
 "%s <br/> Si prega di controllare non si stia utilizzando un file fusiondirectory.secrets mentre le password non sono crittografate."
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr "Location \" %s\" non è stata trovata nel file di configurazione"
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"La funzione 'copia istantanea' è attivata, ma la variabile richiesta '%s' "
-"non è configurata."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"La funzione 'copia istantanea' è attivata, ma il modulo di compressione "
-"richiesto è introvabile. Per favore installa '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Tutte le categorie"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Identità personale"
 
@@ -1428,7 +1333,7 @@ msgstr "Seleziona per avere la lista degli oggetti che hanno '%s' attivato"
 msgid "Select to search within subtrees"
 msgstr "Seleziona per ricercare nella sottostruttura"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Cerca nella sottostruttura"
 
@@ -1640,52 +1545,46 @@ msgstr "'%s' deve essere %d o un valore più grande !"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dipende da '%s' - indica entrambi i valori !"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr "\"%s\""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr "Esiste già una voce  con questo attributo %s nel sistema!"
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "C'è un'altra entry con l'attributo '%s' nel sistema !"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
-msgstr "La entry \"%s\" usa già l'attributo %s!"
+msgid "The entry '%s' already use this '%s' attribute!"
+msgstr "La entry '%s' usa già l'attributo '%s'!"
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr "Il campo necessario %s é vuoto!"
+msgid "The required field '%s' is empty!"
+msgstr "Il campo necessario '%s' è vuoto !"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr "Esempio:"
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Il campo '%s' contiene caratteri sbagliati"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' non è permesso:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' non è permesso !"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Estensione PHP %s  mancante !"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1693,27 +1592,27 @@ msgstr "Estensione PHP %s  mancante !"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Applica"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Registra"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Aggiungi"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Aggiungi %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1721,31 +1620,31 @@ msgstr "Aggiungi %s"
 msgid "Delete"
 msgstr "Elimina"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Rimuovi %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Modifica %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Indietro"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Questa identità non possiede valide estensioni %s !"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1754,7 +1653,7 @@ msgstr ""
 "Questa identità ha i parametri %s attivati. Puoi disattivarli cliccando sul "
 "bottone qui sotto."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1763,7 +1662,7 @@ msgstr ""
 "Questa identità ha i parametri %s attivati. Per disattivarla hai bisogno di "
 "rimuovere prima di tutto i parametri %s !"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1772,7 +1671,7 @@ msgstr ""
 "Questa identità ha i parametri %s disattivati. Puoi attivarli cliccando sul "
 "bottone qui sotto."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1781,186 +1680,193 @@ msgstr ""
 "Questa identità ha i parametri %s disattivati. Per attivarli devi prima di "
 "tutto impostare i parametri %s !"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Imposta i parametri %s"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Rimuovi i parametri %s"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 "Clicka sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
 "questa finestra"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Gennaio"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Febbraio"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Aprile"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Maggio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Giugno"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Luglio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Settembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Ottobre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Dicembre"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domenica"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Lunedi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Mercoledi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Giovedi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Venerdi"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sabato"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "operazione di lettura"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "operazione di aggiunta"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "operazione di modifica"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "operazione di rimozione"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "operazione di ricerca"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autentificazione"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP %s è fallita!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP è fallita!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Oggetto"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "L'invio è fallito !"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Invio fallito: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura !"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Questo '%s' è attualmente utilizzato da questo oggetto: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Questo '%s' è attualmente in uso."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Questo '%s' è attualmente utilizzato da questi oggetti: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Il file '%s' non esiste !"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Il file '%s' non puó essere aperto in lettura !"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Il file '%s' non puó essere aperto in scrittura !"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1969,37 +1875,37 @@ msgstr ""
 "Il valore di '%s' nno è ancora stato configurato oppure non è valido, "
 "verifica il file di configurazione !"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Il file '%s' non puó essere cancellato !"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "La cartella '%s' non puó essere creata  !"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "La cartella '%s' non puó essere cancellata !"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificazione del supporto per %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Istalla e attiva il modulo PHP %s."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installa e attiva il modulo Pear %s."
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -2008,7 +1914,7 @@ msgstr ""
 "Impossibile inizializzare la classe '%s' ! Forse manca un'estensione "
 "nell'installazione di FusionDirectory ?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -2052,7 +1958,6 @@ msgid "Restoring snapshots"
 msgstr "Ripristinare snapshots"
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Copie istantanee"
 
@@ -2159,43 +2064,43 @@ msgstr "durante l'operazione sul server LDAP %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr "proc_open non é riuscito ad eseguire la ricerca LDAP"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 "Errore alla Linea %s, la prima riga di una voce non puo'iniziare con uno "
 "spazio "
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 "Errore alla linea %s, i riferimenti ad un file esterno non sono supportati"
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr "Errore alla linea %s, l'attribution \"%s\" non ha alcun valore"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr "Errore alla linea %s, un blocco d'ingresso puo'avere solo un dn"
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 "Errore alla linea %s, un blocco d'ingresso dovrebbe iniziare con il dn"
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 "Errore durante l'importazione del dn: \"%s\", verifica il tuo file LDIF a "
 "partire dalla linea %s"
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2210,11 +2115,10 @@ msgstr "Seleziona le entries desiderate"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2222,13 +2126,12 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descrizione"
@@ -2280,8 +2183,8 @@ msgstr "Modifica"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2345,37 +2248,38 @@ msgstr "giorni"
 msgid "From template"
 msgstr "Modello"
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr "Modello %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Mostra %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Errore di filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Il filtro non è completo!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
@@ -2409,17 +2313,17 @@ msgstr ""
 "Impossibile calcolare il dn: impossibile trovare le informazioni di "
 "objectType in questa  classe scheda \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "C'é già un'altra entry con il medesimo dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "La voce %s non esiste"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
@@ -2428,12 +2332,17 @@ msgstr ""
 "che possono essere state fatte da altri andranno perse se si salva questa "
 "voce !"
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr "Servizio \"%s\""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Campo \"%s\" sconosciuto"
@@ -2480,8 +2389,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Caricare"
 
@@ -2490,7 +2399,7 @@ msgstr "Caricare"
 msgid "Download"
 msgstr "Scarica"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2503,7 +2412,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "Il valore del campo \"%s\" multivalutato non é un array"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valore non valido per %s"
@@ -2580,6 +2489,10 @@ msgstr "Voce '%s' sconosciuta !"
 msgid "All users"
 msgstr "Tutti gli utenti"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Applica filtro"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2660,36 +2573,31 @@ msgstr "Prego specifica la tua password !"
 msgid "Please check the username/password combination."
 msgstr "Verifica il nome utente e la password."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Nessun valore trovato nell'header HTTP \"%s\""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr "L'utente header \"%s\"  non è stato trovato nel LDAP"
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
-msgstr "L'utente header \"%s\" corrisponde a più utenti in LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
+msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "Impossibile trovare l'utente \"%s\" CAS nell'annuario LDAP"
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr "L'utente CAS \"%s\" corrisponde a più utenti nell'annuario LDAP"
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2703,48 +2611,48 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Alcun account trovato con login \"%s\" "
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Trovati più accounts con login \"%s\""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr "Non c'è nessun account che usa l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Ci sono più account che usano l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 "L'utente che usa la mail \"%s\" é bloccato. Si prega di contattare "
 "l'amministratore di sistema."
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Contattare l'amministratore, c'è stato un problema con il server di posta "
 "elettronica"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Questo token non è valido"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Si è verificato un problema con il server mail, la email di conferma non è "
@@ -2819,238 +2727,8 @@ msgstr "Benvenuto %s!"
 msgid "References"
 msgstr "Riferimenti"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Modifica le impostazioni POSIX dell'utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Home directory"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "Il path verso la cartella personale di questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr "Quale shell dovrà essere usata quando l'utente sarà connesso"
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "non configurato"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Gruppo primario"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Gruppo primario per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Stato di questo account utente unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr "Forza l'id utente/gruppo"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr "Forza valori ID utente e ID gruppo per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr "Utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr "Valore utente per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr "numero del Gruppo"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr "Valore del numero del gruppo per questo utente"
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Gruppi di appartenenza"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Account"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "L'utente dovrà cambiare la password alla prima connessione"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-"L'utente deve cambiare password al primo login (serve un valore di ritardo "
-"prima di forzare il cambio password)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr "Lasso di tempo minimo tra le modifiche delle password (giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-"L'utente non sarà in grado di cambiare la propria password prima di questo "
-"numero di giorni (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Richiamo prima dell'obbligo di modifica della password (giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"L'utente sarà obbligato di cambiare la sua password dopo questo numero di "
-"giorni (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Data di scadenza della password"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Data dopo la quale questa password utente scadrà (lasciare vuoto per "
-"disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-"Periodo di inattività prima della disattivazione dell'account utente "
-"(giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Ritardo massimo di inattività dopo la scadenza della password prima che "
-"l'utente venga disabilitato (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Richiamo per l'utente prima che la password scada (giorni)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"L'utente sarà avvertito questo numero di giorni prima della scadenza della "
-"sua password (lasciare vuoto per disabilitare)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Sistema di fiducia"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Modalità di fiducia"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Tipo di autorizzazione per questi host"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "disattivato"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "accesso completo"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "autorizza l'accesso a questi host"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Consenti all'utente di connettersi solo a questo elenco di host"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automatico"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "Scaduto"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "Il tempo di grazia è attivo"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "Attivo"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "Password scaduta"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "Password non modificabile"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr "Gruppo di utenti %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Gruppi e ruoli"
 
@@ -3077,7 +2755,7 @@ msgid "Password hash method to use"
 msgstr "Algoritmo da usare per la password"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -3114,163 +2792,167 @@ msgstr "Informazioni account utente"
 msgid "User account"
 msgstr "Account utente"
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr "Stato di blocco utente"
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Cognome"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Cognome utente"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Nme utente"
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Breve descrizione dell'utente"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Foto"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Avatar di questo utente"
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Informazioni di contatto organizzativo"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Località"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Regione"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Indirizzo"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Indirizzo postale ufficio"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Numero dell'ufficio"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefono"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Telefono ufficio"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Telefono cellulare professionale"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Cercapersone"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Numero pager ufficio"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Numero fax ufficio"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Pagina Web personale"
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Informazioni account utente"
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Login utente"
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Password dell'utente"
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Informazioni personali utente"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Mostra il nome"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr "Nome col quale questo utente dovrebbe apparire. Usato da Exchange."
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Indirizzo di casa"
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Indirizzo postale di casa"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Numero di telefono privato"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Numero di telefono di casa"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titolo"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
@@ -3278,77 +2960,93 @@ msgstr ""
 "Titolo di una persona nel proprio contesto organizzativo. Ogni titolo è una "
 "valore di questo attributo multivalore"
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr "Dipartimento al quale appartiene l'utente"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Numero del dipartimento"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Matricola No."
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Matricola dell'impiegato"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Manager"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr "Via"
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "CAP"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Impossibile trovare %s nell'annuario LDAP"
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Non le é permesso cambiare la propria password"
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Devi attendere %d secondi prima di cambiare di nuovo la password"
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "La password si trova nella cronologia delle vecchie password"
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr "La password non è stata cambiata dal valore esistente"
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
@@ -3356,22 +3054,22 @@ msgstr ""
 "Le password che hai inserito come \" Nuova password \" e \"Ripeti nuova "
 "password\" non corrispondono."
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Imposta la nuova password"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 "La password che hai definito come 'Nuova password' è troppo simile a quella "
 "attuale."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "La 'Nuova password' immessa è troppo corta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La password contiene caratteri Unicode eventualmente problematici!"
 
@@ -3483,29 +3181,41 @@ msgstr ""
 "Gli utenti possono usare uno dei loro indirizzi email alternativi per il "
 "recupero della loro password"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Attributo di connessione"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+"Di solito UID, ma è possibile utilizzare qualcos'altro per esempio in caso "
+"di SSO"
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Prima email"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Oggetto"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Soggetto della prima email"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] link verso il recupero della password"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr "Corpo del messaggio (il primo %s è il login, il secondo è il link)"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3514,7 +3224,7 @@ msgstr ""
 "Corpo del messaggio della prima email, inviata quando l'utente chiede una "
 "nuova password. %s è usato per il login utente e il link di recupero."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3535,25 +3245,25 @@ msgstr ""
 "\n"
 "Questo link é valido solo per 10 minuti."
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Seconda email"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Soggetto della seconda email"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 "[FusionDirectory] Il recupero della password è stato eseguito con successo"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Corpo del messaggio (%s è il login utente)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3562,7 +3272,7 @@ msgstr ""
 "Corpo del messaggio della seconda email, inviata per confermare la modifica "
 "della password. %s è usato per il login dell'utente."
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3623,58 +3333,108 @@ msgid "Timezone to be used"
 msgstr "Fuso orario da usare"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Impostazione schema"
+msgid "Core settings"
+msgstr "Impostazioni di base"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Dimensione massima dell'annuario LDAP"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Definisce il numero di voci ottenibili da LDAP come impostazione "
+"predefinita."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Blocco modifica"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Controlla se una voce attualmente in fase di modifica è stata modificata al "
+"di fuori di FusionDirectory nel frattempo."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Attiva il debugging"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Log degli eventi dal lato di FusionDirectory."
+
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
+msgstr "Convalida dello schema"
+
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr "Attivare la validazione degli schemi alla connessione"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Attiva le copie istantanee"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Questo abilita la possibilità di salvare alcuni stati delle entrate per "
+"poterle in seguito restaurare"
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
-msgstr "Convalida dello schema"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base per le copie istantanee"
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
-msgstr "Attivare la validazione degli schemi alla connessione"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "La base dove gli snapshot saranno immagazzinati nell'annuario LDAP."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Impostazioni per la password"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Algoritmo di memorizzazione delle password"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Algoritmo di default da usare"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Forza l'algoritmo di default"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Forza l'uso dell'algoritmo di default per le password"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Lunghezza minima per le password"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Lunghezza minima per le password utente"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Differenze minime della password"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Numero minimo di caratteri diversi rispetto alla  vecchia password"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Utilizza una scadenza per l'account"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -3682,84 +3442,33 @@ msgstr ""
 "Attiva gli attributi di test della password durante la connessione a "
 "FusionDirectory e forza il rinnovo della password oppure blocca l'account"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attributo da salvare nell'attributo userPassword"
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Impostazioni di base"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Mostra il riepilogo negli elenchi"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Determina se una barra di stato verrà visualizzata nella parte inferiore "
-"delle liste, visualizzando una breve sintesi del tipo e del numero di "
-"elementi nella lista."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Blocco modifica"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Controlla se una voce attualmente in fase di modifica è stata modificata al "
-"di fuori di FusionDirectory nel frattempo."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Attiva il debugging"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Log degli eventi dal lato di FusionDirectory."
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Dimensione massima dell'annuario LDAP"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr ""
-"Definisce il numero di voci ottenibili da LDAP come impostazione "
-"predefinita."
-
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Connessione e sessione"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Attributo di connessione"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Quale attributo LDAP deve essere utilizzato come nome di login durante il "
 "login."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forza le connessioni criptate"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3767,287 +3476,179 @@ msgstr ""
 "Abilita i controlli di sicurezza PHP per forzare l'accesso cifrato (https) "
 "verso l'interfaccia web."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Mostra un avvertimento quando la sessione non è criptata"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "verrà visualizzato un avvertimento all'utente quando si utilizza http invece"
 " di https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Durata di vita della sessione"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr "Definisce, in secondi, quando una sessione scade (0 per disabilitare)"
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr "Autentificazione HTTP Basic"
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 "Usa protocollo di autenticazione HTTP Basic anziché il modulo di login."
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr "Autenticazione HTTP Header"
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr "Utilizzare l'autenticazione HTTP Header anziché il modulo di login."
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr "Nome intestazione"
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr "Nome dell'header contenente identificativo utente."
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Attiva le copie istantanee"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-"Questo abilita la possibilità di salvare alcuni stati delle entrate per "
-"poterle in seguito restaurare"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base per le copie istantanee"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "La base dove gli snapshot saranno immagazzinati nell'annuario LDAP."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Percorso della chiave"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr "Percorso a chiave privata FusionDirectory . Inutilizzato per ora."
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Percorso del Certificato"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr "Percorso al certificato di FusionDirectory;  Inutilizzato per ora."
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Percorso del certificato CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 "Percorso al certificato CA. Usato per convalidare l'host del Server "
 "Argonaut."
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Abilita CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr "IL Login CAS verrà usato al posto del bind LDAP"
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr "Percorso del file contenente il certificato CA sul server CAS"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr "Host del server CAS"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Porta"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr "Porta sulla quale il server CAS è all'ascolto"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr "Contesto CAS"
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr "Contesto CAS da utilizzare"
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 "Ramo dell'annuario dove sono immagazzinate le informazioni sugli utenti e i "
 "gruppi"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Tipo di attributo DN degli utenti"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attributo da usare all'inizio del dn degli utenti"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr "Modello CN"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr "Modello da usare per costruire il nome comune del campo"
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Regola di denominazione rigorosa"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Consente il controllo rigoroso di nomi utente e di gruppo"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr "Gruppo/utente minimo ID"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-"Il minimo utente o grupp ID assegnabile per evitare perdite di sicurezza con"
-" iaccount ID 0."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Id hook successivo"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-"Script da nominare per trovare il prossimo numero ID libero per gli utenti o"
-" i gruppi."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Numero base per questo ID utente"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Dove cominciare a cercare un nuovo id libero per un utente."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Numero base per questo id gruppo"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Dove cominciare a cercare un nuovo id libero per un gruppo ."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "RDN utenti"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Ramo nel quale gli utenti sono immagazzinati"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "RDN gruppi"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Il ramo nel quale i gruppi saranno immagazzinati."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "Ruolo ACL RDN"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Ramo nel quale i ruoli ACL sono immagazzinati"
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Metodo di assegnazione Id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Metodo per allocare utente / gruppo id"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradizionale"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Id del pool di Samba unix"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Minimo pool id dell'utente"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr "Valore minimo di un id utente quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Id utente pool max"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr "Valore massimo di un id utente quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Id utente pool min"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Valore minimo di un id gruppo quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
-msgstr "Id gruppo pool min"
-
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Valore massimo di un id gruppo quando si utilizza il metodo pool"
-
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:313
 msgid "Restrict role members"
 msgstr "Limitare i membri del ruolo"
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:313
 msgid ""
 "When enabled only users from the same branch or members of groups from the "
 "same branch can be added to a role."
@@ -4055,15 +3656,34 @@ msgstr ""
 "Quando è abilitato solo gli utenti dello stesso ramo o membri di gruppi "
 "dello stesso ramo possono essere aggiunti ad un ruolo."
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:321
+msgid ""
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Mostra gli errori"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -4072,11 +3692,11 @@ msgstr ""
 "essere disabilitato nelle installazioni di produzione, a causa di possibili "
 "password che potrebbero passare in chiaro."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Durata massima di una richiesta LDAP"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -4084,11 +3704,11 @@ msgstr ""
 "Interrompi le azioni LDAP se non ci sono risposte nel tempo limite impartito"
 " in secondi."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Inserisci le statistiche dell'annuario LDAP nel giornale di sistema"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -4096,55 +3716,90 @@ msgstr ""
 "Invia le statistiche di timing LDAP al syslog. Questo può aiutare a trovare "
 "i problemi di indicizzazione o i filtri di ricerca erronei."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Livello per il debug"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Mostra alcune informazioni su ogni caricamento della pagina."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Altro"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Mostra il riepilogo negli elenchi"
+
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+"Determina se una barra di stato verrà visualizzata nella parte inferiore "
+"delle liste, visualizzando una breve sintesi del tipo e del numero di "
+"elementi nella lista."
+
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr "Mostra tab ACL su tutti gli oggetti"
+
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+"Per l'impostazione di diritti ACL molto specifici potreste aver bisogno di "
+"dare accesso ad un singolo oggetto."
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr "Categorie di reparto disponibili"
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr "Categorie disponibili nel menu a discesa"
+
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks"
+msgstr "Connessioni"
+
+#: plugins/config/class_configInLdap.inc:387
 msgid "Hooks that are called when specific actions happens"
 msgstr "Hooks che sarà chiamato quando un'azione specificasi verifica"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "tab"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:391
 msgid "The tab that this hook concerns"
 msgstr "Il tab concernente questo hook"
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr "Modalità"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:396
 msgid "When to call this command"
 msgstr "Quando chiamare questo comando"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "comando"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:403
 msgid "The command that will be called"
 msgstr "Il comando che sarà chiamato"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Connessioni"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:417
 msgid "Display hook output"
 msgstr "Mostra hook di uscita"
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:418
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
@@ -4152,44 +3807,6 @@ msgstr ""
 "Quando l'esecuzione dell'hook é abilitata con successo il risultato é "
 "mostrato all'utente tramite una finestra di dialogo."
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Shell disponibili"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Shell POSIX disponibili per gli utenti FD"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr "Shell di default"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
-"Shell utilizzato per impostazione predefinita durante l'attivazione scheda "
-"Unix."
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Mostra tab ACL su tutti gli oggetti"
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
-"Per l'impostazione di diritti ACL molto specifici potreste aver bisogno di "
-"dare accesso ad un singolo oggetto."
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr "Categorie di reparto disponibili"
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr "Categorie disponibili nel menu a discesa"
-
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
 msgstr "Plugins"
@@ -4290,9 +3907,8 @@ msgstr "dipartimento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4485,7 +4101,7 @@ msgstr "Elimina utente"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4505,8 +4121,7 @@ msgid "Information"
 msgstr "Informazione"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Nome del gruppo"
 
@@ -4530,128 +4145,149 @@ msgstr "Membri del ruolo"
 msgid "Add users for the role"
 msgstr "Aggiungi degli utenti per il ruolo"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Gestione dei gruppi e dei ruoli"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr "Vi permette di gestire gruppi di oggetti, gruppi e ruoli POSIX"
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Modifica le proprietà del ruolo"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Modifica le proprietà posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Mostra i gruppi di utenti"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Mostra i gruppi principali"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Mostra i ruoli organizzativi"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Mostra i gruppi di applicazioni"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr "Mostra gruppi non identificati"
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Mostra i gruppi principali"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostra i gruppi di posta elettronica"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostra i gruppi samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr "Mostra voci DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Mostra i gruppi di servers"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Mostra i gruppi di workstations"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Mostra i gruppi"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Mostra i gruppi di terminali"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Mostra i gruppi di stampanti"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Mostra i gruppi di telefoni"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Tipo sconosciuto : %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Non esiste il dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Gruppo di oggetti"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Informazioni gruppo di oggetti"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Breve descrizione del gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Oggetti membri"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Oggetti membro di questo gruppo"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema di fiducia"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modalità di fiducia"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Tipo di autorizzazione per questi host"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "disattivato"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "accesso completo"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "autorizza l'accesso a questi host"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host "
 
-#: plugins/admin/groups/class_ogroup.inc:319
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr "Non é consentito mettre workstations e terminali nello stesso gruppo"
@@ -4660,35 +4296,6 @@ msgstr "Non é consentito mettre workstations e terminali nello stesso gruppo"
 msgid "List of groups"
 msgstr "Elenco dei gruppi"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr "Informazioni gruppo POSIX"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr "Gruppo POSIX"
-
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr "Gruppo utenti POSIX"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Forza il GID"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
-msgstr "Forzare il valore GID per questo gruppo"
-
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
-msgstr "Valore GID per questo gruppo"
-
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Membri del gruppo"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4736,10 +4343,6 @@ msgstr "Assegnazione Dialog ACL"
 msgid "Access control roles assignment dialog"
 msgstr "Gestione della lista di controllo degli accessi"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modalità"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Si applica ad una sottostruttura completa oppure soltanto alla base?"
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index c67a1d98aaf67d44c278a239aeb4a7219bf0c9ce..1c9b447b8bb210b49371a555a28ca601fbb75dd5 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Brīdinājums"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP kļūda"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Brīdinājums"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Lietotāji"
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Izveidot"
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Lietotāji"
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Kļūda"
@@ -797,70 +758,70 @@ msgstr "Kļūda"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Darbības"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Atļauja"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
-#, php-format
-msgid "The required field %s is empty!"
-msgstr ""
-
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,280 +1499,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1906,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2004,37 +1918,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2047,11 +1961,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2059,13 +1972,12 @@ msgstr "Vārds "
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Apraksts"
@@ -2117,8 +2029,8 @@ msgstr "Labot"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2180,37 +2092,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2242,28 +2155,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2308,8 +2226,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2318,7 +2236,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2329,7 +2247,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2403,6 +2321,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2476,36 +2398,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2433,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "E-pasta adrese"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2620,224 +2537,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2864,7 +2565,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2901,258 +2602,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Uzvārds"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Vārds"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Atrašanās vieta"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Valsts"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adrese"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Tālrunis"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobilais"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Peidžeris"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fakss"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Mājas pasta adrese"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Mājas tālruņa numurs"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Nosaukums"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organizācija"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Nodaļa"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Pasta indekss"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3260,36 +2981,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3301,31 +3032,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3379,530 +3110,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4001,9 +3645,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4192,7 +3835,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4212,8 +3855,7 @@ msgid "Information"
 msgstr "Informācija"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4237,163 +3879,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4443,10 +4077,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index 55d2b1cf31f9118fc42e70ba6e59b7786a8a7328..3eb855d2b6a2e3c1186d3b38dbb2a6f173624612 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Feil"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Opprett"
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Feil"
@@ -797,70 +758,70 @@ msgstr "Feil"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,280 +1499,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1906,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2004,37 +1918,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2047,11 +1961,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2059,13 +1972,12 @@ msgstr "Navn"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Beskrivelse"
@@ -2117,8 +2029,8 @@ msgstr "Endre"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2180,37 +2092,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2242,28 +2155,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2308,8 +2226,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2318,7 +2236,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2329,7 +2247,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2403,6 +2321,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2476,36 +2398,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2433,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2620,224 +2537,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2864,7 +2565,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2901,258 +2602,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3260,36 +2981,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3301,31 +3032,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3379,530 +3110,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Vert"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4001,9 +3645,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4192,7 +3835,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4212,8 +3855,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4237,163 +3879,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4443,10 +4077,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index a6c98bd0035a563c6b1310129b05698e78d97b97..29c864c573355cc26fb31a0fa80f6b136cb7ba93 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -18,75 +18,267 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Gewenste taal"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Taal setup"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Deze stap laat je toe om je gewenste taal te kiezen."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Naam van de locatie"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "Connectie URI"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS connectie"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Basis"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Authentificatie"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Beheerders DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Beheerders wachtwoord"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Huidige status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "LDAP setup"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "LDAP connectie setup"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Deze dialoog zorgt voor de basis configuratie van de LDAP connectiviteit "
+"voor FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonieme bind naar server '%s' is mislukt! "
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Bind als gebruiker '%s' is mislukt!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Opnieuw proberen"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Anonieme bind naar server '%s' is succesvol."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Ververs"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Specifieer aub een gebruikersnaam en paswoord!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Bind als gebruiker '%s' naar server '%s' is succesvol!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Setup error"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Voltooid"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Volgende"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Welkom"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Opslaan"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Voltooid - schrijf configuratie bestand"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Schrijf configuratie bestand"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Je configuratie bestand is momenteel wereldleesbaar. Update aub de "
+"bestandsrechten!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "De configuratie is momenteel niet leesbaar of bestaat niet."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Na het downloaden en plaatsen van het bestand onder %s, verifieer aub dat de"
+" gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, "
+"terwijl andere gebruikers dit niet kunnen."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "PHP module en extensie verificaties"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Installatie verificatie"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Standaard verificatie voor PHP compatibiliteit en extensies"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "PHP versie word geverifiëerd"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP moet versie %s zijn of meer"
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Upgrade aub naar de gesupporteerde versie."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory heeft deze module nodige om te kunnen communiceren met de "
 "LDAP server."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory heeft deze module nodig voor een internationale inferface."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -94,22 +286,22 @@ msgstr ""
 "FusionDirectory heeft deze module nodig om te kunnen communiceren met "
 "verschillende types van servers en protocollen."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory heeft deze module nodig voor samba integratie."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -117,42 +309,42 @@ msgstr ""
 "FusionDirectory heeft of de 'mhash' of de 'sha1' module nodig om gebruik te "
 "maken van SSHA encryptie."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory heeft deze module nodig om met de IMAP server te kunnen "
 "communiceren."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 "FusionDirectory heeft deze module nodig om unicode strings te kunnen "
 "behandelen."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 "FusionDirectory heeft deze extensie nodig om afbeeldingen te kunnen "
 "bewerken."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "compressie module"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 "FusionDirectory heeft deze extensie nodig om snapshots te kunnen behandelen."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -162,17 +354,17 @@ msgstr ""
 "registreren en toegankelijk te maken vanuit scripts zonder de scope te "
 "moeten aanpassen. Dit kan een veiligheidsrisico vormen. "
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Zoek voor 'register_globals' in je php.ini en schakel het 'uit'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP gebruikt deze waarde voor de vuilbak verzamelaar en om oude sessies te "
 "verwijderen."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -180,7 +372,7 @@ msgstr ""
 "Deze waarde naar 1 dag plaatsen kan het verliezen van de sessies en "
 "cookiesdoor timeout voorkomen."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -188,12 +380,12 @@ msgstr ""
 "Zoek voor 'session.gc_maxlifetime' in je php.ini en plaats het naar 86400 of"
 " hoger."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Uit"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -201,12 +393,12 @@ msgstr ""
 "Om FusionDirectory zonder problemen te kunnen gebruiken, de moet je de "
 "session.auto_start optie in je php.ini naar 'Off' wijzigen."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Zoek naar 'session.auto_start' in je php.ini en zet de waarde naar 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -215,13 +407,13 @@ msgstr ""
 "limiet plaatsen kan errors veroorzaken die niet hergeproduceerd kunnen "
 "worden! Vergroot deze waarde voor grotere installaties."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "Zoek voor 'memory_limit' in je php.ini en plaats het naar '128M' of hoger."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -229,22 +421,22 @@ msgstr ""
 "Deze optie beinvloed de PHP output handling. Zet deze optie uit, om "
 "performantie te verhogen."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Zoek naar 'implicit_flush' in je php.ini and zet de waarde 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "De uitvoertijd zou minstens 30 seconden moeten zijn."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 "Zoek naar 'max_execution_time' in je php.ini en zet het naar '30' of hoger."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -253,17 +445,17 @@ msgstr ""
 "plaatsen. PHP zal geen informatie over de server die je draait verzenden als"
 " je dit doet."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Zoek naar 'expose_php' in je php.ini en zet het naar 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Verhoog je server performantie door de optie magic_quotes_gpc naar 'off' te "
 "plaatsen."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -271,129 +463,109 @@ msgstr ""
 "Zoek naar 'zend.ze1_compatibility_mode' in je php.ini en plaats het naar "
 "'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Welkom"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Welkom bij de FusionDirectory setup wizard"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Het welkomstbericht"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migratie"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "LDAP inspectie"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analyseer je huidige LDAP voor FusionDirectory compatibiliteit"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Inspectie van de object classes in root object"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Rechten aan het nakijken voor de LDAP databank"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Verificatie voor onzichtbare gebruikers"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Verificatie voor super administrator"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Verificatie voor gebruikers buiten de people tree"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Verificatie voor groepen buiten de groups tree"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Verificatie voor onzichtbare departementen"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Verificatie voor duplicate UID nummers"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "LDAP query faalde"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Mislukt"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Ontbrekende FusionDirectory object class '%s'!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Kijk je installatie na aub."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -402,47 +574,31 @@ msgstr ""
 "Kan het structurele object type van je root object niet gebruiken. Probeer "
 "de object class '%s' manueel toe te voegen."
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -451,322 +607,132 @@ msgstr ""
 "%s gebruiker(s) gevonden die niet zichtbaar zijn in FusionDirectory of die "
 "incompleet zijn."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Migratie error"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Aanmaken"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Gebruikers"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Groepen"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Rolen"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Er is geen FusionDirectory administrator account in je LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Aanmaken"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Verplaats gebruikers in deze geconfigureerde user tree"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "naar"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "De volgende referenties zullen upgedate worden"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Vond %s groepen buiten de geconfigureerde tree '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Vond %s departement(en) die niet zichtbaar zullen zijn in FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1375
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Naam van de locatie"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "Connectie URI"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS connectie"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Basis"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Authentificatie"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Beheerders DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Beheerders wachtwoord"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Huidige status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "LDAP setup"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "LDAP connectie setup"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Deze dialoog zorgt voor de basis configuratie van de LDAP connectiviteit "
-"voor FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonieme bind naar server '%s' is mislukt! "
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Bind als gebruiker '%s' is mislukt!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Opnieuw proberen"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Anonieme bind naar server '%s' is succesvol."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Ververs"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Specifieer aub een gebruikersnaam en paswoord!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Bind als gebruiker '%s' naar server '%s' is succesvol!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Opslaan"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Voltooid - schrijf configuratie bestand"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Schrijf configuratie bestand"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"Je configuratie bestand is momenteel wereldleesbaar. Update aub de "
-"bestandsrechten!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "De configuratie is momenteel niet leesbaar of bestaat niet."
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
-"Na het downloaden en plaatsen van het bestand onder %s, verifieer aub dat de"
-" gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, "
-"terwijl andere gebruikers dit niet kunnen."
-
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Setup error"
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Voltooid"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Welkom bij de FusionDirectory setup wizard"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Volgende"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Het welkomstbericht"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -786,17 +752,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Gespecifieerd objectType is leeg of ongeldig!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Verwerk"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Omhoog"
 
@@ -823,24 +789,19 @@ msgstr "Selecteer alles"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fout"
@@ -849,70 +810,70 @@ msgstr "Fout"
 msgid "created by"
 msgstr "aangemaakt door"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Acties"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Kopieer"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Knip"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Restaureer snapshots"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Export lijst"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaureer snapshot"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Maak snapshot"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Maak een nieuw snapshot van dit object"
 
@@ -930,9 +891,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Configuratie fout"
@@ -959,27 +920,27 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Gevraagde kanaal bestaat niet! Gelieve je Systeembeheerder te contacteren."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Rechten"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annuleer alles"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Kan niet plakken"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -987,8 +948,10 @@ msgstr "Inlognaam"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Sjabloon"
 
@@ -1016,7 +979,7 @@ msgstr ""
 "Fatale error: kan class '%s' niet instantiëren - probeer '%s' te draaien om "
 "dit op te lossen"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1024,33 +987,33 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Fatale fout."
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAAL: Fout bij het verbinden met de LDAP server. De server meldt: '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Authentificatie error"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Error tijdens het toevoegen van de lock. Contacteer de programmeurs!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1059,12 +1022,12 @@ msgstr ""
 "Kan de locking informatie voor de LDAP tree niet aanmaken. Gelieve je "
 "systeembeheerder te contacteren!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server returned: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1072,12 +1035,12 @@ msgstr ""
 "Verschillende locks zijn teruggevonden voor het object dat je wilt in lock "
 "plaatsen. Dit zou niet mogen gebeuren - Opschonen van meerdere referenties."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1086,85 +1049,77 @@ msgstr ""
 "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
 "limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Instellen"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Je staat op het punt de LDAP inzending/inzendingen te wijzigen %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Regels per pagina"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Filter toepassen"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1173,128 +1128,87 @@ msgstr ""
 "Bestand '%s' kon niet verwijderd worden. Probeer fusiondirectory-setup "
 "--check-directories om de rechten correct te plaatsen."
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Kan niet wegschrijven naar revisie bestand!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP waarschuwing"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kan geen schema informatie krijgen van de server. Geen schema verificatie "
 "mogelijk!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Class(es) beschikbaar"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Kan geen vrij ID  toekennen:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >=%sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool is niet uniek!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "Geen ID beschikbaar!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "maximum pogingen overschreden!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Kan geen vrij ID toekennen!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Alle objecten in deze categorie"
 
@@ -1307,51 +1221,47 @@ msgstr "Los aub de bovenstaande error op en herlaad de pagina."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML fout in fusiondirectory.conf: %s op regel %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kan niet binden met de LDAP. Gelie je systeembeheerder te contacteren."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"De snapshot functionaliteit is aan, maar de vereiste variabele '%s' is niet "
-"ingesteld."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"De snapshot funcionaliteit is geactiveerd, maar de vereiste compressie "
-"module ontbreekt. Installeer aub '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Alle categoriën"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mijn account"
 
@@ -1374,7 +1284,7 @@ msgstr "Selecteer om objecten te tonen die '%s' actief hebben"
 msgid "Select to search within subtrees"
 msgstr "Selecteer om binnen subonderdelen te zoeken"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Zoek in subtrees"
 
@@ -1583,52 +1493,46 @@ msgstr "'%s' moet %d zijn of hoger!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' hangt af van '%s' - geef aub beidde waarden in!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
-#, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "Er is al een inzending met dit '%s' attribuut in het systeem!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "Het vereiste veld '%s' is leeg!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' is niet toegelaten:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' zijn niet toegelaten!"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "%s PHP extensie ontbreekt!"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1636,27 +1540,27 @@ msgstr "%s PHP extensie ontbreekt!"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Toepassen"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Opslaan"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Toevoegen"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Voeg %s toe"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1664,31 +1568,31 @@ msgstr "Voeg %s toe"
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Verwijder %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Wijzig..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Wijzig %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Terug"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "De account heeft geen geldige %s extensies!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1697,7 +1601,7 @@ msgstr ""
 "Deze account heeft %s opties actief. Je kan deze desactiveren door op ze te "
 "klikken hieronder."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1706,7 +1610,7 @@ msgstr ""
 "Deze account heeft %s opties actief. Om ze te desactiveren, zal je de %s "
 "opties eerst moeten verwijderen!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1715,7 +1619,7 @@ msgstr ""
 "Deze account heeft %s opties op non-actief. Om ze te activeren kan je "
 "hieronder op ze klikken."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1724,184 +1628,191 @@ msgstr ""
 "Deze account heeft %s opties op non-actief. Om ze te activeren moet je de %s"
 " opties eerst toevoegen!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Voeg %s opties toe"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Verwijder %s opties"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Januari"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Februari"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Maart"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Mei"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Augustus"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "December"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Zondag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Maandag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "lees operatie"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "voeg operatie toe"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "wijzig operatie"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "verwijder operatie"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "zoek operatie"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "authentificatie"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s faalde!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "LDAP operaite faalde!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Object"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Upload faalde!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Upload faalde: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Communicatie met de infrastructuur dienst faalde!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Communicatie met de infrastructuur dienst faalde: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "De '%s' is nog steeds in gebruik door dit object: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "De '%s' is nog steeds in gebruik."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "De '%s' is nog steeds in gebruik door deze objecten: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Bestand '%s' bestaat niet!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan bestand '%s' niet openen om te lezen!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan bestand '%s' niet openen om te schrijven!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1910,37 +1821,37 @@ msgstr ""
 "De waarde voor '%s' is momenteel niet geconfigureerd of niet geldig, "
 "verifieer aub je configuratie bestand!"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan bestand '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kan folder '%s' niet maken!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan folder '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificatie voor %s support"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installeer en activeer de %s PHP module."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installeer en activeer de %s Pear module."
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1949,7 +1860,7 @@ msgstr ""
 "Kan class '%s' niet initializeren! Misschien ontbreekt er een plugin in je "
 "FusionDirectory setup?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1992,7 +1903,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2091,37 +2001,37 @@ msgstr "bij het bewerken van LDAP server %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2134,11 +2044,10 @@ msgstr "Gelieve de items te selecteren"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2146,13 +2055,12 @@ msgstr "Naam"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Omschrijving"
@@ -2204,8 +2112,8 @@ msgstr "Bewerken"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2267,37 +2175,38 @@ msgstr "dagen"
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Filter fout"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Deze filter is niet compleet!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "U heeft geen toestemming om een snapshot te maken voor %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "U heeft geen toestemming om een snapshot te herstellen voor %s."
@@ -2329,28 +2238,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2395,8 +2309,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -2405,7 +2319,7 @@ msgstr "Uploaden"
 msgid "Download"
 msgstr "Downloaden"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2416,7 +2330,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2490,6 +2404,10 @@ msgstr "Onbekende inzending '%s'!"
 msgid "All users"
 msgstr "Alle gebruikers"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Filter toepassen"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2565,36 +2483,31 @@ msgstr "Geef a.u.b. uw wachtwoord op!"
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2607,44 +2520,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr "Deze token is niet geldig"
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Er was een probleem met de mail server, de bevestiging werd niet verstuurd"
@@ -2718,224 +2631,8 @@ msgstr "Welkom %s!"
 msgid "References"
 msgstr "Referenties"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Wijzig gebruikers POSIX opties"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Persoonlijke map"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "niet geconfigureerd"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Primaire groep"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Groep lidmaatschap"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Account"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Systeem vertrouwen"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Vertrouwensmodus"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "gedeactiveerd"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "volledige toegang"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "sta toegang op deze computers toe"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automatisch"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "verlopen"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "gratie tijd actief"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "actief"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "paswoord is vervallen"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "paswoord niet wijzigbaar"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2962,7 +2659,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2999,259 +2696,279 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Voornaam"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Provincie"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Kamernummer"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefoon"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Getoonde naam"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Postadres thuis"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telefoon privé"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Prive nummer"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organisatie"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Afdeling"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Departement nummer"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Werknemer nummer"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Beheerder"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Postcode"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 "Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Het nieuw opgegeven wachtwoord is te kort."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
 
@@ -3359,36 +3076,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Login attribuut"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Paswoord herstel link"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3400,31 +3127,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Paswoord herstel succesvol"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3469,539 +3196,452 @@ msgstr "Thema"
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
-msgstr "Tijdzone"
-
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr "Tijdzone"
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Activeer snapshots"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Snaphosts basis"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Paswoord opties"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Paswoord minimum lengte"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Gebruik account expiration"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Toon overzicht in lijsten"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Login en sessie"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Login attribuut"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Forceer gëencrypteerde connecties"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Verwittig mij als de sessie niet gëencrypteerd is"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Sessie levensduur"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Activeer snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Snaphosts basis"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Poort"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "People and group opslag"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "People DN attribuut"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximum LDAP query tijd"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Log LDAP statistieken"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug level"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Terminal Service diverse"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Toon overzicht in lijsten"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modus"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modus"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4100,9 +3740,8 @@ msgstr "afdeling"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4291,7 +3930,7 @@ msgstr "Verwijder gebruiker"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4311,8 +3950,7 @@ msgid "Information"
 msgstr "Informatie"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4336,164 +3974,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Voeg gebruikers toe voor de rol"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Wijzig posix eigenschappen"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Toon primaire groepen"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Toon primaire groepen"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Toon mailgroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Toon Samba groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objectgroep"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Groep"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Lidmaatschap objecten"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Systeem vertrouwen"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lijst met groepen"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Vertrouwensmodus"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "gedeactiveerd"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "volledige toegang"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Forceer GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "sta toegang op deze computers toe"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Groepsleden"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lijst met groepen"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4542,10 +4172,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modus"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index fd8f79889c3902ee12407f0107ea85a0c0752eb8..d0a4b9f9cc639a5a8cf9052eaad4498e9d0cdb46 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Ustawienia językowe"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Tek krok umożliwia wybranie preferowanego języka."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nazwa lokalizacji"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Kontener"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN Administratora"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Hasło Administratora"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Obecny status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Ustawienia LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Ponawia"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Odśwież"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Błąd ustawień"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Następne"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Witaj"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Zakończ"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Zapisz plik konfiguracyjny"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Sprawdzenie instalacji"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Sprawdzam wersjÄ™ PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Proszę zaktualizować do wspieranej wersji."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "moduł kompresji"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Wyłączone"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Witaj"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Wiadomość powitalna"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Niepowodzenie"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Błąd migracji"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Użytkownicy"
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "Grupy"
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Utwórz"
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Użytkownicy"
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr "Grupy"
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Przenieś użytkowników do skonfigurowanego drzewa"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "do"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1375
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1419
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nazwa lokalizacji"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Kontener"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN Administratora"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Hasło Administratora"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Obecny status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Ustawienia LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Ponawia"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Odśwież"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Zakończ"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Zapisz plik konfiguracyjny"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Błąd ustawień"
-
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Następne"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Wiadomość powitalna"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Główny"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Wyślij"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Góra"
 
@@ -771,24 +737,19 @@ msgstr "Wybierz wszystko"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Błąd"
@@ -797,70 +758,70 @@ msgstr "Błąd"
 msgid "created by"
 msgstr "utworzone przez"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Idź do głównego departamentu"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Akcje"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Wytnij"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
@@ -906,27 +867,27 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Uprawnienie"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Anuluj wszystko"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Nie można wkleić"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr "Login"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Szablon"
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,55 +930,55 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Błąd krytyczny"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "BŁĄD: Nie można połączyć się z serwerem LDAP. Odpowiedź serwera '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Błąd autentykacji"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit wielkości %d elementów został przekroczony!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1024,211 +987,162 @@ msgstr ""
 "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest"
 " przekroczony"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Wpisów na stronie"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Zastosuj filtr"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Ostrzeżenie LDAP"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Wszystkie obiekty w tej kategorii"
 
@@ -1241,46 +1155,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Błąd XML w pliku fusiondirectory.conf: %s w linii %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Wszystkie kategorie"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Moje konto "
 
@@ -1303,7 +1217,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr "Zaznacz aby wyszukiwać wewnątrz poddrzew"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1512,52 +1426,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1565,27 +1473,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Zapisz"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1593,280 +1501,287 @@ msgstr "Dodaj %s"
 msgid "Delete"
 msgstr "Usuń"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Usuń %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Edytuj %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Wróć"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Styczeń"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Luty"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Marzec"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Kwiecień"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Maj"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Czerwiec"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Lipiec"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Sierpień"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Wrzesień"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Październik"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Listopad"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Grudzień"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "PiÄ…tek"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sobota"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Obiekt"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Błąd komunikacji z usługą infrastruktury!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Błąd komunikacji z usługą infrastruktury: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Plik '%s' nie istnieje!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1908,7 +1823,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2006,37 +1920,37 @@ msgstr "podczas połączenia z serwerem LDAP '%s'"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2049,11 +1963,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2061,13 +1974,12 @@ msgstr "ImiÄ™"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Opis"
@@ -2119,8 +2031,8 @@ msgstr "Edytuj"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2182,37 +2094,38 @@ msgstr "dni"
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2244,28 +2157,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2310,8 +2228,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Wgraj"
 
@@ -2320,7 +2238,7 @@ msgstr "Wgraj"
 msgid "Download"
 msgstr "ÅšciÄ…gnij"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2331,7 +2249,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2405,6 +2323,10 @@ msgstr "Nieznany wpis  '%s'!"
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Zastosuj filtr"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2478,36 +2400,31 @@ msgstr "Proszę podać prawidłowe hasło!"
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2520,44 +2437,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Adres email"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2624,224 +2541,8 @@ msgstr "Witaj %s!"
 msgid "References"
 msgstr "Zależności"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Katalog domowy"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "nieskonfigurowane"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Grupa podstawowa"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Przynależność do grup"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Konto"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "Użytkownik musi zmienić hasło przy pierwszym logowaniu"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Zaufanie systemowe"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Tryb zaufania"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "wyłączone"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "pełen dostęp"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "zezwól na dostęp do tych hostów"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automatyczne"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "wygasło"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "Czas prolongaty aktywny"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "Aktywne"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "hasło wygasło"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "hasło niezmienialne"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2868,7 +2569,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2905,258 +2606,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Nazwisko"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "ImiÄ™"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Stan"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Wyświetl nazwę"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telefon prywatny"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Tytuł"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organizacja"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Kod pocztowy"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Proszę podać obecne hasło aby kontynuować."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Hasło podane jako nowe jest zbyt podobne do obecnego."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Hasło podane jako nowe jest za krótkie."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3264,36 +2985,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3305,31 +3036,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3360,553 +3091,466 @@ msgstr ""
 msgid "Language"
 msgstr "Język"
 
-#: plugins/config/class_configInLdap.inc:91
-msgid ""
-"Language of the application. If 'automatic' or not available, the one asked "
-"by the browser will be used. This setting can be overriden per user."
+#: plugins/config/class_configInLdap.inc:91
+msgid ""
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr "Strefa czasowa"
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
-msgstr "Strefa czasowa"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Minimalna długość hasła"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Tryb"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "Zaczepy"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Tryb"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4005,9 +3649,8 @@ msgstr "departament"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4196,7 +3839,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4216,8 +3859,7 @@ msgid "Information"
 msgstr "Informacja"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4241,164 +3883,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Pokaż podstawowe grupy"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Pokaż podstawowe grupy"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Pokaż grupy samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupa obiektu"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupa"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Dodaj członka"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Zaufanie systemowe"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista grup"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Tryb zaufania"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "wyłączone"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "pełen dostęp"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "WymuÅ› GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "zezwól na dostęp do tych hostów"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Członkowie grupy"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista grup"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4447,10 +4081,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Tryb"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 7b6c65e71c3538a68a8c4056a3c40bc2023a66ac..67e384831b9e5dd290e397e4421df6fd0caa407e 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estatus"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Recarregar"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Atenção"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Finalizar"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Erro"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Atenção"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Usuários"
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Criar"
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Usuários"
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr "Grupos"
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1375
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1419
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
 msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Estatus"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Recarregar"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Finalizar"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr ""
-
-#: setup/class_setup.inc:208
-msgid "Completed"
+
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Raiz"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Submeter"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Para cima"
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erro"
@@ -797,70 +758,70 @@ msgstr "Erro"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Ir para departamento raiz"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Subir um departamento"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Origem"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Recarregar lista"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Ações"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erro de configuração"
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Impossível colar"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr "Login"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Editar mesmo assim"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aplicar filtro"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Todos os objetos nessa categoria"
 
@@ -1239,48 +1153,48 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Erro de XML no fusiondirectory.conf: %s na linha %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Não foi possível realizar bind para o LDAP. Por favor, contacte o "
 "administrador do sistema."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas as categorias"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Minha conta"
 
@@ -1303,7 +1217,7 @@ msgstr "Selecione para listar objetos que possuem '%s' habilitado"
 msgid "Select to search within subtrees"
 msgstr "Selecione para pesquisar dentro das sub-árvores"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Procurar em subárvores"
 
@@ -1512,52 +1426,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1565,27 +1473,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Salvar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Adicionar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1593,280 +1501,287 @@ msgstr ""
 msgid "Delete"
 msgstr "Deletar"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Voltar"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Janeiro"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Fevereiro"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Março"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Maio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Junho"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Julho"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Setembro"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Outubro"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Novembro"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Dezembro"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Segunda"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Terça"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Quinta"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Sexta"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1908,7 +1823,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2007,37 +1921,37 @@ msgstr "enquanto executava no LDAP server %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2050,11 +1964,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2062,13 +1975,12 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descrição"
@@ -2120,8 +2032,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2183,37 +2095,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2245,28 +2158,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2311,8 +2229,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2321,7 +2239,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2332,7 +2250,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2406,6 +2324,10 @@ msgstr "Entrada desconhecida '%s'!"
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aplicar filtro"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2479,36 +2401,31 @@ msgstr "Por favor, especifique sua senha!"
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique a combinação usuário / senha"
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2521,44 +2438,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2625,224 +2542,8 @@ msgstr "Bem vindo %s!"
 msgid "References"
 msgstr "Referências"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Diretório pessoal"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "desconfigurado"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Grupo primário"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Membros do grupo"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Conta"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "O usuário deve alterar sua senha no primeiro acesso"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Sistema de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Modo de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "desabilitado"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "acesso completo"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "permitir acesso a estas máquinas"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "expirado"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "ativo"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2869,7 +2570,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2906,258 +2607,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Informação pessoal"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Último nome"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Primeiro nome"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localização"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Endereço"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Nº da sala"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Fone"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página pessoal"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Telefone privativo"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Informação organizacional"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organização"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Nº do departamento"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Nº do empregado"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "CEP"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Você precisa especificar sua senha atual para continuar."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "A senha utilizada como nova e atual são muito similares."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "A senha utilizada como nova é curta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3265,36 +2986,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3306,31 +3037,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3361,553 +3092,466 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:91
+#: plugins/config/class_configInLdap.inc:91
+msgid ""
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
 msgid ""
-"Language of the application. If 'automatic' or not available, the one asked "
-"by the browser will be used. This setting can be overriden per user."
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Configurações de senha"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4006,9 +3650,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4197,7 +3840,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4217,8 +3860,7 @@ msgid "Information"
 msgstr "Informação"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4242,164 +3884,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de confiança"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista dos grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo de confiança"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desabilitado"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "acesso completo"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Forçar GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "permitir acesso a estas máquinas"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Membros do grupo"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista dos grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4448,10 +4082,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 6d3631d09708ee569eb97629a5631be798678449..45ba7b4dd23ad8dbac34b67693a52eaf00691b4c 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -18,75 +18,262 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Idioma desejado"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Configuração de idioma"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Esta etapa permite que você selecione seu idioma preferido."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automático"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Nome do local"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI da conexão"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "conexão TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Base"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autenticação"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN do administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Senha do administrador"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Estado"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Status atual"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Configuração de LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Configuração da conexão de LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Este diálogo executa a configuração básica da conectividade LDAP para o "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Ligação anônima para o servidor '%s' falhou!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Ligação como usuário '%s' falhou!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Tente novamente"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Ligação anônima para o servidor '%s' bem sucedida."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Por favor, especifique usuário e senha!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Ligação como usuário '%s' para o servidor '%s' bem sucedida!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Aviso"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Erro de configuração"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Concluído"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Próximo"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Bem-vindo"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Fim"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Módulo de PHP e checagem de extensões"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Checagem de instalação"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Verificando a compatibilidade básica com PHP e extensões"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Checando versão do PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "A versão do PHP deverá ser %s ou superior."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Por favor, atualize para uma versão suportada."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory necessita deste módulo para conversar com seu servidor LDAP."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory necessita deste módulo para uma interface "
 "internacionalizada."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -94,22 +281,22 @@ msgstr ""
 "FusionDirectory necessita deste módulo para se comunicar com diferentes tipo"
 " de servidores e protocolos."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory requer este módulo para integação com o samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -117,36 +304,36 @@ msgstr ""
 "FusionDirectory necessita tanto do módulo 'mhash' quanto do módulo 'sha1' "
 "para fazer uso da criptografia SSHA."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "O FusionDirectory necessita deste módulo para conversar com um servidor IMAP"
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory requer esta extensão para lidar com strings unicode."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory requer esta extensão para lidar com imagens."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "módulo de compressão"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory requer esta extensão para lidar com snapshots."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -156,22 +343,22 @@ msgstr ""
 "variáveis globais para serem acessíveis por meio de scripts sem modificar o "
 "escopo. Isto pode ser um risco à segurança."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Procurar por 'register_globals' em seu php.ini e marcado como 'Desativado'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr "PHP usa este valor para deletar sessões antigas do garbage collector."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -179,51 +366,51 @@ msgstr ""
 "Procurar por 'session.gc_maxlifetime' no seu php.ini e configurá-lo para "
 "86400 ou maior."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Desativar"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Pesquisar por 'session.auto_start' no seu php.ini e configurá-lo como "
 "'Desligado'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 "Procurar por 'implicit_flush' no seu php.ini e configurá-lo como "
 "'Desligado'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "O tempo de Execução deve ser no mínimo 30 segundos."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -231,24 +418,24 @@ msgstr ""
 "Pesquisa por 'max_execution_time' no seu php.ini e defina-o como '30' ou "
 "superior."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 "Pesquisar por 'expose_php' no seu php.ini e defina-o como 'Desligado'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Aumente o desempenho do seu servidor definindo magic_quotes_gpc para "
 "'desligado'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -256,494 +443,273 @@ msgstr ""
 "Pesquisar por 'zend.ze1_compatibility_mode' no seu php.ini e defina-o como "
 "'Desligado'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Bem-vindo"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Bem vindo ao assistente de configuração do FusionDirectory"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "A mensagem de \"bem vindo\""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Inspeção LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 "Analisar seu LDAP atual para verificação de compatibilidade com o "
 "FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Inspecionando classes de objeto em objeto root"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Checando permissão para banco de dados LDAP"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Checando por usuários invisíveis"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Checando por super administrador"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Checando por usuários fora da árvore de pessoas"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Checando por grupos fora da árvore de grupos"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Checando por departamentos invisíveis"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Checando por números de UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "Consulta em LDAP falhou"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Falhou"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Aviso"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Criar"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Usuários"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Atribuições"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Não existe uma conta de administrador do FusioDirectory no seu LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Criar"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrado %s grupos fora da árvore configurada '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Nome do local"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI da conexão"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "conexão TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Base"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN do administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Senha do administrador"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Estado"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Status atual"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Configuração de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Configuração da conexão de LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Este diálogo executa a configuração básica da conectividade LDAP para o "
-"FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Ligação anônima para o servidor '%s' falhou!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Ligação como usuário '%s' falhou!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Tente novamente"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Ligação anônima para o servidor '%s' bem sucedida."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Por favor, especifique usuário e senha!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Ligação como usuário '%s' para o servidor '%s' bem sucedida!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Fim"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+#: setup/class_setupStepMigrate.inc:1298
+#, php-format
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Erro de configuração"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Concluído"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Bem vindo ao assistente de configuração do FusionDirectory"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Próximo"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "A mensagem de \"bem vindo\""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -763,17 +729,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "objectType especificado está vazio ou inválido!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Subir"
 
@@ -800,24 +766,19 @@ msgstr "Selecionar tudo"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erro"
@@ -826,70 +787,70 @@ msgstr "Erro"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Página inicial"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Ações"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Recortar"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Restaurar snapshots"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Restaurar snapshot"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Criar snapshot"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Criar um novo snapshots deste objeto"
 
@@ -907,9 +868,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erro de configuração"
@@ -935,27 +896,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Permissão"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar tudo"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -963,8 +924,10 @@ msgstr "Login"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
 
@@ -988,7 +951,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -996,140 +959,132 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Erro fatal"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1138,128 +1093,87 @@ msgstr ""
 "Arquivo '%s' não pode ser deletado. Tente fusiondirectory-setup --check-"
 "directories para ajustas as permissões."
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'nextIdHook' não está disponível. Utilizando base padrão."
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Não foi possível localizar o arquivo '%s' - execute '%s' para solucionar o "
 "problema"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1272,50 +1186,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"A funcionalidade de snapshots está habilitada, mas a variável necessária "
-"'%s' não está definida."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"A funcionalidade de snapshots está habilitada, mas está faltando o módulo de"
-" compressão necessário. Por favor, instale '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Todas as categorias"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Minha conta"
 
@@ -1338,7 +1248,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Procurar em sub-árvores"
 
@@ -1547,52 +1457,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1600,27 +1504,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Salvar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Adicionar"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1628,280 +1532,287 @@ msgstr ""
 msgid "Delete"
 msgstr "Deletar"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Voltar"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "fevereiro"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "março"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "abril"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "maio"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "junho"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "julho"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "agosto"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "setembro"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "outubro"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "novembro"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "dezembro"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "domingo"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "segunda-feira"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "terça-feira"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "quarta-feira"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "quinta-feira"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "sexta-feira"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "sábado"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objeto"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1943,7 +1854,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2041,37 +1951,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2084,11 +1994,10 @@ msgstr "Por favor, selecione as entradas desejadas"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2096,13 +2005,12 @@ msgstr "Nome"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Descrição"
@@ -2154,8 +2062,8 @@ msgstr "Editar"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2217,37 +2125,38 @@ msgstr "dias"
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Erro no filtro"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "O filtro está incompleto!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Erro de permissão"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Você não tem permissões para criar um snapshot para %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Você não tem permissões para restaurar um snapshot para %s."
@@ -2279,28 +2188,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Já há uma entrada com o mesmo dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "A entrada %s não é existente"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2345,8 +2259,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Upload"
 
@@ -2355,7 +2269,7 @@ msgstr "Upload"
 msgid "Download"
 msgstr "Download"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2366,7 +2280,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
@@ -2440,6 +2354,10 @@ msgstr ""
 msgid "All users"
 msgstr "Todos os usuários"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2516,36 +2434,31 @@ msgstr "Por favor, especifique sua senha!"
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique o usuário ou senha."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conta bloqueada. Entre em contato com o administrador do sistema!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2558,46 +2471,46 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Abortado. Configuração %s/%s do FusionDirectory não pôde ser lida."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Entre em contato com o administrador, houve um problema com o servidor de "
 "e-mail."
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2669,224 +2582,8 @@ msgstr "Bem-vindo %s!"
 msgid "References"
 msgstr "Referências"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Diretório principal"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "O pacote para o diretório principal deste usuário"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Conta"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Sistema de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Modo de confiança"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "desabilitado"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "Acesso total"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "Permitir acesso a esses servidores"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Permitir apenas que este usuário conecte-se à lista de hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automático"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "senha expirada"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2913,7 +2610,7 @@ msgid "Password hash method to use"
 msgstr "Método de hash para usar na senha"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2950,258 +2647,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Localização"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Endereço"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Número da sala"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefone"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Página inicial"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Nome de exibição"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Endereço residencial"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Telefone residencial"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Título"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organização"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Número do departamento"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Número do funcionário"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Tipo de funcionário"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Gerente"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Código postal"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Você precisa especificar sua atual senha para prosseguir."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "A nova senha é muito similar à senha atual."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "A nova senha é muito curta."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "A senha contém caracteres Unicode  problemáticos."
 
@@ -3313,29 +3030,39 @@ msgstr ""
 "Os usuário também serão capazes de entrar no endereço alternativo para "
 "recuperar sua senha"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Primeiro e-mail"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Assunto"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Assunto do primeiro e-mail"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Link de recuperação de senha"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr "Corpo(primeiro %s é o login, segundo é o link)"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3344,7 +3071,7 @@ msgstr ""
 "Corpo do primeiro e-mail, envie quando o usuário perguntar pela nova senha. "
 "Use %s para o login e o link de recuperação."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3356,24 +3083,24 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Segundo e-mail"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Assunto do segundo e-mail"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Senha recuperada com sucesso"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Corpo (%s é o login)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3382,7 +3109,7 @@ msgstr ""
 "Corpo do segundo e-mail, enviado para confirmar senha alterada. Use %s para "
 "Login de usuário. "
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3433,539 +3160,452 @@ msgstr "Tema"
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
-msgstr "Fuso horário"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr "Fuso horário"
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Habilitar snapshots"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Base de snapshots"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "A base onde os snapshots devem ser armazenados dentro do LDAP."
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Configurações de senha"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Comprimento mínimo de senha"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Habilitar snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Base de snapshots"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "A base onde os snapshots devem ser armazenados dentro do LDAP."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr "Chave de pacote"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr "Caminho de certificado"
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Porta"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Método de alocação de id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Tradicional"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Pool de id samba unix"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "Modo"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "Ganchos"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "Modo"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4064,9 +3704,8 @@ msgstr "departamento"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4255,7 +3894,7 @@ msgstr "Remover usuário"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4275,8 +3914,7 @@ msgid "Information"
 msgstr "Informação"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4300,164 +3938,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Adicionar usuários para a atribuição"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Editar propriedades do posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Grupo de objeto"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Sistema de confiança"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Modo de confiança"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "desabilitado"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Acesso total"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Permitir acesso a esses servidores"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr ""
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4506,10 +4136,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Modo"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 410b620a3ed04f7c83de865eb46fd80c1c73f98f..1362277c9d6f7485a66bc48898a7f73d917b348f 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -18,20 +18,20 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Предпочитаемый язык"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Настройка языка"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Этот шаг позволяет выбрать предпочитаемый вами язык."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
@@ -41,52 +41,244 @@ msgstr ""
 " \"автоматически\" будет и использоваться язык запрошенный браузером. Эта "
 "настройка может быть переопределена для каждого пользователя."
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Местоположение"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "URI подключения"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS соединение"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Ветка"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Аутентификация"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "DN администратора"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Пароль администратора"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Состояние"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Текущее состояние"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Настройки LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Настройки LDAP соединения"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Этот диалог выполняет основную настройку LDAP соединения для "
+"FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Сбой при анонимном привязывании к серверу '%s'!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Сбой при привязки под пользователем '%s'!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "Retry"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Анонимное подключение (bind) а к серверу '%s' удалась."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Refresh"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Пожалуйста укажите пользователя и пароль!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Привязка под пользователем '%s' к серверу '%s' удалась!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Ошибка настройки"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Завершено"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Далее"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Добро пожаловать"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Готово"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Завершение - запишите конфигурационный файл"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Запись конфигурационного файла"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Конфигурационный файл доступе только для чтения. Пожалуйста обновите права "
+"на файл."
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Конфигурационный файл не читается или не существует вовсе."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"После скачивания и размещения файла в %s, убедитесь что пользователь из под "
+"которого запущен веб-сервера может читать %s, в то время как другие "
+"пользователи не должны."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Контроль за установкой"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Основная проверка совместимости PHP и расширений"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Проверка PHP версии"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP должен быть %s версии или старше"
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Пожалуйста обновитесь до поддерживаемой версии."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr "FusionDirectory требуется модуль для связи с вашим LDAP сервером."
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr "FusionDirectory требуется модуль для интернационализации интерфейса."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -94,22 +286,22 @@ msgstr ""
 "FusionDirectory требуется этот модуль для взаимодействия с различными типами"
 " серверов и протоколов."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory требуется модуль для интеграции с samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -117,35 +309,35 @@ msgstr ""
 "FusionDirectory требуется один из модулей 'mhash или 'sha1', чтобы "
 "использовать SSHA шифрование."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr "FusionDirectory требуется модуль для связи с IMAP сервером."
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr "FusionDirectory требуется модуль для обработки юникод строк."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory требуется расширение для обработки изображений."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "модуль сжатия"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr "FusionDirectory требуется расширение для обработки снапшотов."
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -154,22 +346,22 @@ msgstr ""
 "register_globals механизм PHP, предоставляющий доступ ко всем глобальным "
 "переменным из скриптов без изменения области видимости. Это не безопасно."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr "Найдите 'register_globals' в вашем php.ini и переключите в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "Это значение используется PHP сборщиком мусора, чтобы удалять старые сессии."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -177,12 +369,12 @@ msgstr ""
 "Найдите 'session.gc_maxlifetime' в вашем php.ini и установите в 86400 или "
 "больше."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Выкл"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -190,12 +382,12 @@ msgstr ""
 "Чтобы во время использования FusionDirectory не возникло ни каких проблем, "
 "опция 'session.auto_start' должна быть установлена в 'Off' в вашем php.ini."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Найдите 'session.auto_start' в вашем php.ini и установите его в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -204,27 +396,27 @@ msgstr ""
 "может привести к ошибкам, которые не воспроизводятся! Увеличьте его в "
 "большинстве случаев."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "Найдите 'memory_limit' в вашем php.ini и установите его в '128M' или больше."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Найдите 'implicit_flush' в вашем php.ini и установите его в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Время исполнения, должно быть не менее 30 секунд."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -232,7 +424,7 @@ msgstr ""
 "Найдите 'max_execution_time' в вашем php.ini и установите его в значение "
 "'30' или больше."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -240,193 +432,157 @@ msgstr ""
 "Повысить безопасность сервера установив опцию expose_php в 'off'. PHP не "
 "будет отправлять ни какую информацию о сервере, запускающему, в этом случае."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Найдите 'expose_php' в вашем php.ini и установите в 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Повысите производительность вашего сервер установив setting magic_quotes_gpc"
 " в 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 "Найдите 'zend.ze1_compatibility_mode' в вашем php.ini и установите в 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Добро пожаловать"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Добро пожаловать в мастер настройки FusionDirectory!"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Сообщение приветствия"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Перемещение"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Инспекция LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Анализ вашего текущего LDAP для совместимости с FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr "Дать полные права на пользователей в выбранной ветке"
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Проверка прав для LDAP базы"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Проверка на невидимых пользователей"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Проверка для супер администратора"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Проверка на пользователей за пределами дерева людей"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Проверка на группы за пределами дерева для них"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Проверка на невидимые подразделения"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "LDAP запрос не удался"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Ошибка"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Пропущен объектный класс FusionDirectory '%s'!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Пожалуйста проверьте вашу установку."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -435,324 +591,132 @@ msgstr ""
 "Найден пользователь(и) %s, которые будут не видны в FusionDirectory или "
 "которые не полные."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr "Найдена учетная запись администратора FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr "Найдена административная группа FD 1.0.7: %s"
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-"Нет рабочей учетной записи администратора FusionDirectory 1.0.8 в вашем "
-"LDAP."
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Создать"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Пользователи"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Группы"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr "Роли"
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Нет учетной записи администратора FusionDirectory в вашем LDAP."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Создать"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr "ACL ролей по умолчанию не вставлены"
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr "Некоторые ACL ролей по умолчанию пропущены"
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr "ACL ролей по умолчанию вставлен"
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Переместить пользователей в настроенное дерево пользователей"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Следующие ссылки будут обновлены"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Найдены группы %s, выходящие за пределы настроенного дерева '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"Найдены подразделение(я) %s, которые будет не видны в FusionDirectory."
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Местоположение"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "URI подключения"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS соединение"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Ветка"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Аутентификация"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "DN администратора"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Пароль администратора"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Состояние"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Текущее состояние"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Настройки LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Настройки LDAP соединения"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Этот диалог выполняет основную настройку LDAP соединения для "
-"FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Сбой при анонимном привязывании к серверу '%s'!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Сбой при привязки под пользователем '%s'!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "Retry"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Анонимное подключение (bind) а к серверу '%s' удалась."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Refresh"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Пожалуйста укажите пользователя и пароль!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Привязка под пользователем '%s' к серверу '%s' удалась!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Готово"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Завершение - запишите конфигурационный файл"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Запись конфигурационного файла"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
-"Конфигурационный файл доступе только для чтения. Пожалуйста обновите права "
-"на файл."
+"Найдены подразделение(я) %s, которые будет не видны в FusionDirectory."
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Конфигурационный файл не читается или не существует вовсе."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
-"После скачивания и размещения файла в %s, убедитесь что пользователь из под "
-"которого запущен веб-сервера может читать %s, в то время как другие "
-"пользователи не должны."
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Ошибка настройки"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Завершено"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Добро пожаловать в мастер настройки FusionDirectory!"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Далее"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Сообщение приветствия"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -772,17 +736,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Указанный объектный тип пустой или неверный!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Отправить"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "По убыванию"
 
@@ -809,24 +773,19 @@ msgstr "Выбрать все"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Ошибка"
@@ -835,70 +794,70 @@ msgstr "Ошибка"
 msgid "created by"
 msgstr "создано"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Перейти в корень подразделений"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Перейти вверх на одно подразделение"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr "Перейти к подразделению пользователя"
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Обновить список"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Действия"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Копировать"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Вырезать"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Вставить"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Вырезать эту запись"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Копировать эту запись"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Восстановить снапшоты"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Экспортировать список"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Восстановить снапшот"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Создать снапшот"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Создать новый снапшот из объекта"
 
@@ -916,9 +875,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Ошибка конфигурации"
@@ -946,27 +905,27 @@ msgstr ""
 "Запрашиваемый канал не существует! Пожалуйста свяжитесь с вашим системным "
 "администратором."
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Права"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Отменить все"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Не могу вставить"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -974,8 +933,10 @@ msgstr "Имя пользователя"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Шаблон"
 
@@ -1001,7 +962,7 @@ msgstr ""
 "Критическая ошибка: не могу создать экземпляр класса '%s' - попробуйте "
 "запустить '%s' чтобы исправить это"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1009,12 +970,12 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Фатальная ошибка"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATAL: Ошибка при подключении к LDAP. Сервер сообщил '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
@@ -1022,21 +983,21 @@ msgstr ""
 "Логин (uid) не уникальный внутри LDAP дерева! Пожалуйста свяжитесь с вашим "
 "администратором."
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Ошибка аутентификации"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Ошибка при добавлении блокировки. Свяжитесь с разработчиками!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1045,12 +1006,12 @@ msgstr ""
 "Невозможно создать информацию о блокировки в LDAP дереве. Пожалуйста "
 "свяжитесь с вашим администратором!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP сервер вернул: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1058,12 +1019,12 @@ msgstr ""
 "Найдены множественные блокировки для заблокированного объекта. Это не должно"
 " было случиться - очистите их."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1072,85 +1033,77 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Настроить"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Продолжить в любом случае"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Редактировать в любом случае"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Вы собираетесь редактировать LDAP запись/записи %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Записей на странице"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Применить фильтр"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr "%sB"
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr "%sKiB"
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr "%sMiB"
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr "%sGiB"
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr "%sTiB"
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr "%sPiB"
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr "%sEiB"
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr "%sZiB"
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr "%sYiB"
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1159,129 +1112,88 @@ msgstr ""
 "Файл '%s' не может быть удален. Попробуйте fusiondirectory-setup --check-"
 "directories чтобы исправить права."
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Не могу записать файл проверки!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Предупреждение LDAP"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Не могу получить информацию о схемах с сервера. Проверить схемы невозможно!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Доступные класс(ы)"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Не могу выделить свободный ID:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool не уникальна!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "нет доступных ID!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "Превышено максимальное число попыток!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Не могу выделить свободный ID!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Не могу обнаружить файл '%s' - пожалуйста запустите '%s', чтобы исправить "
 "это."
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Все объекты в этой категории"
 
@@ -1294,51 +1206,48 @@ msgstr "Пожалуйста исправьте ошибку выше и обн
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr "Настройка часового пояса '%s' в вашей конфигурации не правильная."
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Не могу привязаться к LDAP. Пожалуйста свяжитесь с системным "
 "администратором."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"Функционал снапшотов включен, но требуемая переменная '%s' не установлена."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"Функционал снапшотов включен, но требуемый модуль сжатия отсутствует. "
-"Пожалуйста установите '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Все категории"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Моя учетная запись"
 
@@ -1361,7 +1270,7 @@ msgstr "Выбрать список объекто у которых включ
 msgid "Select to search within subtrees"
 msgstr "Выберите для поиска внутри поддеревьев"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Искать в поддеревьях"
 
@@ -1570,52 +1479,46 @@ msgstr "'%s' должен быть %d или больше!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' зависит от '%s' - пожалуйста предоставьте оба значения!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "Запись с '%s' атрибутом уже есть в системе!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
-msgstr ""
+msgid "The entry '%s' already use this '%s' attribute!"
+msgstr "Запись '%s' уже имеет атрибут '%s'!"
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "Обязательное поле '%s' пусто!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr "Пример:"
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr "Поле '%s' содержит недопустимые символы."
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Пропущено %s PHP расширение!"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1623,27 +1526,27 @@ msgstr "Пропущено %s PHP расширение!"
 msgid "Cancel"
 msgstr "Отмена"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Применить"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Сохранить"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Добавить"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Добавить %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1651,31 +1554,31 @@ msgstr "Добавить %s"
 msgid "Delete"
 msgstr "Удалить"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Удалить %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Изменить..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Изменить %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Назад"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Для этой учетной записи нет корректных расширений %s!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1684,7 +1587,7 @@ msgstr ""
 "В этой учетной записи включены %s настройки. Вы можете отключить их, щелкнув"
 " ниже."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1693,7 +1596,7 @@ msgstr ""
 "В этой учетной записи настройки %s включены. Чтобы отключить еë, вам нужно "
 "вначале удалить настройки %s!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1702,7 +1605,7 @@ msgstr ""
 "В этой учетной записи отключены %s настройки. Вы можете включить их, щелкнув"
 " ниже."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1711,184 +1614,191 @@ msgstr ""
 "В этой учетной записи настройки %s отключены. Чтобы включить её, вам нужно "
 "вначале добавить настройки для %s."
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Добавить параметры %s"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Удалить параметры %s"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Январь"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Февраль"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Март"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Апрель"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Май"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Июнь"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Июль"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Август"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Сентябрь"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Октябрь"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Ноябрь"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Декабрь"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Понедельник"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Среда"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Четверг"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Пятница"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Суббота"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "операция чтения"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "операция добавления"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "операция изменения"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "операция удаления"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "операция поиска"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "аутентификация"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "Сбой при выполнении операции в LDAP!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Объект"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Сбой при загрузке!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Сбой при загрузке: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' по-прежнему используется этим объектом: %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' по-прежнему используется."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' по-прежнему используется этими объектами: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Файл '%s' не существует!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Не могу открыть файл '%s' для чтения!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Не могу открыть файл '%s' для записи!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1897,37 +1807,37 @@ msgstr ""
 "Значение для '%s' до сих пор не настроено или неверно, пожалуйста проверьте "
 "ваш конфигурационный файл!"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Не могу удалить файл '%s'!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Не могу создать папку '%s'!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Не могу удалить папку '%s'!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Проверка поддержки %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Установите и активируйте %s PHP модуль."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Установите и активируйте %s Pear модуль."
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1936,7 +1846,7 @@ msgstr ""
 "Не могу инициализировать класс '%s'! Может быть какой то плагин пропущен в "
 "настройках FusionDirectory?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1978,7 +1888,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr "Снапшоты"
 
@@ -2077,37 +1986,37 @@ msgstr "во время операции на LDAP сервер %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2120,11 +2029,10 @@ msgstr "Пожалуйста выберете нужные записи"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2132,13 +2040,12 @@ msgstr "Название"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Описание"
@@ -2190,8 +2097,8 @@ msgstr "Изменить"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2253,37 +2160,38 @@ msgstr "дни"
 msgid "From template"
 msgstr "Из шаблона"
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr "шаблон %s "
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Показать %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Ошибка фильтра"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Фильтр неполный!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Ошибка доступа"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Вам не разрешено создавать снапшот для %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Вам не разрешено восстанавливать снапшот для %s."
@@ -2315,28 +2223,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Уже есть запись с таким dn: %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Запись %s не существует"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Вкладка \"%s\""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr "Неизвестное поле \"%s\""
@@ -2381,8 +2294,8 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d байт)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Загрузить"
 
@@ -2391,7 +2304,7 @@ msgstr "Загрузить"
 msgid "Download"
 msgstr "Скачать"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2402,7 +2315,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Неверное значение для %s"
@@ -2478,6 +2391,10 @@ msgstr "Неизвестная запись '%s'!"
 msgid "All users"
 msgstr "Все пользователи"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Применить фильтр"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2553,38 +2470,33 @@ msgstr "Введите свой пароль!"
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Учетная запись заблокирована. Пожалуйста свяжитесь с вашим системным "
 "администратором."
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "CAS пользователь \"%s\" не может быть найден в LDAP"
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr "CAS пользователь \"%s\" соответствует нескольким пользователям в LDAP"
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2597,46 +2509,46 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Конфигурация FusionDirectory %s/%s не читаема. Прервано."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Адрес электронной почты"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Не найден аккаунт с логином \"%s\""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Найдено множество учетных записей с логином \"%s\""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Свяжитесь с вашим системным администратором, были проблемы с почтовым "
 "сервером"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Были проблемы с почтовым сервером, имэйл подтверждения не отправлены"
 
@@ -2708,237 +2620,8 @@ msgstr "Добро пожаловать %s!"
 msgid "References"
 msgstr "Ссылки"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Редактировать POSIX настройки пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Домашний каталог"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "Путь к домашнему каталогу пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Оболочка"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-"Какой шелл должен использоваться, когда пользователь заходит в систему"
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "Не настроено"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Основная группа"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Основная группа пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Статус учетной записи unix у пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr "Принудительный id пользователя/группы"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-"Навязанное значение идентификатора пользователя и группы для этого "
-"пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr "Id пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr "Значение идентификатора пользователя"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr "Id группы"
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr "Значение идентификатора группы"
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Членство в группах"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Учетная запись"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "Пользователь должен сменить пароль при первом входе в систему"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-"Пользователь должен будет изменить пароль при первом входе (нужно указать "
-"значение для \"Задержка до принудительного изменения пароля\")"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr "Минимальная задержка между изменениями пароля (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Задержка до принудительного изменения пароля (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"У пользователя насильно будет изменен пароль после указанного количества "
-"дней (оставить пустым, чтобы отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Дата окончания действия пароля"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Дата после которой пароль пользователя истечет (оставить пустым что бы "
-"отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Через сколько отключать пользователя (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Сколько подождать до отключения пользователя, после истечения пароля "
-"(оставить пустым, чтобы отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr "За сколько предупреждать об окончании действия пароля (дни)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"Предупреждать пользователя об окончании действия его пароля за указанное "
-"количество дней (оставить пустым, чтобы отключить)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Системные доверия"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Режим доверия"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Тип авторизации для этих хостов"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "отключен"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "полный доступ"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "разрешить доступ только на эти хосты"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Пользователю разрешено подключаться только к хостам из списка"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "автоматически"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "Истек"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "активный"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "срок действия параля истек"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "Пароль не изменяем"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr "Группа пользователя %s"
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr "Группы и роли"
 
@@ -2965,7 +2648,7 @@ msgid "Password hash method to use"
 msgstr "Применяемый метод для хэша пароля"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -3002,258 +2685,278 @@ msgstr "Информация об учетной записи пользоват
 msgid "User account"
 msgstr "Учетная запись пользователя"
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Фамилия"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr "Фамилия пользователя"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Имя"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr "Имя пользователя"
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr "Краткое описание пользователя"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr "Фотография"
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr "Аватар пользователя"
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr "Рабочая контактная информация"
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Местоположение"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Адм. единица"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Адрес"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr "Рабочий почтовый адрес"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Телефон"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr "Рабочий номер телефона"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr "Рабочий номер мобильного телефона"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr "Рабочий номер пейджера"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Факс"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr "Рабочий номер факса"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr "Персональная домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr "Информация об учетной записи"
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr "Логин этого пользователя"
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr "Пароль пользователя"
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr "Личная контактная информация"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "Отображаемое имя"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr "Домашний адрес"
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Домашний почтовый адрес"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Личный телефон"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "Заголовок"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Организация"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Номер отдела"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Номер работника"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Руководитель"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Почтовый индекс"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr "Вам не разрешено изменять свой пароль"
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Вы должны подождать %d секунд перед повторным изменением пароля"
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr "Пароль присутствует в истории старых паролей"
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Новый пароль"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Новый и текущий пароли слишком похожи."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Новый пароль слишком короткий."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Пароль содержит символы Unicode, которые могут проблемы!"
 
@@ -3366,29 +3069,39 @@ msgstr ""
 "Пользователям также нужно ввести один из их дополнительных адресов для "
 "восстановления пароля"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Атрибут для входа"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Первое письмо"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Тема"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Тема первого письма"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Ссылка для восстановления пароля"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr "Тело (вначале логин %s, вторая ссылка)"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3397,7 +3110,7 @@ msgstr ""
 "Тело первого письма, отправляется когда пользователь запрашивает новый "
 "пароль. Использует %s логин и ссылку для восстановления."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3409,24 +3122,24 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Второе письмо"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Тема второго письма"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Пароль восстановлен успешно"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Тело (%s логин)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3435,7 +3148,7 @@ msgstr ""
 "Тело второго письма, отправляется, чтобы подтвердить, что пароль был  "
 "изменен. Использует %s логин пользователя."
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3495,140 +3208,140 @@ msgstr "Часовой пояс"
 msgid "Timezone to be used"
 msgstr "Часовой пояс, который будет использован"
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Настройка схемы"
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr "Основные настройки"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "Ограничение размера LDAP"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+"Определяет количество записей, которые можно получить из LDAP по умолчанию."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Блокировка редактирования"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Проверьте, не была ли редактируемая вами запись изменена вне FusionDirectory"
+" в это же время."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Включить логирование"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Регистрация событий на стороне FusionDirectory"
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr "Включить проверку схемы при входе."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Включить снапшоты"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Это позволяет сохранять определенное состояние записей и позже его "
+"восстанавливать."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Базовая запись снапшотов"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "Базовая запись, где снапшоты должны будут храниться внутри LDAP."
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Настройки пароля"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Метод хеширования пароля по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Используемый по умолчанию метод хеширования пароля"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Заставлять использовать хеш по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Принуждать использовать метод хеширования пароля по умолчанию"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Минимальная длина пароля"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Минимальная длинна пароля пользователя"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Минимальная разница в паролях"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Минимальное количество отличных символов от последнего пароля"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Использовать учетные записи с истекающим сроком действия"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Основные настройки"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Показать краткую информацию о списках"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Определяет, будет ли внизу каждого списка отображена строка состояния с "
-"краткой информацией о типе и количестве элементов списка."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Блокировка редактирования"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Проверьте, не была ли редактируемая вами запись изменена вне FusionDirectory"
-" в это же время."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Включить логирование"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Регистрация событий на стороне FusionDirectory"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "Ограничение размера LDAP"
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
-"Определяет количество записей, которые можно получить из LDAP по умолчанию."
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Вход в систему и сессии"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Атрибут для входа"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Какой LDAP атрибут необходимо использовать в качестве логина при входе в "
 "систему."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Принудительно шифровать соединения"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3636,300 +3349,207 @@ msgstr ""
 "Принудительно использовать шифрованный доступ (https) к веб интерфейсу, "
 "включив проверку безопасности PHP."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Предупреждать если сеанс не зашифрован"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 "будут отображаться предупреждения для пользователя, когда http будет "
 "использоваться вместо https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Время жизни сессии"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Включить снапшоты"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-"Это позволяет сохранять определенное состояние записей и позже его "
-"восстанавливать."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Базовая запись снапшотов"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "Базовая запись, где снапшоты должны будут храниться внутри LDAP."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr "SSL"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr "Путь к сертификату CA"
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr "CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr "Включить CAS"
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Хост"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Порт"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Местоположение пользователей и групп"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "DN атрибут пользователя"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Атрибут используемый у пользователей в начале dn"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Политика строго присваивания имен"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr "Включить строгую проверку имен для пользователей и групп"
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr "Минимальный id групп/пользователей"
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-"Наименьший идентификатор пользователя или группы, который может быть "
-"назначен, чтобы избежать дыры в безопасности с идентификатором учетной "
-"записи равным 0."
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-"Скрипт, который будет вызваться при нахождении следующего свободного номера "
-"id для пользователей иил групп."
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr "Начальное значение для id пользователя"
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-"Откуда начинать смотреть значение для нового свободного id пользователя."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr "Начальное значение для id группы"
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Откуда начинать смотреть значение для нового свободного id группы."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr " RDN пользователей"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr "Ветка где пользователели хранятся."
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "RDN групп"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Ветка в которой хранятся группы."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr "RDN для ACL ролей"
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr "Ветка в которой хранятся ACL ролей."
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Метод выделения id"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr "Метод выделения идентификаторов для пользователей и групп"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Традиционный"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Пул id для samba и unix"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr "Минимальное значение id пользователей в пуле"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
-"Минимальное значение для id пользователя, при использовании пул метода"
 
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr "Максимальное значение id пользователя в пуле"
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
-"Максимальное значение для id пользователя, при использовании пул метода"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
-msgstr "Минимальное значение id группы в пуле"
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
-msgstr "Минимальное значение для id группы, при использовании пул метода"
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
-msgstr "Максимальное значение id группы в пуле"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
-msgstr "Максимальное значение для id группы, при использовании пул метода"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Отладка"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Отображение ошибок"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3937,22 +3557,22 @@ msgstr ""
 "Показывать PHP ошибки в верхней части экрана. Следует отключить при рабочем "
 "использовании, потому что там могут быть отображены пароли."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Максимальное время LDAP запроса"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 "Остановить работу с LDAP если нет ответа за определенное количество секунд."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Лог статистики обращений к LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3960,94 +3580,92 @@ msgstr ""
 "Отслеживать продолжительность обращений к LDAP в syslog. Это может помочь "
 "найти проблемы в индексировании и плохих фильтров поиска."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Уровень отладки"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Отображать следующую информацию при каждой загрузке странице."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: plugins/config/class_configInLdap.inc:420
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Показать краткую информацию о списках"
+
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+"Определяет, будет ли внизу каждого списка отображена строка состояния с "
+"краткой информацией о типе и количестве элементов списка."
+
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr "Показать вкладку ACL для всех объектов."
+
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr "Доступные категории подразделений"
+
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr "Доступные категории подразделений в раскрывающемся списке"
+
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
+msgid "Hooks"
+msgstr "Хуки"
+
+#: plugins/config/class_configInLdap.inc:387
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "вкладка"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
+#: plugins/config/class_configInLdap.inc:391
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr "Режим"
 
-#: plugins/config/class_configInLdap.inc:429
+#: plugins/config/class_configInLdap.inc:396
 msgid "When to call this command"
 msgstr "Когда вызывать эту команду"
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
+#: plugins/config/class_configInLdap.inc:403
 msgid "The command that will be called"
 msgstr "Команда, которая будет вызвана"
 
-#: plugins/config/class_configInLdap.inc:442
-msgid "Hooks"
-msgstr "Хуки"
-
-#: plugins/config/class_configInLdap.inc:449
+#: plugins/config/class_configInLdap.inc:417
 msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:450
+#: plugins/config/class_configInLdap.inc:418
 msgid ""
 "When enabled successful hook execution output is displayed to the user using"
 " a dialog."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Доступные оболочки"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Доступные POSIX шеллы для пользователей FD"
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
-msgstr "Показать вкладку ACL для всех объектов."
-
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
-msgstr "Доступные категории подразделений"
-
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
-msgstr "Доступные категории подразделений в раскрывающемся списке"
-
 #: plugins/config/class_pluginsConfigInLdap.inc:29
 msgid "Plugins"
 msgstr "Плагины"
@@ -4145,9 +3763,8 @@ msgstr "отдел"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4340,7 +3957,7 @@ msgstr "Удалить пользователя"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4360,8 +3977,7 @@ msgid "Information"
 msgstr "Информация"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr "Название этой группы"
 
@@ -4385,128 +4001,149 @@ msgstr ""
 msgid "Add users for the role"
 msgstr "Добавить пользователей для роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr "Управление группами и ролями"
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr "Управление объектами группы, POSIX группы и роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr "Редактировать свойства роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Редактировать posix свойства"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr "Показать группы пользователей"
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Показать основные группы"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr "Показать организационные роли"
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr "Показать группы приложений"
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr "Показать неопознанные группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Показать основные группы"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Показывать группы mail"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Показать группы samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr "Показать группы серверов"
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr "Показать группы рабочих станций"
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr "Показать группы рабочих станций с Windows"
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr "Показать группы терминалов"
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr "Показать группы принтеров"
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr "Показать группы телефонов"
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr "Неизвестный тип: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr "Не существующий dn: %s"
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Объект группы"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr "Информация об объекте группы"
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Группа"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr "Краткое описание группы"
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Включаемые объекты"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr "Объекты, члены этой группы"
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Системные доверия"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Режим доверия"
+
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Тип авторизации для этих хостов"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "отключен"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "полный доступ"
+
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "разрешить доступ только на эти хосты"
+
+#: plugins/admin/groups/class_ogroup.inc:226
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Позволить подключаться этой группе только к хостам из списка"
 
-#: plugins/admin/groups/class_ogroup.inc:319
+#: plugins/admin/groups/class_ogroup.inc:317
 msgid ""
 "Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
@@ -4515,35 +4152,6 @@ msgstr ""
 msgid "List of groups"
 msgstr "Список групп"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr "Информация об POSIX группе"
-
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr "POSIX группа"
-
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Указать GID вручную"
-
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
-msgstr "Указать значение GID для группы"
-
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
-msgstr "GID значение для этой группы"
-
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Члены группы"
-
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
 #: plugins/admin/acl/class_aclManagement.inc:45
@@ -4591,10 +4199,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr "Диалог назначения ролей управления доступом"
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "Режим"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr "Применить это действие ко всему поддереву или только к его основе?"
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 659ef796f8f024fdf80bea0f5c59ae019f907396..0b97db31871185b6ef2436ae385208b7ff4c9148 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -17,703 +17,669 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -733,17 +699,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -770,24 +736,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -796,70 +757,70 @@ msgstr ""
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -877,9 +838,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -905,27 +866,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -933,8 +894,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -958,7 +921,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -966,266 +929,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1238,46 +1152,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1300,7 +1214,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1509,52 +1423,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1562,27 +1470,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1590,280 +1498,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1905,7 +1820,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2003,37 +1917,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2046,11 +1960,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2058,13 +1971,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2116,8 +2028,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2179,37 +2091,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2241,28 +2154,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2307,8 +2225,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2317,7 +2235,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2328,7 +2246,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2402,6 +2320,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2475,36 +2397,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2515,44 +2432,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2619,224 +2536,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2863,7 +2564,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2900,258 +2601,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3259,36 +2980,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3300,31 +3031,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3378,530 +3109,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4000,9 +3644,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4191,7 +3834,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4211,8 +3854,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4236,163 +3878,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4442,10 +4076,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 2a3c9ae3aeac109e14681d96b62616465bd27203..263143715691e17435255bf3b7e48d3e58a38f41 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -18,75 +18,267 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Föredraget språk"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Språkinställningar"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Det här steget låter dig välja ditt föredragna språk."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Location name"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr "Koppling-URI"
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "TLS-koppling"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Bas"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Admin DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Adminlösenord"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Nuvarande status"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "LDAP-inställningar"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "LDAP-koppling"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+"Den här dialogrutan utför den grundläggande konfigurationen för LDAP-"
+"kopplingen till FusionDirectory."
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Anonym koppling till server '%s' misslyckades!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Koppling som användare '%s' misslyckades!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Anonym koppling till servern '%s' lyckades."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Skriv in användare och lösenord!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Koppling som användare '%s' till servern '%s' lyckades!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Varning"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Installationsfel"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Slutförd"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Nästa"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Välkommen"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Slutför"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Slutför - skriv konfigurationsfil"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Skriv konfigurationsfil"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"Din konfigurationsfil är just nu läsbar för alla användare. Vänligen "
+"uppdatera filrättigheterna!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Konfigurationen är just nu inte läsbar eller så finns den inte."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+"Efter att ha laddat ner och placerat filen under %s, vänligen säkerställ att"
+" användaren som webbservern kör med har rättigheter att läsa %s medan andra "
+"användare inte ska kunna det."
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "PHP modul- och tilläggskontroll"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Installationskontroll"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Grundläggande kontroll för PHP-kompatibilitet och tillägg"
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Kontrollerar PHP-version"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP måste vara version %s eller högre."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Vänligen uppgradera till en version som stöds."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 "FusionDirectory kräver den här modulen för att prata med din LDAP-server"
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 "FusionDirectory kräver den här modulen för ett internationaliserat "
 "gränssnitt."
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
@@ -94,22 +286,22 @@ msgstr ""
 "FusionDirecotyr kräver den här modulen för att kommunicera med olika typer "
 "av servrar och protokoll."
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr "FusionDirectory kräver den här modulen för integrationen med Samba."
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
@@ -117,39 +309,39 @@ msgstr ""
 "FusionDirectory kräver antingen en modul för antingen 'mhash' eller 'shah' "
 "för at kunna använda SSHA-kryptering."
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 "FusionDirectory kräver den här modulen för att kunna prata med en IMAP-"
 "server"
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 "FusionDirectory kräver den här modulen för att hantera unicode-strängar."
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr "imagick"
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr "FusionDirectory kräver det här tillägget för att hantera bilder."
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr "compression-modul"
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 "FusionDirectory kräver det här tillägget för att hantera ögonblicksbilder"
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -159,18 +351,18 @@ msgstr ""
 "variabler så de är tillgängliga från skript utan att ändra scope. Detta kan "
 "vara en säkerhetsrisk."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Sök efter 'register_globals' i din php.ini och ställ in den som 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP använder det här värdet för garage collection för att ta bort gamla "
 "sessioner"
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -178,7 +370,7 @@ msgstr ""
 "Att ställa in det här värdet till en dag kommer att förhindra förlust av "
 "sessioner och cookies innan de verkligen når time out."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -186,12 +378,12 @@ msgstr ""
 "Sök efter 'session.gc_maxlifetime' i din php.ini och sätt den till 86400 "
 "eller högre."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Av"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
@@ -199,11 +391,11 @@ msgstr ""
 "För att använda FusionDirectory utan problem, bör session.auto_start i din "
 "php.ini sättas till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr "Sök efter 'session.auto_start' i din php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
@@ -212,14 +404,14 @@ msgstr ""
 "gräns kan orsaka fel som inte är reproducerbara. Öka värdet för större "
 "installationer."
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 "Sök efter 'memory_limit' i din php.ini och ställ in den på '128M' eller "
 "högre."
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -227,22 +419,22 @@ msgstr ""
 "Den här inställningen påverkar PHPs utdata-hantering. Stäng av den för att "
 "öka prestanda."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr "Sök efter 'implicit_flush' i din php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Exekveringstiden bör vara åtminstone 30 sekunder."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 "Sök efter 'max_execution_time' i php.ini och sätt den till '30' eller högre."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -250,145 +442,125 @@ msgstr ""
 "Öka serversäkerheten genom att sätta expose_php till 'off'. PHP kommer i så "
 "fall inte sända någon information om servern du kör på."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr "Sök efter 'expose_php' i din php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr "Öka din serverprestanda genom att sätta magic_quotes_gpc till 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 "Sök efter 'zend.ze1_compatibility_mode' i php.ini och sätt den till 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Välkommen"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr "Välkommen till FusionDirectory setup wizard"
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Välkomstmeddelandet"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Migrera"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "LDAP-inspektion"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 "Analysera nuvarande LDAP-katalog för kompatibilitet med FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr "Inspekterar objektklasser i root-objektet"
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr "Kontrollerar rättigheter för LDAP-databas"
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Söker efter osynliga användare"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Söker efter superadministratör"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Söker efter användare utanför person-trädet"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Söker efter grupper utanför gruppträdet"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Söker efter osynliga avdelningar"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Söker efter dubbletter av UID-nummer"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "LDAP-fråga misslyckades"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Saknar objektklassen '%s' för FusionDirectory!"
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr "Vänligen kontrollera din installation."
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
@@ -397,47 +569,31 @@ msgstr ""
 "Kan inte hantera den strukturella objekttypen hos ditt root-objekt. Vänligen"
 " lägg till objektklassen '%s' manuellt."
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Varning"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
@@ -446,322 +602,132 @@ msgstr ""
 "Hittade %s användare som inte kommer att vara synlig(a) i FusionDirectory "
 "eller som är ofullständig(a)."
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Migreringsfel"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
-#: include/simpleplugin/simple-list.xml:59
-#: plugins/admin/departments/dep-list.xml:48
-#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
-msgid "Create"
-msgstr "Skapa"
-
-#: setup/class_setupStep_Migrate.inc:871
+#: setup/class_setupStepMigrate.inc:792
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:27
 #: plugins/admin/users/class_userManagement.inc:42
 msgid "Users"
 msgstr "Användare"
 
-#: setup/class_setupStep_Migrate.inc:874
+#: setup/class_setupStepMigrate.inc:795
 msgid "Groups"
 msgstr "Grupper"
 
-#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
+msgstr ""
+
+#: setup/class_setupStepMigrate.inc:804
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Det finns inget FusionDirectory-adminkonto i din LDAP-katalog."
 
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:805
+#: include/simpleplugin/simple-list.xml:59
+#: plugins/admin/departments/dep-list.xml:48
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
+msgid "Create"
+msgstr "Skapa"
+
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Flytta användare in i det konfigurerade användarträdet"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "till"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Följande referenser kommer att uppdateras"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Hittade %s grupper utanför det konfigurerade trädet '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 "Hittade %s avdelning(ar) som inte kommer att vara synliga i FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Location name"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr "Koppling-URI"
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "TLS-koppling"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Bas"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Admin DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Adminlösenord"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Nuvarande status"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "LDAP-inställningar"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "LDAP-koppling"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-"Den här dialogrutan utför den grundläggande konfigurationen för LDAP-"
-"kopplingen till FusionDirectory."
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Anonym koppling till server '%s' misslyckades!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Koppling som användare '%s' misslyckades!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Anonym koppling till servern '%s' lyckades."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "Uppdatera"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Skriv in användare och lösenord!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Koppling som användare '%s' till servern '%s' lyckades!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Slutför"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Slutför - skriv konfigurationsfil"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Skriv konfigurationsfil"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"Din konfigurationsfil är just nu läsbar för alla användare. Vänligen "
-"uppdatera filrättigheterna!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Konfigurationen är just nu inte läsbar eller så finns den inte."
-
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
+msgstr ""
+
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
-"Efter att ha laddat ner och placerat filen under %s, vänligen säkerställ att"
-" användaren som webbservern kör med har rättigheter att läsa %s medan andra "
-"användare inte ska kunna det."
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Installationsfel"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Slutförd"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr "Välkommen till FusionDirectory setup wizard"
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Nästa"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Välkomstmeddelandet"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -781,17 +747,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Angiven objectType är tom eller ogiltig!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Skicka"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Upp"
 
@@ -818,24 +784,19 @@ msgstr "Välj alla"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fel"
@@ -844,70 +805,70 @@ msgstr "Fel"
 msgid "created by"
 msgstr "skapat av"
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "GÃ¥ till root-avdelning"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "GÃ¥ upp en avdelning"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Hem"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Ladda om lista"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Kopiera"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Klistra in"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Klipp ut post"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Kopiera post"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr "Återskapa ögonblicksbilder"
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr "Exportera lista"
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Återskapa ögonblicksbild"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Skapa ögonblicksbild"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Skapa ny ögonblicksbild från det här objektet"
 
@@ -925,9 +886,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
@@ -954,27 +915,27 @@ msgstr "CSV"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Begärd kanal finns inte! Vänligen kontakta din administratör"
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Rättighet"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Avbryt allt"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Kan inte klistra in"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -982,8 +943,10 @@ msgstr "Användarnamn"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mall"
 
@@ -1011,7 +974,7 @@ msgstr ""
 "Allvarligt fel: kan inte instansiera klassen '%s' - försök köra '%s' för att"
 " åtgärda detta"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1019,32 +982,32 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Allvarligt fel"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "ALLVARLIGT: Fel vid försöka att koppla mot LDAP. Servern sa '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Autentiseringsfel"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Fel uppstod när lås skulle läggas till. Kontakta utvecklarna!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1053,12 +1016,12 @@ msgstr ""
 "Kan inte skapa låsinformation i LDAP-trädet. Vänligen kontakta din "
 "administratör!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP-server returnerade %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1066,12 +1029,12 @@ msgstr ""
 "Hittade flera lås för objektet som ska låsas. Detta ska inte hända - rensar "
 "upp multipla referenser."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Storleksgränsen på %d poster har överskridits!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1080,85 +1043,77 @@ msgstr ""
 "Sätt ny storleksgräns till %s och visa mig meddelandet om gränsen "
 "fortfarande överskrids"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "ofullständig"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Fortsätt ändå"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Redigera ändå"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Du kommer att redigera LDAP-posten/posterna %s"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "Poster per sida"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Aktivera filter"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZÅÄÖ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
@@ -1167,129 +1122,88 @@ msgstr ""
 "Filen '%s' kunde inte tas bort. Försök med fusiondirectory-setup --check-"
 "directories för att åtgärda rättighetsproblem."
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Kan inte skriva till revisionsfil!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr "'nextIdHook' är inte tillgänglig. Använder standard-bas!"
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "LDAP-varning"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kan inte hämta schemainformation från servern. Ingen schemakontroll är "
 "möjlig!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Klass(er) tillgänglig(a)"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr "Kan inte allokera ett fritt ID:"
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr "%sPoolMin >= %sPoolMax!"
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr "sambaUnixIdPool är inte unik!"
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr "inget ID tillgängligt!"
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr "maximalt antal försök överskridet!"
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Kan inte allokera ett fritt ID!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Kan inte lokalisera filen '%s' - vänligen kör '%s' för att åtgärda detta"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Alla objekt i den här kategorin"
 
@@ -1302,50 +1216,46 @@ msgstr "Vänligen fixa ovanstående fel och ladda om sidan."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML-fel i fusiondirectory.conf: %s på rad %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Kan inte koppla mot LDAP. Vänligen kontakta systemadministratören"
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"Funktionen för ögonblicksbilder är aktiverad, men värdet '%s' som krävs för "
-"funktionen är inte satt."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
-"Funktionen för ögonblicksbilder är aktiverad, men kompressionsmodulen som "
-"krävs saknas. Vänligen installera '%s'."
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Alla kategorier"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Mitt konto"
 
@@ -1368,7 +1278,7 @@ msgstr "Välj att lista objekt som har '%s' aktiverat"
 msgid "Select to search within subtrees"
 msgstr "Välj för att söka i subträd"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Sök i subträd"
 
@@ -1577,52 +1487,46 @@ msgstr "'%s' måste vara %d eller större!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' beror på '%s' - vänligen ange båda värdena!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "Det finns redan en post med det här '%s'-attributet i systemet!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "Fältet '%s' krävs men är tomt!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' är inte tillåtet:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' är inte tillåtna!"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Saknar PHP-tillägget %s !"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1630,27 +1534,27 @@ msgstr "Saknar PHP-tillägget %s !"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Spara"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Lägg till"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Lägg till %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1658,31 +1562,31 @@ msgstr "Lägg till %s"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Ta bort %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Redigera %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Tillbaka"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Det här kontot har inga giltiga %s-tillägg!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1691,7 +1595,7 @@ msgstr ""
 "Det här kontot har %s-inställningar aktiverade. Du kan avaktivera dem genom "
 "att klicka nedan."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1700,7 +1604,7 @@ msgstr ""
 "Det här kontot har %s-inställningar aktiverade. För att avaktivera dem, "
 "behöver du ta bort %s-inställningarna först!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1709,7 +1613,7 @@ msgstr ""
 "Det här kontot har %s-inställningar avaktiverade. Du kan aktivera dem genom "
 "att klicka nedan."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1718,184 +1622,191 @@ msgstr ""
 "Det här kontot har %s-inställningar avaktiverade. För att aktivera dem, "
 "behöver du lägga till %s-inställningarna först!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Lägg till %s-inställningar"
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Ta bort %s-inställningar"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "januari"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "februari"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "mars"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "april"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "maj"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "juni"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "juli"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "augusti"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "september"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "oktober"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "november"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "december"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "söndag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "måndag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "torsdag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "fredag"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "lördag"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "läs"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "lägg till"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "modifiera"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "ta bort"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "sök"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "autentisering"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s misslyckades!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "LDAP-operation misslyckades!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "Objekt"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Uppladdning misslyckades!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Uppladdning misslyckades: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfel med infrastrukturtjänsten!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfel med infrastrukturtjänsten: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' används fortfarande av det här objektet %s"
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' används fortfarande."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' används fortfarande av dessa objekt: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Filen '%s' existerar inte!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan inte öppna filen '%s' för läsning!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan inte öppna filen '%s' för skrivning!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1904,37 +1815,37 @@ msgstr ""
 "Värdet för '%s' är för närvarande okonfigurerat eller ogiltigt, vänligen "
 "kolla din konfigurationsfil!"
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan inte ta bort fil '%s'!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kan inte skapa katalog '%s'!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan inte ta bort katalogen '%s'!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kontrollerar stöd för %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installera och aktivera PHP-modulen %s."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installera och aktivera modulen %s Pear"
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
@@ -1943,7 +1854,7 @@ msgstr ""
 "Kan inte initialisera klassen '%s'! Kanske det är ett plugin som saknas i "
 "din FusionDirectory-installation?"
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1987,7 +1898,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2085,37 +1995,37 @@ msgstr "under operation på LDAP-server %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2128,11 +2038,10 @@ msgstr "Välj önskade poster"
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2140,13 +2049,12 @@ msgstr "Namn"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Beskrivning"
@@ -2198,8 +2106,8 @@ msgstr "Redigera"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2261,37 +2169,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr "Visa %s"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr "Filterfel"
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr "Filtret är inte komplett!"
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Rättighetsfel"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Du har inte tillåtelse att skapa en ögonblicksbild för %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Du är inte tillåten att återskapa en ögonblicksbild för %s."
@@ -2323,28 +2232,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr "Det finns redan en post med samma dn : %s"
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr "Posten %s finns inte"
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2389,8 +2303,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -2399,7 +2313,7 @@ msgstr "Ladda upp"
 msgid "Download"
 msgstr "Ladda ner"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2410,7 +2324,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ogiltigt värde för %s"
@@ -2484,6 +2398,10 @@ msgstr "Okänd post '%s'!"
 msgid "All users"
 msgstr "Alla användare"
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Aktivera filter"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2560,36 +2478,31 @@ msgstr "Ange ditt lösenord!"
 msgid "Please check the username/password combination."
 msgstr "Kontrollera användarnamn/lösenord-kombinationen."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Kontot låst. Kontakta systemadministratören!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2602,44 +2515,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Epostadress"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Kontakta din administratör, det uppstod ett problem med epostservern"
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Det uppstod ett problem med epostservern, bekräftelsebrevet skickades inte"
@@ -2713,232 +2626,8 @@ msgstr "Välkommen %s!"
 msgid "References"
 msgstr "Referenser"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr "Unix"
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Redigera användarens POSIX-inställningar"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Hemkatalog"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr "Sökvägen till hemkatalogen för den här användaren"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Skal"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr "Vilket skal ska användas när den här användaren loggar in"
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "okonfigurerad"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Primär grupp"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr "Primär grupp för den här användaren"
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr "Status på det här unix-kontot"
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Gruppmedlemskap"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Konto"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "Användare måste ändra lösenord vid första inloggning"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr "Fördröjning innan tvingande lösenordsbyte (dagar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-"Användaren kommer att tvingas byta lösenord efter så här många dagar (lämna "
-"tomt för att  avaktivera)"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr "Utgångsdatum för lösenord"
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Datum efter vilket denna användares lösenord kommer att sluta gälla (lämna "
-"tomt för att avaktivera)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr "Inaktivitet innan avaktivering av användare (dagar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-"Maximalt antal inaktiva dagar efter lösenordets utgång innan användaren är "
-"avaktiverad (lämna tomt för att avaktivera funktionen)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr "Fördröjning för varning innan lösenordsbyte (dagar)"
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-"Användaren kommer att varnas så här många dagar innan lösenordet löper ut "
-"(lämna tomt för att avaktivera)"
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "System trust"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Trust-läge"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr "Auktoriseringstyp för dessa hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "avaktiverad"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "full tillgång"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "tillåt dessa hosts tillgång"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr "Tillåt användaren att endast logga in på denna lista av hosts"
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "automatisk"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "har utgått"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "grace-tid aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "aktiv"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "lösenord har slutat gälla"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr "lösenord kan inte ändras"
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2965,7 +2654,7 @@ msgid "Password hash method to use"
 msgstr "Lösenords-hash att använda"
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -3002,258 +2691,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Personlig information"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Efternamn"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Förnamn"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Plats"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Län"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Adress"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Rumsnummer"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Rumsnummer"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Mobil"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Hempostadress"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Privat telefon"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Hemtelefonnummer"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Organisationsinformation"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Avdelning"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Avdelningsnummer"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Avdelningsnummer"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Anställningsnummer"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Anställningsnummer"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Anställningstyp"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr "Manager"
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Postnummer"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Du behöver ange ditt nuvarande lösenord för att fortsätta."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Det nya lösenordet och det nuvarande är för lika varandra."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Det nya lösenordet är för kort."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Lösenordet innehåller möjligtvis problematiska Unicode-tecken!"
 
@@ -3365,29 +3074,39 @@ msgstr ""
 "Användare kommer också att kunna skriva in en av deras alternativa "
 "epostadresser för att återställa lösenordet"
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Inloggningsattribut"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr "Första epost"
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr "Ämne"
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr "Ämne på första epostmeddelandet"
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr "[FusionDirectory] Länk för återskapande av lösenord"
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr "Meddelandekropp (första %s är inläggnings-ID, andra är länken)"
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
@@ -3397,7 +3116,7 @@ msgstr ""
 "frågar efter ett nytt lösenord. Använd %s för inläggnings-ID och "
 "återställningslänk."
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3409,24 +3128,24 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr "Andre epostmeddelandet"
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr "Ämne på det andra epostmeddelandet"
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr "[FusionDirectory] Återställning av lösenord lyckades"
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr "Meddelandekropp (%s är login)"
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
@@ -3435,7 +3154,7 @@ msgstr ""
 "Meddelandekropp på det andra epostmeddelandet, som skickas för att bekräfta "
 "att lösenordet har ändrats. Använd %s för användarens inloggnings-ID."
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3496,58 +3215,106 @@ msgid "Timezone to be used"
 msgstr "Tidszon som ska användas"
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
-msgstr "Schema-inställningar"
+msgid "Core settings"
+msgstr "Bas-inställningar"
 
 #: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr "LDAP storleksgräns"
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr "Definierar antalet poster att få från LDAP som standard."
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr "Redigera låsning"
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+"Kontrollera om en post som just blir redigerad har blivit modifierad utanför"
+" FusionDirectory under tiden."
+
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
+msgstr "Aktivera loggning"
+
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
+msgstr "Event-loggning på FusionDirectorys sida."
+
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
-msgstr "Aktivera schema-kontroll under inloggning."
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
+msgstr "Aktivera schema-kontroll under inloggning."
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Aktivera ögonblicksbilder"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+"Detta aktiverar möjligheten att spara vissa posters tillstånd och återskapa "
+"dem senare."
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Bas för ögonblicksbilder"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr "Basen där ögonblicksbilder ska lagras i LDAP-katalogen."
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Lösenordsinställningar"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr "Lösenordens standard-hash"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr "Standard-hash som ska användas"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr "Tvinga standard hash"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr "Tvinga användandet av den lösenords-hash som är standard"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Lösenordets minsta längd"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr "Minsta längd på lösenord"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr "Lösenord minsta avvikelse"
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr "Minsta antalet tecken som nytt lösenord måste avvika från gammalt"
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Använd datum för kontots upphörande"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
@@ -3555,80 +3322,32 @@ msgstr ""
 "Aktiverar skugg-attribut-test under inloggning till FusionDirectory och "
 "tvingar förnyelse av lösenord eller kontolåsning"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:179
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attribut att lagra i userPassword-attributet"
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr "Bas-inställningar"
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Visa sammanfattning i listningar"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Avgör om ett statusfält ska visas i botten på listor, som visar en kort "
-"sammanfattning av typ och antal poster i listan."
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr "Redigera låsning"
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-"Kontrollera om en post som just blir redigerad har blivit modifierad utanför"
-" FusionDirectory under tiden."
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr "Aktivera loggning"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr "Event-loggning på FusionDirectorys sida."
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
-msgstr "LDAP storleksgräns"
-
-#: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
-msgstr "Definierar antalet poster att få från LDAP som standard."
-
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Inloggning och session"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Inloggningsattribut"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 "Vilket LDAP-attribut ska användas som inloggningnamn under inloggning."
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Tvinga krypterade anslutningar"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
@@ -3636,290 +3355,205 @@ msgstr ""
 "Aktiverar PHPs säkerhetskontroller för att tvinga krypterad access (https) "
 "till webbgränssnittet."
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Varna om session inte är krypterad"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr "visar en varning till användaren när http används istället för https."
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Sessioners livslängd"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Aktivera ögonblicksbilder"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-"Detta aktiverar möjligheten att spara vissa posters tillstånd och återskapa "
-"dem senare."
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Bas för ögonblicksbilder"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr "Basen där ögonblicksbilder ska lagras i LDAP-katalogen."
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr "Host"
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "Port"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Lagring för personer och grupper"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Personer DN-attribut"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attribut att använda i början av användares dn"
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr "Strikt namnpolicy"
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr "Nästa id-hook"
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr "Var man ska börja kolla efter nya fria användar-IDn."
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr "Var man ska börja kolla efter nya fria grupp-IDn."
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr "Användares RDN"
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr "Gruppers RDN"
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr "Grenen där grupper lagras."
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr "Id-allokeringsmetod"
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr "Traditionell"
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr "Samba unix id pool"
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr "Visa fel"
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
@@ -3927,11 +3561,11 @@ msgstr ""
 "Visa PHP-fel i övre delen av skärmen. Detta bör avaktiveras i "
 "produktionsmiljöer, för det kan vara lösenord i felkoden."
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Maximal tid för LDAP-frågor"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
@@ -3939,11 +3573,11 @@ msgstr ""
 "Stoppa LDAP-förfrågningar om det inte kommer något svar inom den "
 "specificerade mängden sekunder."
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Logga LDAP-statistik"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
@@ -3951,92 +3585,90 @@ msgstr ""
 "Spåra LDAP-timingstatistik till syslog. Detta kan hjälpa till att hitta "
 "indexeringsproblem eller dåliga sökfilter."
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Debug-nivå"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr "Visa viss information på varje sidladdning."
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr "Hooks som anropas när specifika händelser inträffar"
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr "flik"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Visa sammanfattning i listningar"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
-msgstr "Fliken som denna hook härrör till"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+"Avgör om ett statusfält ska visas i botten på listor, som visar en kort "
+"sammanfattning av typ och antal poster i listan."
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "läge"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
-msgstr "När detta kommando ska anropas"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
-msgstr "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
-msgstr "Kommando som ska anropas"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
+msgstr "Hooks som anropas när specifika händelser inträffar"
 
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
-msgstr "Tillgängliga skal"
-
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
-msgstr "Tillgängliga POSIX-skal för FD-användare"
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
+msgstr "Fliken som denna hook härrör till"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
+msgstr "När detta kommando ska anropas"
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
-msgstr ""
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
+msgstr "Kommando som ska anropas"
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4135,9 +3767,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4326,7 +3957,7 @@ msgstr "Ta bort användare"
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4346,8 +3977,7 @@ msgid "Information"
 msgstr "Information"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4371,164 +4001,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr "Redigera posix-egenskaper"
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "Visa primära grupper"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "Visa primära grupper"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Visa mail-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Visa samba-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Objektgrupp"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Grupp"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Medlemsobjekt"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "System trust"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Grupplista"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Trust-läge"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
+msgstr "Auktoriseringstyp för dessa hosts"
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "avaktiverad"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "full tillgång"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Tvinga GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "tillåt dessa hosts tillgång"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Gruppmedlemmar"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Grupplista"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4577,10 +4199,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index bb93260c9848c47f64f94d16dc6e50ec170dafc0..a1fe0c9ccb23ef4ce7326bb34b395128fb3b4550 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,703 +17,669 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
-msgid "Cannot move entries to the requested department!"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "Entry will be moved from"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1139
-msgid "to"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1149
-msgid "The following references will be updated"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1200
-#, php-format
-msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
-msgid "Move groups into configured groups tree"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1311
-#, php-format
-msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
-msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
+#: setup/class_setupStepMigrate.inc:1051
+msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
+#: setup/class_setupStepMigrate.inc:1063
+msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
+#: setup/class_setupStepMigrate.inc:1073
+msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
+#: setup/class_setupStepMigrate.inc:1124
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
+msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
+#: setup/class_setupStepMigrate.inc:1235
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
+msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -733,17 +699,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr ""
 
@@ -770,24 +736,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -796,70 +757,70 @@ msgstr ""
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -877,9 +838,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -905,27 +866,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -933,8 +894,10 @@ msgstr ""
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
 
@@ -958,7 +921,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -966,266 +929,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr ""
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr ""
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1238,46 +1152,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr ""
 
@@ -1300,7 +1214,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1509,52 +1423,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1562,27 +1470,27 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1590,280 +1498,287 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr ""
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1905,7 +1820,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2003,37 +1917,37 @@ msgstr ""
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2046,11 +1960,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2058,13 +1971,12 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr ""
@@ -2116,8 +2028,8 @@ msgstr ""
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2179,37 +2091,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2241,28 +2154,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2307,8 +2225,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2317,7 +2235,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2328,7 +2246,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2402,6 +2320,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr ""
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2475,36 +2397,31 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2515,44 +2432,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2619,224 +2536,8 @@ msgstr ""
 msgid "References"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2863,7 +2564,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2900,258 +2601,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3259,36 +2980,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3300,31 +3031,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3378,530 +3109,443 @@ msgid "Timezone to be used"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+msgid "Core settings"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
-msgid "Password settings"
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
-msgid "Password default hash"
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:124
-msgid "Default hash to be used"
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force default hash"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
-msgid "Force the use of the default password hash"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Password minimum length"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
-msgid "Minimum length of user passwords"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Password minimum differs"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
-msgid "Minimum number of different characters from last password"
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
-msgid "Use account expiration"
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
-msgid ""
-"Enables shadow attribute tests during the login to FusionDirectory and "
-"forces password renewal or account locking"
+#: plugins/config/class_configInLdap.inc:148
+msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
-msgid "SASL Realm"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
+#: plugins/config/class_configInLdap.inc:151
+msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
+#: plugins/config/class_configInLdap.inc:156
+msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
+#: plugins/config/class_configInLdap.inc:160
+msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
+#: plugins/config/class_configInLdap.inc:160
+msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
+#: plugins/config/class_configInLdap.inc:165
+msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
+#: plugins/config/class_configInLdap.inc:165
+msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
+#: plugins/config/class_configInLdap.inc:170
+msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
+#: plugins/config/class_configInLdap.inc:171
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "SASL Realm"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4000,9 +3644,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4191,7 +3834,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4211,8 +3854,7 @@ msgid "Information"
 msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4236,163 +3878,155 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:31
@@ -4442,10 +4076,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 5747db062ab9df5d27747fa5334d12d0c342d11f..f11df9eaddab28818d8fcc71c5f64477705b914a 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -18,127 +18,314 @@ msgstr ""
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr "Ngôn ngữ muốn sử dụng"
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr "Cài đặt ngôn ngữ"
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr "Bước này cho phép bạn lựa chọn ngôn ngữ bạn muốn dùng."
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr "Tự động"
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "Tên vị trí"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr "Kết nối TLS"
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "Cơ sở"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr "Thẩm định quyền"
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "Admin DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "Mật khẩu Admin"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "Trạng thái"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr "Tình trạng hiện tại"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr "Cài đặt LDAP"
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr "Thiết lập kết nối LDAP"
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr "Kết nối nặc danh với server '%s' thất bại!"
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr "Kết nối với vai trò người dùng '%s' thất bại!"
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr "Kết nối nặc danh đến server '%s' thành công."
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr "Xin hãy xác định người dùng và mật khẩu!"
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr "Kết nối với tư cách người dùng '%s' đến server '%s' thành công!"
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr "Lỗi cài đặt"
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr "Đã hoàn thành"
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr "Tiếp tục"
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr "Chào mừng"
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "Kết thúc"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr "Kết thúc - viết file cấu hình"
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr "Viết file cấu hình"
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+"File cấu hình của bạn hiện cả thế giới đều đọc được. Xin hãy cập nhật quyền "
+"truy cập file!"
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr "Cấu hình hiện tại không thể đọc được hoặc nó không tồn tại."
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr "Kiểm tra các module và mở rộng của PHP"
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr "Kiểm tra cài đặt"
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr "Kiểm tra cơ bản cho khả năng tương thích và mở rộng PHP "
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr "Kiểm tra phiên bản PHP"
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr "PHP phải là phiên bản %s hoặc như trên."
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr "Xin hãy cập nhật cho một phiên bản hỗ trợ."
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr "mbstring"
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -148,18 +335,18 @@ msgstr ""
 " các biến số toàn cầu mà có thể truy cập từ các tập lệnh mà không phải thay "
 "đổi phạm vi. Đây có thể là một rủi ro về bảo mật."
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 "Tìm kiếm 'register_globals' trong thư mục php.ini của bạn và chuyển nó thành"
 " 'Off'."
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 "PHP sử dụng giá trị này để phần mềm thu dọn rác có thể sóa các phiên cũ đi."
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
@@ -167,7 +354,7 @@ msgstr ""
 "Thiết lập giá trị này đến một ngày sẽ ngăn cản việc mất đi các phiên và "
 "cookies trước khi chúng thực sự hết hạn."
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
@@ -175,35 +362,35 @@ msgstr ""
 "Tìm kiếm  'session.gc_maxlifetime' trong thư mục php.ini của bạn và thiết "
 "lập nó đển 86400 hoặc cao hơn."
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr "Tắt"
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 "Tìm kiếm  'session.auto_start' trong thư mục php.ini của bạn và đặt nó thành"
 " 'Off'."
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
@@ -211,17 +398,17 @@ msgstr ""
 "Lựa chọn này sẽ ảnh hưởng tới việc sử lý đầu vào PHP. Tắt chức năng này đi, "
 "để tăng khả năng hoạt động."
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 "Tìm kiếm 'implicit_flush' trong thư mục php.ini của bạn và chuyển nó sang "
 "'Off'."
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr "Thời gian chạy ít nhất là 30 giây."
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
@@ -229,7 +416,7 @@ msgstr ""
 "Tìm kiếm 'max_execution_time' trong thư mục php.ini của bạn và thiết lập nó "
 "đến '30' hoặc cao hơn."
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
@@ -238,19 +425,19 @@ msgstr ""
 " sẽ không gửi bất cứ thông tin nào về server bạn đang chạy trong trường hợp "
 "này."
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 "Tìm kiếm 'expose_php' trong thư much php.ini của bạn và chuyển nó thành "
 "'Off'."
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 "Tăng cường khả năng hoạt động cho server của bạn bằng việc thiết lập "
 "magic_quotes_gpc thành 'off'."
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
@@ -258,492 +445,271 @@ msgstr ""
 "Tìm kiếm 'zend.ze1_compatibility_mode' trong thư mục  php.ini và chuyển nó "
 "thành 'Off'."
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr "Chào mừng"
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr "Tin nhắn chào mừng"
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr "Di trú"
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr "Thanh tra LDAP"
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr "Kiểm tra những người dùng ẩn"
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr "Kiểm tra siêu admin"
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr "Kiểm tra người dùng bên ngoài cây con người"
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr "Kiểm tra nhóm bên ngoài cây nhóm"
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr "Kiểm tra các bộ phận ẩn"
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr "Kiểm tra các số ID cuả người dùng (UID) được nhân bản"
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr "Yêu cầu LDAP thất bại"
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "Thất bại"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "Cảnh báo"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr "Lỗi di trú"
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "Người dùng"
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "Các nhóm"
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "Tạo "
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "Người dùng"
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr "Các nhóm"
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr "Chuyển người dùng sang cây người dùng được cấu hình"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr "đến"
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr "Tham chiếu sau sẽ được cập nhật"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Đã tìm thấy %s nhóm bên ngoài cây được cấu hình '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1375
-#, php-format
-msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:1419
-#, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "Tên vị trí"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr "Kết nối TLS"
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "Cơ sở"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr "Thẩm định quyền"
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "Admin DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "Mật khẩu Admin"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "Trạng thái"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr "Tình trạng hiện tại"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr "Cài đặt LDAP"
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr "Thiết lập kết nối LDAP"
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr "Kết nối nặc danh với server '%s' thất bại!"
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr "Kết nối với vai trò người dùng '%s' thất bại!"
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr "Kết nối nặc danh đến server '%s' thành công."
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr "Xin hãy xác định người dùng và mật khẩu!"
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr "Kết nối với tư cách người dùng '%s' đến server '%s' thành công!"
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "Kết thúc"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr "Kết thúc - viết file cấu hình"
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr "Viết file cấu hình"
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-"File cấu hình của bạn hiện cả thế giới đều đọc được. Xin hãy cập nhật quyền "
-"truy cập file!"
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr "Cấu hình hiện tại không thể đọc được hoặc nó không tồn tại."
+msgstr ""
 
-#: setup/class_setupStep_Finish.inc:96
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
+msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:128
-msgid "Setup error"
-msgstr "Lỗi cài đặt"
+#: setup/class_setupStepMigrate.inc:1342
+#, php-format
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
+msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
-msgstr "Đã hoàn thành"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
-msgstr "Tiếp tục"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
+msgstr "Tin nhắn chào mừng"
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -763,17 +729,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "ObjecType được chỉ định đang rỗng hặc không hợp lệ!"
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "Gốc"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "Ná»™p"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "Lên"
 
@@ -800,24 +766,19 @@ msgstr "Chọn tất"
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Lá»—i"
@@ -826,70 +787,70 @@ msgstr "Lá»—i"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "Đi đến bộ phận gốc"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "Đi lên một bộ phận"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr "Nhà"
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "Danh sách reload"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "Các thao tác"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr "Copy"
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr "Cut"
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr "Tạo ra một snapshot mới từ đối tượng này"
 
@@ -907,9 +868,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
@@ -935,27 +896,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "Cho phép"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Hủy bỏ tất"
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr "Không thể paste"
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -963,8 +924,10 @@ msgstr "Đăng nhập"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mẫu"
 
@@ -992,7 +955,7 @@ msgstr ""
 "Lỗi nghiêm trọng: không thể tạo ra lớp '%s' - hãy thử chạy '%s' để sửa lỗi "
 "này"
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -1000,33 +963,33 @@ msgstr ""
 msgid "Fatal error"
 msgstr "Lỗi nặng"
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr "Lỗi xác định thẩm quyền"
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Lỗi khi đang thêm một khóa vào. Hãy liên lạc với các nhà phát triển!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1035,12 +998,12 @@ msgstr ""
 "Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy liên lạc với "
 "admin của bạn!"
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server trả về: %s"
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1048,12 +1011,12 @@ msgstr ""
 "Tìm thấy nhiều khóa khác nhau để khóa đối tượng. Điều này không nên xảy ra -"
 " hãy dọn sạch các tham chiếu."
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Đã vượt quá giới hạn kích cỡ của các entry %d!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1062,213 +1025,164 @@ msgstr ""
 "Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn "
 "vượt quá tiêu chuẩn"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "chưa hoàn thành"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "Cứ tiếp tục"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "Cứ hiệu chỉnh"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Bạn sẽ hiệu chỉnh entry/các entry %s của LDAP"
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "các entry cho mỗi trang"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "Áp dụng bộ lọc"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr "Không thể viết lên revision file!"
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr "Cảnh báo LDAP"
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr "Đã có lớp"
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr "Không thể phân phối một ID miễn phí!"
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Không thể xác định vị trí file '%s'- xin hãy chạy '%s' để sửa lỗi này!"
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr "Tất cả các đối tượng trong hạng mục này"
 
@@ -1281,48 +1195,46 @@ msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Lỗi XML trong fusiondirectory.conf: %s tại dòng %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với admin hệ thống."
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
-"Chức năng Snapshot đã được bật, nhưng biến số được yêu cầu: '%s' vẫn chưa "
-"được thiết lập."
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr "Tất cả các mục"
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "Tài khoản của tôi"
 
@@ -1345,7 +1257,7 @@ msgstr "Chọn để liệt kê đối tượng mà cho phép '%s'"
 msgid "Select to search within subtrees"
 msgstr "Chọn để tìm kiếm trong các cây con"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr "Tìm kiếm tại các cây con"
 
@@ -1554,52 +1466,46 @@ msgstr "'%s' phải lớn hơn %d hoặc trên nữa!"
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' phụ thuộc vào '%s'- xin hãy cung cấp cả hai giá trị!"
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
-#, php-format
-msgid "There is already an entry with this %s attribute in the system!"
-msgstr ""
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr "Đã có sẵn một entry với thuộc tính '%s' trong hệ thống này!"
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
-msgstr ""
+msgid "The required field '%s' is empty!"
+msgstr "Trường được yêu cầu '%s' bị rỗng!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' không được phép:"
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' không được cho phép!"
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "PHP mở rộng %s mất tích!"
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1607,27 +1513,27 @@ msgstr "PHP mở rộng %s mất tích!"
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "Áp dụng"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Lưu lại"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "Thêm vào"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr "Thêm %s"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1635,31 +1541,31 @@ msgstr "Thêm %s"
 msgid "Delete"
 msgstr "Xóa"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr "Xóa %s"
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr "Hiệu chỉnh..."
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr "Hiệu chỉnh %s..."
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "Quay lại"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Tài khoản này không có chức năng mở rộng %s hợp lệ!"
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
@@ -1668,7 +1574,7 @@ msgstr ""
 "Tài khoản này đã bật các thiết lập %s lên. Bạn có thể tắt chúng đi bằng việc"
 " kích vào bên dưới."
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
@@ -1677,7 +1583,7 @@ msgstr ""
 "Tài khoản này đã bật các thiết lập %s lên. Để tắt chúng đi, bạn cần phải xóa"
 " thiết lập %s trước!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
@@ -1686,7 +1592,7 @@ msgstr ""
 "Tài khoản này đã tắt các thiết lập %s đi. Bạn có thể bật chúng lên bằng việc"
 " kích vào bên dưới."
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -1695,228 +1601,235 @@ msgstr ""
 "Tài khoản này đã tắt các thiết lập %s đi. Để bật chúng lên, bạn cần phải "
 "thêm thiết lập %s trước!"
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr "Thêm thiết lập %s "
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr "Xóa thiết lập %s"
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "Tháng Một"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "Tháng Hai"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "Tháng Ba"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "Tháng Tư"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "Tháng Năm"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "Tháng Sáu"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "Tháng Bảy"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "Tháng Tám"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "Tháng Chín"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "Tháng Mười"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "Tháng Mười Một"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "Tháng Mười Hai"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr "Đọc thao tác"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr "thêm tao tác"
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr "thay đối thao tác"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr "xóa thao tác"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr "tìm kiếm thao tác"
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr "Xác định thẩm quyền"
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s thất bại!"
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr "Hoạt động LDAP thất bại!"
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "đối tượng"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr "Tải lên thất bại!"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Tải lên thất bại: %s"
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại!"
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại: %s"
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' này vẫn còn được sử dụng bởi đối tượng: %s "
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' này vẫn còn được sử dụng."
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' vẫn còn được sử dụng bởi các đối tượng này: %s"
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "File '%s' không tồn tại!"
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Không thể mở file '%s' để đọc!"
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Không thể mở file '%s' để viết!"
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Không thế xóa file '%s'!"
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Không thể xóa folder '%s'!"
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kiểm tra hỗ trợ %s"
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Cài đặt và kích hoạt mô-đun PHP %s."
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1958,7 +1871,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2057,37 +1969,37 @@ msgstr "Trong khi chạy trên LDAP server %s"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2100,11 +2012,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2112,13 +2023,12 @@ msgstr "Tên"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "Mô tả"
@@ -2170,8 +2080,8 @@ msgstr "Hiệu chỉnh"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2233,37 +2143,38 @@ msgstr ""
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr "Lỗi về cấp phép"
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Bạn không được phép tạo ra snapshot cho %s."
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Bạn không được phép phục hồi một snapshot cho %s."
@@ -2295,28 +2206,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2361,8 +2277,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr ""
 
@@ -2371,7 +2287,7 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2382,7 +2298,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2456,6 +2372,10 @@ msgstr "Entry '%s' không được biết đến!"
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "Áp dụng bộ lọc"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr "Smarty"
@@ -2530,37 +2450,32 @@ msgstr "Xin hãy xác định mật mã của bạn!"
 msgid "Please check the username/password combination."
 msgstr "Xin hãy kiểm tra kết hợp tên người dùng/mật khẩu."
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Tài khoản bị khóa. Xin hãy liên lạc với admin quản trị hệ thống của bạn!"
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2573,44 +2488,44 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2677,224 +2592,8 @@ msgstr "Chào mừng %s!"
 msgid "References"
 msgstr "Các tham chiếu"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr "Hiệu chỉnh cài đặt POSIX của người dùng"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "Thư mục chủ"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "không được cấu hình"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "Nhóm sơ cấp"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "Tư cách thành viên nhóm"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "Tài khoản"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "Người dùng phải thay đổi mật khẩu ngay lần đăng nhập đầu tiên"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "Ủy thác hệ thống"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "Chế độ ủy thác"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "Đã vô hiệu"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "Truy cập hoàn toàn"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "Cho phép truy cập đến các máy chủ này"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "tự động"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "hết hạn"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "Thời gian trước khi tài khoản bị khóa đang hoạt động"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "hoạt động"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr "mật khẩu hết hạn"
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "Số ID của người sử dụng"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "Số ID của nhóm"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2921,7 +2620,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2958,258 +2657,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "Họ"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "Tên"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "Vị trí"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "Bang"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "Số điện thoại"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "Điện thoại di động"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "Máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "Số fax"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "Trang chá»§"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "Số điện thoại riêng"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "Thông tin về tổ chức"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "Bộ phận"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "Số phòng ban"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "Mã bưu điện"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "Bạn cần xác định mật khẩu hiện tại để có thể tiếp tục."
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "Mật khẩu mới và mật khẩu cũ quá giống nhau."
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "Mật khẩu mới cần được cắt ngắn lại."
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3317,36 +3036,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr "Thuộc tính đăng nhập"
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3358,31 +3087,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3427,539 +3156,452 @@ msgstr "Theme"
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
-msgstr "Múi giờ"
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr "Múi giờ"
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
+#: plugins/config/class_configInLdap.inc:130
 msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
+#: plugins/config/class_configInLdap.inc:131
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
+msgstr "Bật chức năng snapshots"
+
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr "Gốc snapshot"
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr "Thiết lập mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr "Độ dài tối thiểu của mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr "Sử dụng việc hết hạn tài khoản"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr "Hiển thị tóm tắt trên danh sách"
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr "Đăng nhập và phiên"
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr "Thuộc tính đăng nhập"
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr "Thực thi việc mã hóa các kết nối"
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr "Cảnh báo nếu một phiên chưa được mã hóa"
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr "Thời gian cho một phiên (một Session)"
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr "Bật chức năng snapshots"
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr "Gốc snapshot"
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr "Kho lưu trữ người và nhóm"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr "Thuộc tính DN người"
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr "Sá»­a lá»—i"
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr "Thời gian truy vấn LDAP tối đa"
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr "Đăng nhập thống kê LDAP"
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr "Cấp độ sửa lỗi"
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
+msgstr "Hiển thị tóm tắt trên danh sách"
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4058,9 +3700,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4249,7 +3890,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4269,8 +3910,7 @@ msgid "Information"
 msgstr "Thông tin"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4294,164 +3934,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "Nhóm đối tượng"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "Nhóm "
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "Các đối tượng thành viên"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "Ủy thác hệ thống"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Danh sách các nhóm"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "Chế độ ủy thác"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "Đã vô hiệu"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "Truy cập hoàn toàn"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "Áp dụng GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "Cho phép truy cập đến các máy chủ này"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "Các thành viên nhóm"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Danh sách các nhóm"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4500,10 +4132,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr ""
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index e81aac5ec5857794f5668e5b276bb3e485985542..6f1064be9b43a830ea7f4d4d7ed9c19f91cfe3c8 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-01-23 21:40+0100\n"
+"POT-Creation-Date: 2017-04-05 14:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -18,703 +18,669 @@ msgstr ""
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Language.inc:30
-#: plugins/personal/generic/class_user.inc:384
+#: setup/class_setupStepLanguage.inc:30
+#: plugins/personal/generic/class_user.inc:387
 msgid "Preferred language"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:59 setup/class_setupStep_Language.inc:60
+#: setup/class_setupStepLanguage.inc:59 setup/class_setupStepLanguage.inc:60
 msgid "Language setup"
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:61
+#: setup/class_setupStepLanguage.inc:61
 msgid "This step allows you to select your preferred language."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:62
+#: setup/class_setupStepLanguage.inc:62
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
 "\"automatic\" will use the language requested by the browser. This setting "
 "can be overriden per user."
 msgstr ""
 
-#: setup/class_setupStep_Language.inc:69
-#: plugins/config/class_configInLdap.inc:488
+#: setup/class_setupStepLanguage.inc:69
+#: plugins/config/class_configInLdap.inc:432
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:30 setup/class_setupStep_Migrate.inc:206
+#: setup/class_setupStepLdap.inc:33
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Location name"
+msgstr "位置名称"
+
+#: setup/class_setupStepLdap.inc:36
+msgid "Name of this connexion to show in the LDAP server list"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "Connection URI"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:41
+msgid "URI to contact the LDAP server. Usually starts with ldap://"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "TLS connection"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:46
+msgid "Should TLS be used to connect to this LDAP server?"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
+#: ihtml/themes/breezy/simple-list.tpl.c:2
+msgid "Base"
+msgstr "位置"
+
+#: setup/class_setupStepLdap.inc:50 setup/class_setupStepLdap.inc:119
+#: setup/class_setupStepLdap.inc:127
+msgid "The LDAP directory base"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:56
+msgid "Authentication"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:59
+msgid ""
+"DN of the admin account to use for binding to the LDAP. Base is "
+"automatically appended."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:74
+msgid "Admin DN"
+msgstr "管理员 DN"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Admin password"
+msgstr "管理员口令"
+
+#: setup/class_setupStepLdap.inc:77
+msgid "Password for the admin account to use for binding to the LDAP"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:83
+msgid "Status"
+msgstr "状态"
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:86
+msgid "Result of last attempt at checking LDAP binding and basic schemas"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:107
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:108
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:109
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:179
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:181
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:183
+msgid "Retry"
+msgstr "重试"
+
+#: setup/class_setupStepLdap.inc:187
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:188 setup/class_setupStepLdap.inc:192
+msgid "Refresh"
+msgstr "刷新"
+
+#: setup/class_setupStepLdap.inc:189
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:191
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:210 setup/class_setupStepLdap.inc:212
+#, php-format
+msgid ""
+"%s\n"
+"Schema \"%s\": %s"
+msgstr ""
+
+#: setup/class_setupStepLdap.inc:212 setup/class_setupStepMigrate.inc:573
+#: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
+#: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
+#: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
+#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
+#: ihtml/themes/breezy/msg_dialog.tpl.c:5
+msgid "Warning"
+msgstr "警告"
+
+#: setup/class_setup.inc:128
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setup.inc:208
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:251
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:30 setup/class_setupStepWelcome.inc:30
+#: setup/class_setupStepWelcome.inc:50
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:40
+#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr "完成"
+
+#: setup/class_setupStepFinish.inc:41
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:42
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:89
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:91
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStepFinish.inc:96
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setupStepChecks.inc:30 setup/class_setupStepMigrate.inc:206
 msgid "PHP module and extension checks"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:37
+#: setup/class_setupStepChecks.inc:37
 msgid ""
 "PHP setup configuration (<a href=\"?info\" target=\"_blank\">show "
 "information)</a>)"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:48 setup/class_setupStep_Checks.inc:49
+#: setup/class_setupStepChecks.inc:48 setup/class_setupStepChecks.inc:49
 msgid "Installation check"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:50
+#: setup/class_setupStepChecks.inc:50
 msgid "Basic checks for PHP compatibility and extensions"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:67
+#: setup/class_setupStepChecks.inc:67
 msgid "Checking PHP version"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:68
+#: setup/class_setupStepChecks.inc:68
 #, php-format
 msgid "PHP must be of version %s or above."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:69
+#: setup/class_setupStepChecks.inc:69
 msgid "Please upgrade to a supported version."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:76
+#: setup/class_setupStepChecks.inc:76
 msgid "FusionDirectory requires this module to talk with your LDAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:84
+#: setup/class_setupStepChecks.inc:84
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:92
+#: setup/class_setupStepChecks.inc:92
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:100
+#: setup/class_setupStepChecks.inc:100
 msgid ""
 "FusionDirectory requires this module to encode variables for javascript use."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:108
+#: setup/class_setupStepChecks.inc:108
 msgid ""
 "FusionDirectory requires this module to filters a variable with a specified "
 "filter."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:116
+#: setup/class_setupStepChecks.inc:116
 msgid "FusionDirectory requires this module for the samba integration."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:124
+#: setup/class_setupStepChecks.inc:124
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:132
+#: setup/class_setupStepChecks.inc:132
 msgid "FusionDirectory requires this module to talk to an IMAP server."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:139
+#: setup/class_setupStepChecks.inc:139
 msgid "mbstring"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:140
+#: setup/class_setupStepChecks.inc:140
 msgid "FusionDirectory requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:146
+#: setup/class_setupStepChecks.inc:146
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:147
+#: setup/class_setupStepChecks.inc:147
 msgid "FusionDirectory requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStepChecks.inc:153
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:154
+#: setup/class_setupStepChecks.inc:154
 msgid "FusionDirectory requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:164
+#: setup/class_setupStepChecks.inc:164
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:165
+#: setup/class_setupStepChecks.inc:165
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:172
+#: setup/class_setupStepChecks.inc:172
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:173
+#: setup/class_setupStepChecks.inc:173
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:174
+#: setup/class_setupStepChecks.inc:174
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181 setup/class_setupStep_Checks.inc:197
-#: setup/class_setupStep_Checks.inc:213 setup/class_setupStep_Checks.inc:221
+#: setup/class_setupStepChecks.inc:181 setup/class_setupStepChecks.inc:197
+#: setup/class_setupStepChecks.inc:213 setup/class_setupStepChecks.inc:221
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStepChecks.inc:182
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:183
+#: setup/class_setupStepChecks.inc:183
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStepChecks.inc:190
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStepChecks.inc:191
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStepChecks.inc:198
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:199
+#: setup/class_setupStepChecks.inc:199
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStepChecks.inc:206
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStepChecks.inc:207
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStepChecks.inc:214
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStepChecks.inc:215
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStepChecks.inc:222
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:223
+#: setup/class_setupStepChecks.inc:223
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Welcome.inc:30 setup/class_setupStep_Welcome.inc:50
-#: setup/class_setupStep_Finish.inc:30
-msgid "Welcome"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:51
-msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-
-#: setup/class_setupStep_Welcome.inc:52
-msgid "The welcome message"
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:133 include/class_msgPool.inc:504
+#: setup/class_setupStepMigrate.inc:133 include/class_msgPool.inc:486
 #: setup/setup_checks.tpl.c:2 ihtml/themes/breezy/msg_dialog.tpl.c:14
 msgid "Ok"
 msgstr "好"
 
-#: setup/class_setupStep_Migrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
+#: setup/class_setupStepMigrate.inc:157 setup/setup_migrate_baseOC.tpl.c:11
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:223 setup/class_setupStep_Migrate.inc:224
+#: setup/class_setupStepMigrate.inc:223 setup/class_setupStepMigrate.inc:224
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:225
+#: setup/class_setupStepMigrate.inc:225
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:233
+#: setup/class_setupStepMigrate.inc:233
 msgid "Give all rights on users in the given branch"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStepMigrate.inc:239
 msgid ""
 "Allow users to edit their own information (main tab and posix use only on "
 "base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:245
+#: setup/class_setupStepMigrate.inc:245
 msgid "Allow users to edit their own password (use only on base)"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:258
+#: setup/class_setupStepMigrate.inc:258
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:259
+#: setup/class_setupStepMigrate.inc:259
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:260
+#: setup/class_setupStepMigrate.inc:260
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:261
+#: setup/class_setupStepMigrate.inc:261
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:262
+#: setup/class_setupStepMigrate.inc:262
 msgid "Checking for default ACL roles and groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStepMigrate.inc:263
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:264
+#: setup/class_setupStepMigrate.inc:264
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:265
+#: setup/class_setupStepMigrate.inc:265
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStepMigrate.inc:266
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStepMigrate.inc:267
 msgid "Checking for duplicated GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:488
-#: setup/class_setupStep_Migrate.inc:565 setup/class_setupStep_Migrate.inc:703
-#: setup/class_setupStep_Migrate.inc:977
-#: setup/class_setupStep_Migrate.inc:1053
-#: setup/class_setupStep_Migrate.inc:1176
-#: setup/class_setupStep_Migrate.inc:1269
-#: setup/class_setupStep_Migrate.inc:1348
-#: setup/class_setupStep_Migrate.inc:1392
+#: setup/class_setupStepMigrate.inc:329 setup/class_setupStepMigrate.inc:488
+#: setup/class_setupStepMigrate.inc:565 setup/class_setupStepMigrate.inc:700
+#: setup/class_setupStepMigrate.inc:901 setup/class_setupStepMigrate.inc:977
+#: setup/class_setupStepMigrate.inc:1100 setup/class_setupStepMigrate.inc:1193
+#: setup/class_setupStepMigrate.inc:1271 setup/class_setupStepMigrate.inc:1315
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:566 setup/class_setupStep_Migrate.inc:704
-#: setup/class_setupStep_Migrate.inc:978
-#: setup/class_setupStep_Migrate.inc:1054
-#: setup/class_setupStep_Migrate.inc:1177
-#: setup/class_setupStep_Migrate.inc:1270
-#: setup/class_setupStep_Migrate.inc:1349
-#: setup/class_setupStep_Migrate.inc:1393
+#: setup/class_setupStepMigrate.inc:330 setup/class_setupStepMigrate.inc:489
+#: setup/class_setupStepMigrate.inc:566 setup/class_setupStepMigrate.inc:701
+#: setup/class_setupStepMigrate.inc:902 setup/class_setupStepMigrate.inc:978
+#: setup/class_setupStepMigrate.inc:1101 setup/class_setupStepMigrate.inc:1194
+#: setup/class_setupStepMigrate.inc:1272 setup/class_setupStepMigrate.inc:1316
 msgid "Possibly the \"root object\" is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:346 setup/class_setupStep_Migrate.inc:369
-#: setup/class_setupStep_Migrate.inc:420 setup/class_setupStep_Migrate.inc:500
-#: setup/class_setupStep_Migrate.inc:511 setup/class_setupStep_Migrate.inc:864
-#: setup/class_setupStep_Migrate.inc:879
+#: setup/class_setupStepMigrate.inc:346 setup/class_setupStepMigrate.inc:369
+#: setup/class_setupStepMigrate.inc:420 setup/class_setupStepMigrate.inc:500
+#: setup/class_setupStepMigrate.inc:511 setup/class_setupStepMigrate.inc:803
 msgid "Failed"
 msgstr "失败"
 
-#: setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStepMigrate.inc:347
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStepMigrate.inc:348
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStepMigrate.inc:370
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
-#: setup/class_setupStep_Migrate.inc:1127
-#: include/password-methods/class_password-methods.inc:187
-#: include/functions.inc:513 include/functions.inc:669
-#: include/functions.inc:716 include/functions.inc:814
-#: include/functions.inc:2631 include/functions.inc:2833
-#: include/class_config.inc:322 include/class_ldap.inc:841
-#: include/class_ldap.inc:1201
-#: include/simpleplugin/attributes/class_SetAttribute.inc:732
+#: setup/class_setupStepMigrate.inc:452 setup/class_setupStepMigrate.inc:1051
+#: include/password-methods/class_password-methods.inc:189
+#: include/functions.inc:501 include/functions.inc:675
+#: include/functions.inc:722 include/functions.inc:830
+#: include/class_config.inc:313 include/class_ldap.inc:841
+#: include/class_ldap.inc:1197
+#: include/simpleplugin/attributes/class_SetAttribute.inc:726
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:371 plugins/config/class_recoveryConfig.inc:132
+#: html/index.php:372 plugins/config/class_recoveryConfig.inc:137
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: setup/class_setupStep_Migrate.inc:501
+#: setup/class_setupStepMigrate.inc:501
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your LDAP database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:512
+#: setup/class_setupStepMigrate.inc:512
 #, php-format
 msgid "The specified user \"%s\" does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:573
-#: setup/class_setupStep_Migrate.inc:1080
-#: setup/class_setupStep_Migrate.inc:1199
-#: setup/class_setupStep_Migrate.inc:1310
-#: setup/class_setupStep_Migrate.inc:1374
-#: setup/class_setupStep_Migrate.inc:1418 setup/class_setupStep_Ldap.inc:199
-#: include/functions.inc:830 include/functions.inc:2167
-#: include/functions.inc:2752 include/functions.inc:2773 html/index.php:597
-#: html/main.php:158 setup/setup_checks.tpl.c:8
-#: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/remove.tpl.c:2
-#: ihtml/themes/breezy/msg_dialog.tpl.c:5
-msgid "Warning"
-msgstr "警告"
-
-#: setup/class_setupStep_Migrate.inc:575
+#: setup/class_setupStepMigrate.inc:575
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:584 setup/class_setupStep_Migrate.inc:589
+#: setup/class_setupStepMigrate.inc:584 setup/class_setupStepMigrate.inc:589
 msgid "User migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStepMigrate.inc:672 setup/class_setupStepMigrate.inc:948
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:674
+#: setup/class_setupStepMigrate.inc:674
 #, php-format
 msgid "Cannot migrate entry \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:857
-#, php-format
-msgid "FD 1.0.7 administrative accounts found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:792
+#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
+#: plugins/admin/users/class_userManagement.inc:42
+msgid "Users"
+msgstr "用户"
 
-#: setup/class_setupStep_Migrate.inc:860
-#, php-format
-msgid "FD 1.0.7 administrative groups found: %s"
-msgstr ""
+#: setup/class_setupStepMigrate.inc:795
+msgid "Groups"
+msgstr "用户组"
 
-#: setup/class_setupStep_Migrate.inc:862
-msgid ""
-"You may run <i>fusiondirectory-setup --migrate-acls</i> after saving config "
-"file at the end of the setup to migrate it.<br/>"
+#: setup/class_setupStepMigrate.inc:798
+msgid "Roles"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:865
-msgid ""
-"There is no valid FusionDirectory 1.0.8 administrator account inside your "
-"LDAP."
+#: setup/class_setupStepMigrate.inc:804
+msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:866 setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStepMigrate.inc:805
 #: include/simpleplugin/simple-list.xml:59
 #: plugins/admin/departments/dep-list.xml:48
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:66
 msgid "Create"
 msgstr "创建"
 
-#: setup/class_setupStep_Migrate.inc:871
-#: plugins/addons/dashboard/class_dashBoardUsers.inc:27
-#: plugins/admin/users/class_userManagement.inc:42
-msgid "Users"
-msgstr "用户"
-
-#: setup/class_setupStep_Migrate.inc:874
-msgid "Groups"
-msgstr "用户组"
-
-#: setup/class_setupStep_Migrate.inc:880
-msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-
-#: setup/class_setupStep_Migrate.inc:918
+#: setup/class_setupStepMigrate.inc:842
 msgid "Gives all rights on all objects"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:992
+#: setup/class_setupStepMigrate.inc:916
 msgid "Default ACL roles have not been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:994
+#: setup/class_setupStepMigrate.inc:918
 msgid "Some default ACL roles are missing"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:996
+#: setup/class_setupStepMigrate.inc:920
 msgid "Default ACL roles have been inserted"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1026
+#: setup/class_setupStepMigrate.inc:950
 #, php-format
 msgid "Cannot add ACL role \"%s\":"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStepMigrate.inc:1005
 #, php-format
 msgid "Found %s user(s) outside the configured tree \"%s\"."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1095
-#: setup/class_setupStep_Migrate.inc:1109
+#: setup/class_setupStepMigrate.inc:1019 setup/class_setupStepMigrate.inc:1033
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStepMigrate.inc:1051
 msgid "Cannot move entries to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "Entry will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStepMigrate.inc:1063
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1149
+#: setup/class_setupStepMigrate.inc:1073
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStepMigrate.inc:1124
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1214
-#: setup/class_setupStep_Migrate.inc:1228
+#: setup/class_setupStepMigrate.inc:1138 setup/class_setupStepMigrate.inc:1152
 msgid "Move groups into configured groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1311
+#: setup/class_setupStepMigrate.inc:1235
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1320
-#: setup/class_setupStep_Migrate.inc:1325
+#: setup/class_setupStepMigrate.inc:1243 setup/class_setupStepMigrate.inc:1248
 msgid "Department migration"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1375
+#: setup/class_setupStepMigrate.inc:1298
 #, php-format
 msgid "Found %s duplicate values for attribute \"uidNumber\":%s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1419
+#: setup/class_setupStepMigrate.inc:1342
 #, php-format
-msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:33
-msgid "LDAP connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Location name"
-msgstr "位置名称"
-
-#: setup/class_setupStep_Ldap.inc:36
-msgid "Name of this connexion to show in the LDAP server list"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "Connection URI"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:41
-msgid "URI to contact the LDAP server. Usually starts with ldap://"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "TLS connection"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:46
-msgid "Should TLS be used to connect to this LDAP server?"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:50
-#: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:37
-#: ihtml/themes/breezy/simple-list.tpl.c:2
-msgid "Base"
-msgstr "位置"
-
-#: setup/class_setupStep_Ldap.inc:50
-msgid "The LDAP directory base"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:56
-msgid "Authentication"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:59
-msgid ""
-"DN of the admin account to use for binding to the LDAP. Base is "
-"automatically appended."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:74
-msgid "Admin DN"
-msgstr "管理员 DN"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Admin password"
-msgstr "管理员口令"
-
-#: setup/class_setupStep_Ldap.inc:77
-msgid "Password for the admin account to use for binding to the LDAP"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:83
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status"
-msgstr "状态"
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Current status"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:86
-msgid "Result of last attempt at checking LDAP binding and basic schemas"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:107
-msgid "LDAP setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:108
-msgid "LDAP connection setup"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:109
-msgid ""
-"This dialog performs the basic configuration of the LDAP connectivity for "
-"FusionDirectory."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:166
-#, php-format
-msgid "Anonymous bind to server '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:168
-#, php-format
-msgid "Bind as user '%s' failed!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:170
-msgid "Retry"
-msgstr "重试"
-
-#: setup/class_setupStep_Ldap.inc:174
-#, php-format
-msgid "Anonymous bind to server '%s' succeeded."
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:175 setup/class_setupStep_Ldap.inc:179
-msgid "Refresh"
-msgstr "刷新"
-
-#: setup/class_setupStep_Ldap.inc:176
-msgid "Please specify user and password!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:178
-#, php-format
-msgid "Bind as user '%s' to server '%s' succeeded!"
-msgstr ""
-
-#: setup/class_setupStep_Ldap.inc:197 setup/class_setupStep_Ldap.inc:199
-#, php-format
-msgid ""
-"%s\n"
-"Schema \"%s\": %s"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:40
-#: ihtml/themes/breezy/copyPasteDialog.tpl.c:26
-msgid "Finish"
-msgstr "完成"
-
-#: setup/class_setupStep_Finish.inc:41
-msgid "Finish - write the configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:42
-msgid "Write configuration file"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:89
-msgid ""
-"Your configuration file is currently world readable. Please update the file "
-"permissions!"
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:91
-msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-
-#: setup/class_setupStep_Finish.inc:96
-#, php-format
-msgid ""
-"After downloading and placing the file under %s, please make sure that the "
-"user the webserver is running with is able to read %s, while other users "
-"shouldn't."
-msgstr ""
-
-#: setup/class_setup.inc:128
-msgid "Setup error"
+msgid "Found %s duplicate values for attribute \"gidNumber\":%s"
 msgstr ""
 
-#: setup/class_setup.inc:208
-msgid "Completed"
+#: setup/class_setupStepWelcome.inc:51
+msgid "Welcome to FusionDirectory setup wizard"
 msgstr ""
 
-#: setup/class_setup.inc:251
-msgid "Next"
+#: setup/class_setupStepWelcome.inc:52
+msgid "The welcome message"
 msgstr ""
 
 #: include/class_logging.inc:80 include/class_session.inc:50
 #: include/class_session.inc:88 include/class_session.inc:127
-#: include/functions.inc:555 include/functions.inc:641
-#: include/functions.inc:762 include/functions.inc:1969
-#: include/functions.inc:2008 include/functions.inc:2039
+#: include/functions.inc:575 include/functions.inc:647
+#: include/functions.inc:768 include/functions.inc:1835
+#: include/functions.inc:1874 include/functions.inc:1905
 #: include/class_ldap.inc:790 include/class_ldap.inc:828
 #: include/class_acl.inc:118
 msgid "Internal error"
@@ -734,17 +700,17 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_baseSelector.inc:210 include/class_listing.inc:1194
-#: include/class_listing.inc:1196
+#: include/class_baseSelector.inc:212 include/class_listing.inc:1202
+#: include/class_listing.inc:1204
 msgid "Root"
 msgstr "æ ¹"
 
-#: include/class_baseSelector.inc:262 include/class_listing.inc:1217
+#: include/class_baseSelector.inc:261 include/class_listing.inc:1225
 msgid "Submit"
 msgstr "提交"
 
-#: include/class_listing.inc:313 include/class_listing.inc:1202
-#: include/class_listing.inc:1204
+#: include/class_listing.inc:313 include/class_listing.inc:1210
+#: include/class_listing.inc:1212
 msgid "Up"
 msgstr "上"
 
@@ -771,24 +737,19 @@ msgstr ""
 #: include/class_listing.inc:551
 #: include/password-methods/class_password-methods-sasl.inc:60
 #: include/password-methods/class_password-methods-sasl.inc:86
-#: include/password-methods/class_password-methods.inc:400
-#: include/password-methods/class_password-methods.inc:410
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-#: include/functions.inc:2935 include/class_msg_dialog.inc:136
-#: include/class_msg_dialog.inc:172 include/class_config.inc:357
-#: include/class_msgPool.inc:220 include/class_msgPool.inc:240
-#: include/class_msgPool.inc:270 include/class_msgPool.inc:722
-#: include/class_msgPool.inc:749 include/simpleplugin/class_simpleTabs.inc:71
+#: include/class_msg_dialog.inc:136 include/class_msg_dialog.inc:172
+#: include/class_config.inc:347 include/class_msgPool.inc:220
+#: include/class_msgPool.inc:240 include/class_msgPool.inc:270
+#: include/class_msgPool.inc:694 include/class_msgPool.inc:723
+#: include/simpleplugin/class_simpleTabs.inc:71
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:87
 #: include/simpleplugin/attributes/class_BaseSelectorAttribute.inc:89
 #: include/simpleplugin/attributes/class_FileAttribute.inc:31
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
-#: include/simpleplugin/attributes/class_FileAttribute.inc:291
-#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:474
-#: html/index.php:484 html/index.php:546 html/index.php:556
+#: include/simpleplugin/attributes/class_FileAttribute.inc:300
+#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
+#: html/index.php:478 html/index.php:535 html/index.php:545
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "错误"
@@ -797,70 +758,70 @@ msgstr "错误"
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1194
+#: include/class_listing.inc:1202
 msgid "Go to root department"
 msgstr "转到根部门"
 
-#: include/class_listing.inc:1202
+#: include/class_listing.inc:1210
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: include/class_listing.inc:1210
+#: include/class_listing.inc:1218
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1210 include/class_listing.inc:1212
+#: include/class_listing.inc:1218 include/class_listing.inc:1220
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1217
+#: include/class_listing.inc:1225
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: include/class_listing.inc:1338 include/simpleplugin/simple-list.xml:48
+#: include/class_listing.inc:1346 include/simpleplugin/simple-list.xml:48
 #: plugins/admin/departments/dep-list.xml:37
 #: plugins/admin/users/user-list.xml:62 plugins/admin/groups/group-list.xml:54
 msgid "Actions"
 msgstr "动作"
 
-#: include/class_listing.inc:1651 include/class_listing.inc:1704
+#: include/class_listing.inc:1659 include/class_listing.inc:1712
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1657 include/class_listing.inc:1692
+#: include/class_listing.inc:1665 include/class_listing.inc:1700
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1665 include/class_listing.inc:1667
-#: include/class_CopyPasteHandler.inc:336
+#: include/class_listing.inc:1673 include/class_listing.inc:1675
+#: include/class_CopyPasteHandler.inc:332
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1700
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1704
+#: include/class_listing.inc:1712
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: include/class_listing.inc:1729 include/class_listing.inc:1731
+#: include/class_listing.inc:1737 include/class_listing.inc:1739
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1745
+#: include/class_listing.inc:1753
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1777 include/class_listing.inc:1778
+#: include/class_listing.inc:1785 include/class_listing.inc:1786
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1790
+#: include/class_listing.inc:1798
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1791
+#: include/class_listing.inc:1799
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -878,9 +839,9 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:63
 #: include/password-methods/class_password-methods-ssha.inc:67
 #: include/password-methods/class_password-methods-ssha.inc:83
-#: include/functions.inc:651 include/class_timezone.inc:51
-#: include/class_config.inc:159 include/class_config.inc:284
-#: include/class_config.inc:809 include/class_config.inc:822
+#: include/functions.inc:657 include/class_timezone.inc:51
+#: include/class_config.inc:154 include/class_config.inc:276
+#: include/class_config.inc:795 include/class_config.inc:807
 #: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
@@ -906,27 +867,27 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:209
-#: include/simpleplugin/class_simpleManagement.inc:1029
-#: include/simpleplugin/class_simpleManagement.inc:1129
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/class_CopyPasteHandler.inc:208
+#: include/simpleplugin/class_simpleManagement.inc:1018
+#: include/simpleplugin/class_simpleManagement.inc:1117
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #: plugins/admin/users/class_userManagement.inc:153
 msgid "Permission"
 msgstr "允许"
 
-#: include/class_CopyPasteHandler.inc:272
+#: include/class_CopyPasteHandler.inc:268
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:338
+#: include/class_CopyPasteHandler.inc:334
 msgid "Cannot paste"
 msgstr ""
 
 #: include/select/userSelect/class_userSelect.inc:32
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 #: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
 #: plugins/personal/generic/paste_generic.tpl.c:11
 msgid "Login"
@@ -934,8 +895,10 @@ msgstr "登录名"
 
 #: include/class_template.inc:41
 #: include/simpleplugin/class_simpleManagement.inc:281
-#: include/simpleplugin/class_simpleManagement.inc:512
-#: plugins/admin/users/user-list.xml:95 ihtml/themes/breezy/template.tpl.c:5
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/class_groupManagement.inc:186
+#: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "模板"
 
@@ -959,7 +922,7 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:483 include/functions.inc:2970
+#: include/functions.inc:474 include/functions.inc:2558
 #: include/simpleplugin/class_simplePlugin.inc:466
 #: include/simpleplugin/class_simplePlugin.inc:471
 #: include/simpleplugin/class_simplePlugin.inc:483
@@ -967,266 +930,217 @@ msgstr ""
 msgid "Fatal error"
 msgstr ""
 
-#: include/functions.inc:484
+#: include/functions.inc:475
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误:连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:555
+#: include/functions.inc:535
 msgid ""
 "Login (uid) is not unique inside the LDAP tree. Please contact your "
 "administrator."
 msgstr ""
 
-#: include/functions.inc:589
+#: include/functions.inc:595
 msgid "Authentication error"
 msgstr ""
 
-#: include/functions.inc:590
+#: include/functions.inc:596
 msgid ""
 "It seems your user password has expired. Please use <a "
 "href=\"recovery.php\">password recovery</a> to change it."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:762
+#: include/functions.inc:647 include/functions.inc:768
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:657
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:830
+#: include/functions.inc:846
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:859
+#: include/functions.inc:875
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制!"
 
-#: include/functions.inc:861
+#: include/functions.inc:877
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:878
+#: include/functions.inc:894
 msgid "Configure"
 msgstr "配置"
 
-#: include/functions.inc:883
+#: include/functions.inc:899
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1260
+#: include/functions.inc:1258
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1262
+#: include/functions.inc:1260
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1264
+#: include/functions.inc:1262
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1492
-msgid "Entries per page"
-msgstr "每页条目数"
-
-#: include/functions.inc:1523 include/class_filter.inc:353
-msgid "Apply filter"
-msgstr "应用过滤器"
-
-#: include/functions.inc:1791
+#: include/functions.inc:1657
 #, php-format
 msgid "%sB"
 msgstr ""
 
-#: include/functions.inc:1792
+#: include/functions.inc:1658
 #, php-format
 msgid "%sKiB"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1659
 #, php-format
 msgid "%sMiB"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1660
 #, php-format
 msgid "%sGiB"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1661
 #, php-format
 msgid "%sTiB"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1662
 #, php-format
 msgid "%sPiB"
 msgstr ""
 
-#: include/functions.inc:1797
+#: include/functions.inc:1663
 #, php-format
 msgid "%sEiB"
 msgstr ""
 
-#: include/functions.inc:1798
+#: include/functions.inc:1664
 #, php-format
 msgid "%sZiB"
 msgstr ""
 
-#: include/functions.inc:1799
+#: include/functions.inc:1665
 #, php-format
 msgid "%sYiB"
 msgstr ""
 
-#: include/functions.inc:1831 include/class_filter.inc:315
+#: include/functions.inc:1697 include/class_filter.inc:305
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1969
+#: include/functions.inc:1835
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2008
+#: include/functions.inc:1874
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2039
+#: include/functions.inc:1905
 msgid "Cannot read revision file!"
 msgstr ""
 
-#: include/functions.inc:2167
-msgid "'nextIdHook' is not available. Using default base!"
-msgstr ""
-
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2185
+#: include/functions.inc:2019
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2042
 msgid "Main FusionDirectory schema"
 msgstr ""
 
-#: include/functions.inc:2215
+#: include/functions.inc:2049
 msgid "Schema used to store FusionDirectory configuration"
 msgstr ""
 
-#: include/functions.inc:2222
+#: include/functions.inc:2056
 msgid "Used to store trust mode information in users or groups."
 msgstr ""
 
-#: include/functions.inc:2229
+#: include/functions.inc:2063
 msgid "Used to store templates."
 msgstr ""
 
-#: include/functions.inc:2236
+#: include/functions.inc:2071
 msgid "Used to store POSIX information."
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2079
 #, php-format
 msgid "Missing required object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2245
+#: include/functions.inc:2081
 #, php-format
 msgid "Missing optional object class \"%s\"!"
 msgstr ""
 
-#: include/functions.inc:2249
+#: include/functions.inc:2085
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2267
+#: include/functions.inc:2103
 msgid ""
 "You have installed the mixed groups plugin, but your schema configuration "
 "does not support this."
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2104
 msgid ""
 "In order to use mixed groups the objectClass \"posixGroup\" must be "
 "AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2271
+#: include/functions.inc:2107
 msgid ""
 "Your schema is configured to support mixed groups, but this plugin is not "
 "present."
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2108
 msgid "The objectClass \"posixGroup\" must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2752
-#, php-format
-msgid "Unknown ID allocation method \"%s\"!"
-msgstr ""
-
-#: include/functions.inc:2774
-#, php-format
-msgid "Timeout while waiting for lock. Ignoring lock from %s!"
-msgstr ""
-
-#: include/functions.inc:2801 include/functions.inc:2841
-#: include/functions.inc:2853 include/functions.inc:2857
-#: include/functions.inc:2864 include/functions.inc:2873
-msgid "Cannot allocate a free ID:"
-msgstr ""
-
-#: include/functions.inc:2801
-#, php-format
-msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
-
-#: include/functions.inc:2841
-msgid "sambaUnixIdPool is not unique!"
-msgstr ""
-
-#: include/functions.inc:2853 include/functions.inc:2857
-msgid "no ID available!"
-msgstr ""
-
-#: include/functions.inc:2873
-msgid "maximum tries exceeded!"
-msgstr ""
-
-#: include/functions.inc:2935
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: include/functions.inc:2971
+#: include/functions.inc:2559
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: include/class_pluglist.inc:164
+#: include/class_pluglist.inc:181
 msgid "All objects in this category"
 msgstr ""
 
@@ -1239,46 +1153,46 @@ msgstr ""
 msgid "The timezone setting \"%s\" in your configuration is not valid."
 msgstr ""
 
-#: include/class_config.inc:156
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML 出错于 fusiondirectory.conf: %s ,行 %d"
 
-#: include/class_config.inc:280
+#: include/class_config.inc:272
 #, php-format
 msgid ""
 "It seems you are trying to decode something which is not encoded : %s<br/>\n"
 "Please check you are not using a fusiondirectory.secrets file while your passwords are not encrypted."
 msgstr ""
 
-#: include/class_config.inc:322
+#: include/class_config.inc:313
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:357
+#: include/class_config.inc:347
 #, php-format
 msgid "Location \"%s\" could not be found in the configuration file"
 msgstr ""
 
-#: include/class_config.inc:810
+#: include/class_config.inc:796
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not"
-" set."
+"The snapshot functionality is enabled, but the required variable \"%s\" is "
+"not set."
 msgstr ""
 
-#: include/class_config.inc:823
+#: include/class_config.inc:808
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"is missing. Please install \"%s\"."
 msgstr ""
 
-#: include/class_config.inc:932
+#: include/class_config.inc:916
 msgid "All categories"
 msgstr ""
 
-#: include/class_config.inc:1063
+#: include/class_config.inc:1050
 msgid "My account"
 msgstr "我的账号"
 
@@ -1301,7 +1215,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr "选择在子树中查询"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:364
+#: include/class_msgPool.inc:51 include/class_filter.inc:354
 msgid "Search in subtrees"
 msgstr ""
 
@@ -1510,52 +1424,46 @@ msgstr ""
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:406 include/class_msgPool.inc:429
-#: include/simpleplugin/attributes/class_SetAttribute.inc:589
-#, php-format
-msgid "\"%s\""
-msgstr ""
-
-#: include/class_msgPool.inc:409
+#: include/class_msgPool.inc:404
 #, php-format
-msgid "There is already an entry with this %s attribute in the system!"
+msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:411
+#: include/class_msgPool.inc:406
 #, php-format
-msgid "The entry \"%s\" already use this %s attribute!"
+msgid "The entry '%s' already use this '%s' attribute!"
 msgstr ""
 
-#: include/class_msgPool.inc:431
+#: include/class_msgPool.inc:417
 #, php-format
-msgid "The required field %s is empty!"
+msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:435
 msgid "Example:"
 msgstr ""
 
-#: include/class_msgPool.inc:473 include/class_msgPool.inc:477
+#: include/class_msgPool.inc:455 include/class_msgPool.inc:459
 #, php-format
 msgid "The field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:474
+#: include/class_msgPool.inc:456
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:488
+#: include/class_msgPool.inc:470
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:496 setup/setup_migrate_adminAccount.tpl.c:23
+#: include/class_msgPool.inc:478 setup/setup_migrate_adminAccount.tpl.c:23
 #: setup/setup_migrate_accounts.tpl.c:32 ihtml/themes/breezy/islocked.tpl.c:17
 #: ihtml/themes/breezy/copyPasteDialog.tpl.c:17
 #: ihtml/themes/breezy/msg_dialog.tpl.c:17 ihtml/themes/breezy/acl.tpl.c:53
@@ -1563,27 +1471,27 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: include/class_msgPool.inc:512 setup/setup_migrate_adminAccount.tpl.c:20
+#: include/class_msgPool.inc:494 setup/setup_migrate_adminAccount.tpl.c:20
 #: setup/setup_migrate_accounts.tpl.c:29 ihtml/themes/breezy/acl.tpl.c:50
 #: ihtml/themes/breezy/acl.tpl.c:56
 msgid "Apply"
 msgstr "应用"
 
-#: include/class_msgPool.inc:520 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
+#: include/class_msgPool.inc:502 ihtml/themes/breezy/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "保存"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add"
 msgstr "添加"
 
-#: include/class_msgPool.inc:530
+#: include/class_msgPool.inc:512
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #: include/simpleplugin/attributes/class_SetAttribute.inc:501
 #: include/simpleplugin/attributes/class_SetAttribute.inc:502
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
@@ -1591,280 +1499,287 @@ msgstr ""
 msgid "Delete"
 msgstr "删除"
 
-#: include/class_msgPool.inc:540
+#: include/class_msgPool.inc:522
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:550
+#: include/class_msgPool.inc:532
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:558
+#: include/class_msgPool.inc:540
 msgid "Back"
 msgstr "返回"
 
-#: include/class_msgPool.inc:587
+#: include/class_msgPool.inc:569
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:600
+#: include/class_msgPool.inc:582
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:606 include/class_msgPool.inc:613
+#: include/class_msgPool.inc:588 include/class_msgPool.inc:595
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove"
 " the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:610
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: include/class_msgPool.inc:634 include/class_msgPool.inc:641
+#: include/class_msgPool.inc:612
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:653
+#: include/class_msgPool.inc:614
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to "
+"disable the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:625
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:664
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:672
+#: include/class_msgPool.inc:644
 msgid "Click the 'Edit' button below to change information in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "January"
 msgstr "一月"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "February"
 msgstr "二月"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "March"
 msgstr "三月"
 
-#: include/class_msgPool.inc:680
+#: include/class_msgPool.inc:652
 msgid "April"
 msgstr "四月"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "May"
 msgstr "五月"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "June"
 msgstr "六月"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "July"
 msgstr "七月"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "August"
 msgstr "八月"
 
-#: include/class_msgPool.inc:681
+#: include/class_msgPool.inc:653
 msgid "September"
 msgstr "九月"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "October"
 msgstr "十月"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "November"
 msgstr "十一月"
 
-#: include/class_msgPool.inc:682
+#: include/class_msgPool.inc:654
 msgid "December"
 msgstr "十二月"
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:691
+#: include/class_msgPool.inc:663
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:708
+#: include/class_msgPool.inc:680
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:709
+#: include/class_msgPool.inc:681
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:712
+#: include/class_msgPool.inc:684
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:714
+#: include/class_msgPool.inc:686
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:719 include/class_SnapshotDialogs.inc:33
+#: include/class_msgPool.inc:691 include/class_SnapshotDialogs.inc:33
 #: include/class_SnapshotDialogs.inc:182
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:341
 msgid "Object"
 msgstr "对象"
 
-#: include/class_msgPool.inc:733
+#: include/class_msgPool.inc:707
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:710
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:747
+#: include/class_msgPool.inc:721
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:749
+#: include/class_msgPool.inc:723
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:762 include/class_msgPool.inc:765
+#: include/class_msgPool.inc:736 include/class_msgPool.inc:739
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:768
+#: include/class_msgPool.inc:742
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:770
+#: include/class_msgPool.inc:744
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:780
+#: include/class_msgPool.inc:754
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:790
+#: include/class_msgPool.inc:764
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:800
+#: include/class_msgPool.inc:774
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:810
+#: include/class_msgPool.inc:784
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:820
+#: include/class_msgPool.inc:794
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:830
+#: include/class_msgPool.inc:804
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:840
+#: include/class_msgPool.inc:814
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:850
+#: include/class_msgPool.inc:824
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:860
+#: include/class_msgPool.inc:834
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:870
+#: include/class_msgPool.inc:844
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:880
+#: include/class_msgPool.inc:854
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:888
+#: include/class_msgPool.inc:862
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -1906,7 +1821,6 @@ msgid "Restoring snapshots"
 msgstr ""
 
 #: include/class_SnapshotDialogs.inc:186
-#: plugins/config/class_configInLdap.inc:229
 msgid "Snapshots"
 msgstr ""
 
@@ -2004,37 +1918,37 @@ msgstr "当操作  LDAP 服务器 '%s' 时"
 msgid "proc_open failed to execute ldapsearch"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:1052
 #, php-format
 msgid "Error line %s, first line of an entry cannot start with a space"
 msgstr ""
 
-#: include/class_ldap.inc:1073
+#: include/class_ldap.inc:1069
 #, php-format
 msgid "Error line %s, references to an external file are not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1076
+#: include/class_ldap.inc:1072
 #, php-format
 msgid "Error line %s, attribute \"%s\" has no value"
 msgstr ""
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1076
 #, php-format
 msgid "Error line %s, an entry bloc can only have one dn"
 msgstr ""
 
-#: include/class_ldap.inc:1085
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error line %s, an entry bloc should start with the dn"
 msgstr ""
 
-#: include/class_ldap.inc:1116
+#: include/class_ldap.inc:1112
 #, php-format
 msgid "Error while importing dn: \"%s\", please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_templateHandling.inc:403
+#: include/class_templateHandling.inc:474
 #, php-format
 msgid ""
 "Recursive dependency in the template fields: \"%1$s\" cannot depend on "
@@ -2047,11 +1961,10 @@ msgstr ""
 
 #: include/simpleplugin/simple-select-list.xml:32
 #: include/simpleplugin/simple-list.xml:32
-#: plugins/admin/departments/class_department.inc:170
+#: plugins/admin/departments/class_department.inc:171
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
+#: plugins/admin/groups/class_ogroup.inc:193
 #: plugins/admin/groups/group-list.xml:33
-#: plugins/admin/groups/class_group.inc:61
 #: plugins/admin/aclrole/class_aclRole.inc:99
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
@@ -2059,13 +1972,12 @@ msgstr "名称"
 
 #: include/simpleplugin/simple-select-list.xml:40
 #: include/simpleplugin/simple-list.xml:40
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 #: plugins/admin/departments/class_department.inc:72
 #: plugins/admin/departments/dep-list.xml:29
 #: plugins/admin/groups/class_roleGeneric.inc:91
-#: plugins/admin/groups/class_ogroup.inc:200
+#: plugins/admin/groups/class_ogroup.inc:198
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:66
 #: plugins/admin/aclrole/class_aclRole.inc:103
 msgid "Description"
 msgstr "描述"
@@ -2117,8 +2029,8 @@ msgstr "编辑"
 #: include/simpleplugin/class_dialogAttributes.inc:656
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
-#: include/simpleplugin/attributes/class_FileAttribute.inc:327
-#: include/simpleplugin/attributes/class_FileAttribute.inc:328
+#: include/simpleplugin/attributes/class_FileAttribute.inc:336
+#: include/simpleplugin/attributes/class_FileAttribute.inc:337
 #: plugins/admin/departments/dep-list.xml:67
 #: plugins/admin/departments/dep-list.xml:88
 #: plugins/admin/users/user-list.xml:115
@@ -2180,37 +2092,38 @@ msgstr "天"
 msgid "From template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:314
+#: include/simpleplugin/class_simpleManagement.inc:315
 #, php-format
 msgid "%s template"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:506
-#: include/simpleplugin/class_simpleManagement.inc:512
+#: include/simpleplugin/class_simpleManagement.inc:507
+#: include/simpleplugin/class_simpleManagement.inc:513
+#: plugins/admin/groups/class_groupManagement.inc:186
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "Filter error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:543
+#: include/simpleplugin/class_simpleManagement.inc:544
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1095
+#: include/simpleplugin/class_simpleManagement.inc:1083
 msgid "Permission error"
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1129
+#: include/simpleplugin/class_simpleManagement.inc:1117
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/simpleplugin/class_simpleManagement.inc:1180
-#: include/simpleplugin/class_simpleManagement.inc:1261
-#: include/simpleplugin/class_simpleManagement.inc:1279
+#: include/simpleplugin/class_simpleManagement.inc:1168
+#: include/simpleplugin/class_simpleManagement.inc:1248
+#: include/simpleplugin/class_simpleManagement.inc:1266
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -2242,28 +2155,33 @@ msgid ""
 "Could not compute dn: could not find objectType infos from tab class \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1267
+#: include/simpleplugin/class_simplePlugin.inc:1299
 #, php-format
 msgid "There is already an entry with the same dn : %s"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1274
+#: include/simpleplugin/class_simplePlugin.inc:1306
 #, php-format
 msgid "The entry %s is not existing"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1463
+#: include/simpleplugin/class_simplePlugin.inc:1495
 msgid ""
 "The object has changed since opened in FusionDirectory. All changes that may"
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1637
+#: include/simpleplugin/class_simplePlugin.inc:1680
+#, php-format
+msgid "Service \"%s\""
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:1682
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/simpleplugin/class_simplePlugin.inc:1787
+#: include/simpleplugin/class_simplePlugin.inc:1834
 #, php-format
 msgid "Unknown field \"%s\""
 msgstr ""
@@ -2308,8 +2226,8 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:119
-#: include/simpleplugin/attributes/class_FileAttribute.inc:317
-#: include/simpleplugin/attributes/class_FileAttribute.inc:318
+#: include/simpleplugin/attributes/class_FileAttribute.inc:326
+#: include/simpleplugin/attributes/class_FileAttribute.inc:327
 msgid "Upload"
 msgstr "上传"
 
@@ -2318,7 +2236,7 @@ msgstr "上传"
 msgid "Download"
 msgstr "下载"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:292
+#: include/simpleplugin/attributes/class_FileAttribute.inc:301
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -2329,7 +2247,7 @@ msgstr ""
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:591
+#: include/simpleplugin/attributes/class_SetAttribute.inc:585
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
@@ -2403,6 +2321,10 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
+#: include/class_filter.inc:343
+msgid "Apply filter"
+msgstr "应用过滤器"
+
 #: html/setup.php:60
 msgid "Smarty"
 msgstr ""
@@ -2476,36 +2398,31 @@ msgstr "请输入您的口令!"
 msgid "Please check the username/password combination."
 msgstr "请检查用户名/口令。"
 
-#: html/index.php:334
+#: html/index.php:337
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:455
+#: html/index.php:456
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:476
+#: html/index.php:470
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:486
+#: html/index.php:480 html/index.php:547
 #, php-format
-msgid "Header user \"%s\" match several users in the LDAP"
+msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:548
+#: html/index.php:537
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:558
-#, php-format
-msgid "CAS user \"%s\" match several users in the LDAP"
-msgstr ""
-
-#: html/index.php:597
+#: html/index.php:587
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2433,44 @@ msgstr "您的浏览器已经禁用 cookies。请启用 cookies 并在登录前
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:301 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Email address"
 msgstr "邮件地址"
 
-#: html/class_passwordRecovery.inc:468
+#: html/class_passwordRecovery.inc:471
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:474
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:503
+#: html/class_passwordRecovery.inc:507
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:506
+#: html/class_passwordRecovery.inc:510
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:514
+#: html/class_passwordRecovery.inc:518
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:569
+#: html/class_passwordRecovery.inc:573
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:582
+#: html/class_passwordRecovery.inc:586
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:646
+#: html/class_passwordRecovery.inc:650
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2620,224 +2537,8 @@ msgstr "欢迎 %s!"
 msgid "References"
 msgstr "参考"
 
-#: plugins/personal/posix/class_posixAccount.inc:86
-#: plugins/personal/posix/class_posixAccount.inc:115
-msgid "Unix"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:87
-msgid "Edit users POSIX settings"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "Home directory"
-msgstr "用户主目录"
-
-#: plugins/personal/posix/class_posixAccount.inc:119
-msgid "The path to the home directory of this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/class_posixAccount.inc:124
-msgid "Which shell should be used when this user log in"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:126
-msgid "unconfigured"
-msgstr "未配置"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group"
-msgstr "主要用户组"
-
-#: plugins/personal/posix/class_posixAccount.inc:130
-msgid "Primary group for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:134
-msgid "Status of this user unix account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user/group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:138
-msgid "Force user id and group id values for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:142
-msgid "User id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:147
-msgid "Group id value for this user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:154
-#: plugins/personal/posix/class_posixAccount.inc:157
-msgid "Group membership"
-msgstr "组成员身份"
-
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "Account"
-msgstr "账户"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid "User must change password on first login"
-msgstr "用户必须在第一次登录修改口令"
-
-#: plugins/personal/posix/class_posixAccount.inc:165
-msgid ""
-"User must change password on first login (needs a value for Delay before "
-"forcing password change)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid "Minimum delay between password changes (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:169
-msgid ""
-"The user won't be able to change his password before this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid "Delay before forcing password change (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:174
-msgid ""
-"The user will be forced to change his password after this number of days "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid "Password expiration date"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:179
-msgid ""
-"Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:184
-msgid ""
-"Maximum delay of inactivity after password expiration before the user is "
-"disabled (leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:189
-msgid ""
-"The user will be warned this number of days before his password expiration "
-"(leave empty to disable)"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:201
-#: plugins/admin/groups/class_ogroup.inc:217
-#: plugins/admin/groups/class_group.inc:91
-msgid "System trust"
-msgstr "信赖的系统"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Trust mode"
-msgstr "信赖模式"
-
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/groups/class_ogroup.inc:221
-#: plugins/admin/groups/class_group.inc:95
-msgid "Type of authorization for those hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "disabled"
-msgstr "禁用"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/personal/posix/class_posixAccount.inc:231
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "full access"
-msgstr "完全访问权限"
-
-#: plugins/personal/posix/class_posixAccount.inc:209
-#: plugins/admin/groups/class_ogroup.inc:225
-#: plugins/admin/groups/class_group.inc:99
-msgid "allow access to these hosts"
-msgstr "允许访问这些主机"
-
-#: plugins/personal/posix/class_posixAccount.inc:212
-msgid "Only allow this user to connect to this list of hosts"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:303
-msgid "automatic"
-msgstr "自动"
-
-#: plugins/personal/posix/class_posixAccount.inc:322
-msgid "expired"
-msgstr "过期"
-
-#: plugins/personal/posix/class_posixAccount.inc:324
-msgid "grace time active"
-msgstr "时间限制激活"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-#: plugins/personal/posix/class_posixAccount.inc:329
-#: plugins/personal/posix/class_posixAccount.inc:331
-msgid "active"
-msgstr "活动"
-
-#: plugins/personal/posix/class_posixAccount.inc:327
-msgid "password expired"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:329
-msgid "password not changeable"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:424
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/class_posixAccount.inc:427
-#: plugins/admin/groups/class_group.inc:74
-#: plugins/admin/groups/class_group.inc:150
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/class_posixAccount.inc:531
-#, php-format
-msgid "Group of user %s"
-msgstr ""
-
 #: plugins/personal/roles/class_userRoles.inc:31
-#: plugins/admin/groups/class_groupManagement.inc:31
+#: plugins/admin/groups/class_groupManagement.inc:33
 msgid "Groups and roles"
 msgstr ""
 
@@ -2864,7 +2565,7 @@ msgid "Password hash method to use"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:51
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 #: setup/setup_migrate_adminAccount.tpl.c:14
 #: ihtml/themes/breezy/recovery.tpl.c:2 ihtml/themes/breezy/recovery.tpl.c:5
 #: ihtml/themes/breezy/login.tpl.c:17 ihtml/themes/breezy/login.tpl.c:20
@@ -2901,258 +2602,278 @@ msgstr ""
 msgid "User account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:306
+#: plugins/personal/generic/class_user.inc:298
+msgid "User lock status"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
 msgid "Personal information"
 msgstr "个人信息"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 #: plugins/personal/generic/paste_generic.tpl.c:5
 msgid "Last name"
 msgstr "å§“"
 
-#: plugins/personal/generic/class_user.inc:311
+#: plugins/personal/generic/class_user.inc:315
 msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 #: plugins/personal/generic/paste_generic.tpl.c:8
 msgid "First name"
 msgstr "名"
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:320
 msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:321
+#: plugins/personal/generic/class_user.inc:325
 msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:325
+#: plugins/personal/generic/class_user.inc:329
 msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:332
+#: plugins/personal/generic/class_user.inc:336
 msgid "Organizational contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:336
+#: plugins/personal/generic/class_user.inc:340
 #: plugins/admin/departments/class_department.inc:90
 #: plugins/admin/departments/class_department.inc:96
 msgid "Location"
 msgstr "位置"
 
-#: plugins/personal/generic/class_user.inc:340
+#: plugins/personal/generic/class_user.inc:344
 #: plugins/admin/departments/class_department.inc:93
 msgid "State"
 msgstr "州/省"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 #: plugins/admin/departments/class_department.inc:102
 msgid "Address"
 msgstr "住址"
 
-#: plugins/personal/generic/class_user.inc:344
+#: plugins/personal/generic/class_user.inc:348
 msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room No."
 msgstr "房间号"
 
-#: plugins/personal/generic/class_user.inc:348
+#: plugins/personal/generic/class_user.inc:352
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 #: plugins/admin/departments/class_department.inc:106
 msgid "Phone"
 msgstr "电话"
 
-#: plugins/personal/generic/class_user.inc:352
+#: plugins/personal/generic/class_user.inc:356
 msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:357
+#: plugins/personal/generic/class_user.inc:360
 msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:361
+#: plugins/personal/generic/class_user.inc:364
 msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 #: plugins/admin/departments/class_department.inc:110
 msgid "Fax"
 msgstr "传真"
 
-#: plugins/personal/generic/class_user.inc:365
+#: plugins/personal/generic/class_user.inc:368
 msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:369
+#: plugins/personal/generic/class_user.inc:372
 msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
+#: plugins/personal/generic/class_user.inc:378
 msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:380
+#: plugins/personal/generic/class_user.inc:383
 msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:389
+#: plugins/personal/generic/class_user.inc:392
 msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:398
 msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Display name"
 msgstr "显示名称"
 
-#: plugins/personal/generic/class_user.inc:399
+#: plugins/personal/generic/class_user.inc:402
 msgid "Name this user should appear as. Used by Exchange."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:403
+#: plugins/personal/generic/class_user.inc:406
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Private phone"
 msgstr "私人电话"
 
-#: plugins/personal/generic/class_user.inc:407
+#: plugins/personal/generic/class_user.inc:410
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:413
+#: plugins/personal/generic/class_user.inc:416
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid "Title"
 msgstr "ç§°è°“"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:421
 msgid ""
 "Title of a person in their organizational context. Each title is one value "
 "of this multi-valued attribute"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:423
+#: plugins/personal/generic/class_user.inc:426
 #: plugins/admin/departments/class_organization.inc:30
 #: plugins/admin/departments/class_organization.inc:31
 #: plugins/admin/departments/class_organization.inc:34
 msgid "Organization"
 msgstr "组织/公司"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 #: plugins/admin/departments/class_department.inc:33
 #: plugins/admin/departments/class_department.inc:39
 #: plugins/admin/departments/dep-list.xml:21
 msgid "Department"
 msgstr "部门"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:430
 msgid "Department to which the user belongs"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department No."
 msgstr "部门编号"
 
-#: plugins/personal/generic/class_user.inc:431
+#: plugins/personal/generic/class_user.inc:434
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee No."
 msgstr "员工编号"
 
-#: plugins/personal/generic/class_user.inc:435
+#: plugins/personal/generic/class_user.inc:438
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:439
+#: plugins/personal/generic/class_user.inc:442
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:443
+#: plugins/personal/generic/class_user.inc:446
 #: plugins/admin/departments/class_department.inc:84
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:618
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:456
+msgid "Street part of the address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:460
+msgid "Post office box"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:464
+msgid "Postal code"
+msgstr "邮编"
+
+#: plugins/personal/generic/class_user.inc:659
 #, php-format
 msgid "Ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:621
+#: plugins/personal/generic/class_user.inc:662
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:632
+#: plugins/personal/generic/class_user.inc:673
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:646
+#: plugins/personal/generic/class_user.inc:687
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:696
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:662
+#: plugins/personal/generic/class_user.inc:703
 msgid "You need to specify your current password in order to proceed."
 msgstr "您需要输入当前口令才能继续。"
 
-#: plugins/personal/generic/class_user.inc:664
+#: plugins/personal/generic/class_user.inc:705
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:666
+#: plugins/personal/generic/class_user.inc:707
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
 msgid "New password"
 msgstr "新口令"
 
-#: plugins/personal/generic/class_user.inc:668
+#: plugins/personal/generic/class_user.inc:709
 msgid "The password used as new and current are too similar."
 msgstr "输入的新口令和当前口令非常相似。"
 
-#: plugins/personal/generic/class_user.inc:670
-msgid "The password used as new is to short."
-msgstr "输入的新口令太短了。"
+#: plugins/personal/generic/class_user.inc:711
+msgid "The password used as new is too short."
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:672
+#: plugins/personal/generic/class_user.inc:713
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -3260,36 +2981,46 @@ msgid ""
 "recover their password"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:80
+#: plugins/config/class_recoveryConfig.inc:78
+#: plugins/config/class_configInLdap.inc:188
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:78
+msgid ""
+"Usually uid, but you can use something else for instance in case of SSO"
+msgstr ""
+
+#: plugins/config/class_recoveryConfig.inc:85
 msgid "First email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:83
-#: plugins/config/class_recoveryConfig.inc:102
+#: plugins/config/class_recoveryConfig.inc:88
+#: plugins/config/class_recoveryConfig.inc:107
 msgid "Subject"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:84
+#: plugins/config/class_recoveryConfig.inc:89
 msgid "Subject of the first email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:87
+#: plugins/config/class_recoveryConfig.inc:92
 msgid "[FusionDirectory] Password recovery link"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:90
+#: plugins/config/class_recoveryConfig.inc:95
 #, php-format
 msgid "Body (first %s is login, second is link)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:91
+#: plugins/config/class_recoveryConfig.inc:96
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:94
+#: plugins/config/class_recoveryConfig.inc:99
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3301,31 +3032,31 @@ msgid ""
 "This link is only valid for 10 minutes."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:99
+#: plugins/config/class_recoveryConfig.inc:104
 msgid "Second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:103
+#: plugins/config/class_recoveryConfig.inc:108
 msgid "Subject of the second email"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:106
+#: plugins/config/class_recoveryConfig.inc:111
 msgid "[FusionDirectory] Password recovery successful"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:109
+#: plugins/config/class_recoveryConfig.inc:114
 #, php-format
 msgid "Body (%s is login)"
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:110
+#: plugins/config/class_recoveryConfig.inc:115
 #, php-format
 msgid ""
 "Body of the second email, sent to confirm the password has been changed. Use"
 " %s for the user login."
 msgstr ""
 
-#: plugins/config/class_recoveryConfig.inc:113
+#: plugins/config/class_recoveryConfig.inc:118
 #, php-format
 msgid ""
 "Hello,\n"
@@ -3358,551 +3089,464 @@ msgstr "语言"
 
 #: plugins/config/class_configInLdap.inc:91
 msgid ""
-"Language of the application. If 'automatic' or not available, the one asked "
-"by the browser will be used. This setting can be overriden per user."
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:96
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:110
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:113
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:118
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme"
+#: plugins/config/class_configInLdap.inc:124
+msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:96
-msgid "Theme to be used"
+#: plugins/config/class_configInLdap.inc:125
+msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone"
+#: plugins/config/class_configInLdap.inc:130
+msgid "Schema validation"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:102
-msgid "Timezone to be used"
+#: plugins/config/class_configInLdap.inc:131
+msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
-msgid "Schema setup"
+#: plugins/config/class_configInLdap.inc:136
+msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:113
-msgid "Schema validation"
+#: plugins/config/class_configInLdap.inc:136
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:114
-msgid "Enables schema checking during login."
+#: plugins/config/class_configInLdap.inc:141
+msgid "Snapshot base"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:121
+#: plugins/config/class_configInLdap.inc:148
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:124
+#: plugins/config/class_configInLdap.inc:151
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:156
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:133
+#: plugins/config/class_configInLdap.inc:160
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:138
+#: plugins/config/class_configInLdap.inc:165
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143
+#: plugins/config/class_configInLdap.inc:170
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:171
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:175
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
-msgid "SASL Exop"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:152
-msgid "Attribute to be stored in the userPassword attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:158
-msgid "Core settings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:161
-msgid "Display summary in listings"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:162
-msgid ""
-"Determines whether a status bar will be shown on the bottom of lists, "
-"displaying a short summary of type and number of elements in the list."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:167
-msgid "Edit locking"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:168
-msgid ""
-"Check if a entry currently being edited has been modified outside of "
-"FusionDirectory in the meantime."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:173
-msgid "Enable logging"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid "Event logging on FusionDirectory side."
-msgstr ""
-
 #: plugins/config/class_configInLdap.inc:179
-msgid "LDAP size limit"
+msgid "SASL Exop"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:179
-msgid "Defines the number of entries to get from LDAP by default."
+msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:186
+#: plugins/config/class_configInLdap.inc:185
 msgid "Login and session"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:189
-msgid "Login attribute"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:190
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:196
+#: plugins/config/class_configInLdap.inc:195
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:197
+#: plugins/config/class_configInLdap.inc:196
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:201
+#: plugins/config/class_configInLdap.inc:200
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202
+#: plugins/config/class_configInLdap.inc:201
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:207
+#: plugins/config/class_configInLdap.inc:206
 msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "HTTP Basic authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212
+#: plugins/config/class_configInLdap.inc:211
 msgid "Use HTTP Basic authentication protocol instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "HTTP Header authentication"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217
+#: plugins/config/class_configInLdap.inc:216
 msgid "Use HTTP Header authentication instead of the login form."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Header name"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:222
+#: plugins/config/class_configInLdap.inc:221
 msgid "Name of the header containing user identifier."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:232
-msgid "Enable snapshots"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:232
-msgid ""
-"This enables you to save certain states of entries and restore them later "
-"on."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "Snapshot base"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:237
-msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:244
+#: plugins/config/class_configInLdap.inc:228
 msgid "SSL"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Key path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:231
 msgid "Path to FusionDirectory private key. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:252
+#: plugins/config/class_configInLdap.inc:236
 msgid "Path to FusionDirectory certificate. Unused for now."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:241
+#: plugins/config/class_configInLdap.inc:256
 msgid "CA certificate path"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:257
+#: plugins/config/class_configInLdap.inc:241
 msgid "Path to the CA certificate. Used for validating Argonaut Server host."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:264
+#: plugins/config/class_configInLdap.inc:248
 msgid "CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "Enable CAS"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:267
+#: plugins/config/class_configInLdap.inc:251
 msgid "CAS login will be used instead of LDAP bind"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:272
+#: plugins/config/class_configInLdap.inc:256
 msgid "Path to the CA certificate of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:277
+#: plugins/config/class_configInLdap.inc:261
 msgid "Host of the CAS server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port"
 msgstr "端口"
 
-#: plugins/config/class_configInLdap.inc:282
+#: plugins/config/class_configInLdap.inc:266
 msgid "Port the CAS server is listening on"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:287
+#: plugins/config/class_configInLdap.inc:271
 msgid "CAS context to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:294
+#: plugins/config/class_configInLdap.inc:278
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:298
+#: plugins/config/class_configInLdap.inc:282
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "CN pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:303
+#: plugins/config/class_configInLdap.inc:287
 msgid "The pattern to use to build the common name field"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:308
+#: plugins/config/class_configInLdap.inc:292
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:309
+#: plugins/config/class_configInLdap.inc:293
 msgid "Enables strict checking of user and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:314
-msgid "Group/user min id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:315
-msgid ""
-"The minimum assignable user or group id to avoid security leaks with id 0 "
-"accounts."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid "Next id hook"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:320
-msgid ""
-"A script to be called for finding the next free id number for users or "
-"groups."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:324
-msgid "Base number for user id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:325
-msgid "Where to start looking for a new free user id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:330
-msgid "Base number for group id"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:331
-msgid "Where to start looking for a new free group id."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:336
+#: plugins/config/class_configInLdap.inc:298
 msgid "The branch where users are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:341
+#: plugins/config/class_configInLdap.inc:303
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "ACL role RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:346
+#: plugins/config/class_configInLdap.inc:308
 msgid "The branch where ACL roles are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
-msgid "Id allocation method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:351
-msgid "Method to allocate user/group ids"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Traditional"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:354
-msgid "Samba unix id pool"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Pool user id min"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:357
-msgid "Minimum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Pool user id max"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:362
-msgid "Maximum value for user id when using pool method"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:367
-msgid "Pool group id min"
+#: plugins/config/class_configInLdap.inc:313
+msgid "Restrict role members"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:367
-msgid "Minimum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:313
+msgid ""
+"When enabled only users from the same branch or members of groups from the "
+"same branch can be added to a role."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Pool group id max"
+#: plugins/config/class_configInLdap.inc:317
+msgid "Separate address fields"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
-msgid "Maximum value for group id when using pool method"
+#: plugins/config/class_configInLdap.inc:317
+msgid ""
+"Expose street, postOfficeBox and postalCode fields instead of postalAddress."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
-msgid "Restrict role members"
+#: plugins/config/class_configInLdap.inc:321
+msgid "Postal address pattern"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:377
+#: plugins/config/class_configInLdap.inc:321
 msgid ""
-"When enabled only users from the same branch or members of groups from the "
-"same branch can be added to a role."
+"When using separate address fields, you can use a pattern to fill "
+"postalAddress field."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:383
+#: plugins/config/class_configInLdap.inc:327
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:386
+#: plugins/config/class_configInLdap.inc:330
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387
+#: plugins/config/class_configInLdap.inc:331
 msgid ""
 "Shows PHP errors in the upper part of the screen. This should be disabled in"
 " productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:391
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:396
+#: plugins/config/class_configInLdap.inc:340
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:397
+#: plugins/config/class_configInLdap.inc:341
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:402
+#: plugins/config/class_configInLdap.inc:346
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:403
+#: plugins/config/class_configInLdap.inc:347
 msgid "Display certain information on each page load."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:415
+#: plugins/config/class_configInLdap.inc:359
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: plugins/config/class_configInLdap.inc:420
-msgid "Hooks that are called when specific actions happens"
+#: plugins/config/class_configInLdap.inc:362
+msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "tab"
+#: plugins/config/class_configInLdap.inc:363
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:424
-msgid "The tab that this hook concerns"
+#: plugins/config/class_configInLdap.inc:368
+msgid "Show ACL tab on all objects"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:429
-msgid "mode"
-msgstr "模式"
-
-#: plugins/config/class_configInLdap.inc:429
-msgid "When to call this command"
+#: plugins/config/class_configInLdap.inc:369
+msgid ""
+"For very specific ACL rights setting where you might need to give right on a"
+" single object."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "cmd"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available department categories"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:435
-msgid "The command that will be called"
+#: plugins/config/class_configInLdap.inc:374
+msgid "Available categories in the departments dropdown"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:442
+#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:410
 msgid "Hooks"
 msgstr "钩子"
 
-#: plugins/config/class_configInLdap.inc:449
-msgid "Display hook output"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:450
-msgid ""
-"When enabled successful hook execution output is displayed to the user using"
-" a dialog."
+#: plugins/config/class_configInLdap.inc:387
+msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available shells"
+#: plugins/config/class_configInLdap.inc:391
+msgid "Tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:455
-msgid "Available POSIX shells for FD users."
+#: plugins/config/class_configInLdap.inc:391
+msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Default shell"
-msgstr ""
+#: plugins/config/class_configInLdap.inc:396
+#: plugins/admin/acl/class_aclAssignment.inc:41
+msgid "Mode"
+msgstr "模式"
 
-#: plugins/config/class_configInLdap.inc:462
-msgid "Shell used by default when activating Unix tab."
+#: plugins/config/class_configInLdap.inc:396
+msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:466
-msgid "Show ACL tab on all objects"
+#: plugins/config/class_configInLdap.inc:403
+msgid "Command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:467
-msgid ""
-"For very specific ACL rights setting where you might need to give right on a"
-" single object."
+#: plugins/config/class_configInLdap.inc:403
+msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available department categories"
+#: plugins/config/class_configInLdap.inc:417
+msgid "Display hook output"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:472
-msgid "Available categories in the departments dropdown"
+#: plugins/config/class_configInLdap.inc:418
+msgid ""
+"When enabled successful hook execution output is displayed to the user using"
+" a dialog."
 msgstr ""
 
 #: plugins/config/class_pluginsConfigInLdap.inc:29
@@ -4001,9 +3645,8 @@ msgstr "部门"
 
 #: plugins/admin/departments/class_department.inc:63
 #: plugins/admin/users/user-list.xml:57
-#: plugins/admin/groups/class_ogroup.inc:191
+#: plugins/admin/groups/class_ogroup.inc:189
 #: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:57
 #: plugins/admin/acl/class_aclAssignment.inc:38
 #: plugins/admin/aclrole/class_aclRole.inc:95
 msgid "Properties"
@@ -4192,7 +3835,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_roleGeneric.inc:55
 #: plugins/admin/groups/class_roleGeneric.inc:59
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 #: plugins/admin/acl/class_aclAssignment.inc:47
 #: plugins/admin/aclrole/class_aclRole.inc:77
 msgid "Role"
@@ -4212,8 +3855,7 @@ msgid "Information"
 msgstr "提示信息"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
-#: plugins/admin/groups/class_ogroup.inc:195
-#: plugins/admin/groups/class_group.inc:61
+#: plugins/admin/groups/class_ogroup.inc:193
 msgid "Name of this group"
 msgstr ""
 
@@ -4237,164 +3879,156 @@ msgstr ""
 msgid "Add users for the role"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:32
+#: plugins/admin/groups/class_groupManagement.inc:34
 msgid "Manage groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:33
+#: plugins/admin/groups/class_groupManagement.inc:35
 msgid "Allows you to manage object groups, POSIX groups and roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:69
+#: plugins/admin/groups/class_groupManagement.inc:94
 msgid "Edit role properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_groupManagement.inc:85
+#: plugins/admin/groups/class_groupManagement.inc:110
 msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:128
+#: plugins/admin/groups/class_groupManagement.inc:153
 msgid "Show user groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:129
-#: include/select/groupSelect/group-filter.tpl.c:5
-msgid "Show primary groups"
-msgstr "显示主要组"
-
-#: plugins/admin/groups/class_groupManagement.inc:130
+#: plugins/admin/groups/class_groupManagement.inc:154
 msgid "Show organizational roles"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:131
+#: plugins/admin/groups/class_groupManagement.inc:155
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:132
+#: plugins/admin/groups/class_groupManagement.inc:156
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:135
+#: plugins/admin/groups/class_groupManagement.inc:159
+#: include/select/groupSelect/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr "显示主要组"
+
+#: plugins/admin/groups/class_groupManagement.inc:161
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:138
+#: plugins/admin/groups/class_groupManagement.inc:164
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "显示 samba 用户组"
 
-#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/groups/class_groupManagement.inc:168
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:147
+#: plugins/admin/groups/class_groupManagement.inc:174
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:148
+#: plugins/admin/groups/class_groupManagement.inc:175
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:149
+#: plugins/admin/groups/class_groupManagement.inc:176
 msgid "Show windows groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:150
+#: plugins/admin/groups/class_groupManagement.inc:177
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:151
+#: plugins/admin/groups/class_groupManagement.inc:178
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:152
+#: plugins/admin/groups/class_groupManagement.inc:179
 msgid "Show phone groups"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:63
+#: plugins/admin/groups/class_ogroup.inc:61
 #, php-format
 msgid "Unknown type : %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:67
+#: plugins/admin/groups/class_ogroup.inc:65
 #, php-format
 msgid "Non existing dn: %s"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:157
+#: plugins/admin/groups/class_ogroup.inc:155
 msgid "Object group"
 msgstr "对象组"
 
-#: plugins/admin/groups/class_ogroup.inc:158
+#: plugins/admin/groups/class_ogroup.inc:156
 msgid "Object group information"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:162
-#: plugins/admin/groups/class_ogroup.inc:163
-#: plugins/admin/groups/class_group.inc:34
+#: plugins/admin/groups/class_ogroup.inc:160
+#: plugins/admin/groups/class_ogroup.inc:161
 msgid "Group"
 msgstr "组"
 
-#: plugins/admin/groups/class_ogroup.inc:200
-#: plugins/admin/groups/class_group.inc:66
+#: plugins/admin/groups/class_ogroup.inc:198
 msgid "Short description of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:207
+#: plugins/admin/groups/class_ogroup.inc:205
 msgid "Member objects"
 msgstr "成员对象"
 
-#: plugins/admin/groups/class_ogroup.inc:210
+#: plugins/admin/groups/class_ogroup.inc:208
 msgid "Objects member of this group"
 msgstr ""
 
-#: plugins/admin/groups/class_ogroup.inc:228
-#: plugins/admin/groups/class_group.inc:102
-msgid "Only allow this group to connect to this list of hosts"
-msgstr ""
-
-#: plugins/admin/groups/class_ogroup.inc:319
-msgid ""
-"Putting both workstations and terminals in the same group is not allowed"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:215
+msgid "System trust"
+msgstr "信赖的系统"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "组列表"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Trust mode"
+msgstr "信赖模式"
 
-#: plugins/admin/groups/class_group.inc:35
-msgid "POSIX group information"
+#: plugins/admin/groups/class_ogroup.inc:219
+msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:38
-msgid "POSIX group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "disabled"
+msgstr "禁用"
 
-#: plugins/admin/groups/class_group.inc:39
-msgid "POSIX user group"
-msgstr ""
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "full access"
+msgstr "完全访问权限"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID"
-msgstr "强制 GID"
+#: plugins/admin/groups/class_ogroup.inc:223
+msgid "allow access to these hosts"
+msgstr "允许访问这些主机"
 
-#: plugins/admin/groups/class_group.inc:70
-msgid "Force GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:226
+msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:74
-msgid "GID value for this group"
+#: plugins/admin/groups/class_ogroup.inc:317
+msgid ""
+"Putting both workstations and terminals in the same group is not allowed"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:81
-#: plugins/admin/groups/class_group.inc:84
-msgid "Group members"
-msgstr "组成员"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "组列表"
 
 #: plugins/admin/acl/class_aclManagement.inc:31
 #: plugins/admin/acl/class_aclManagement.inc:32
@@ -4443,10 +4077,6 @@ msgstr ""
 msgid "Access control roles assignment dialog"
 msgstr ""
 
-#: plugins/admin/acl/class_aclAssignment.inc:41
-msgid "Mode"
-msgstr "模式"
-
 #: plugins/admin/acl/class_aclAssignment.inc:41
 msgid "Is this applying on complete subtree or only the base?"
 msgstr ""