Code

Updated objectclass condition
[gosa.git] / gosa-core / locale / core / messages.po
index d27f8d71f2f72105bab69671e50619ba1d07839e..e97164044ac301bcba4cd0e557a42f307dc4be1f 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-27 09:45+0100\n"
+"POT-Creation-Date: 2009-10-05 15:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
 
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
-#: ihtml/themes/default/msg_dialog.tpl:56
-#: ihtml/themes/default/msg_dialog.tpl:99
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
 #: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
 msgid "Information"
 msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
 msgid "Information"
 msgstr ""
@@ -32,28 +32,28 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
 msgid "Filters"
 msgstr ""
 
-#: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:54
-#: ihtml/themes/default/msg_dialog.tpl:97 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
+#: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
-#: html/index.php:63 html/index.php:416 html/index.php:422
-#: include/functions.inc:745 include/functions.inc:2193
-#: include/functions.inc:2197 include/functions.inc:2203
-#: include/class_tabs.inc:259 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/groups/remove.tpl:2
-#: plugins/admin/groups/class_groupGeneric.inc:1088
+#: html/index.php:63 html/index.php:413 html/index.php:419
+#: include/functions.inc:759 include/functions.inc:2188
+#: include/functions.inc:2192 include/functions.inc:2198
+#: include/class_tabs.inc:266 include/utils/class_xml.inc:37
+#: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/groups/class_groupGeneric.inc:1080
 #: plugins/admin/users/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:640
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
-#: plugins/personal/posix/class_posixAccount.inc:837
-#: plugins/personal/posix/class_posixAccount.inc:990
+#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:1014
 #: setup/class_setupStep_Migrate.inc:261 setup/class_setupStep_Migrate.inc:313
 #: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
 #: setup/class_setupStep_Migrate.inc:662 setup/class_setupStep_Migrate.inc:803
 #: setup/class_setupStep_Migrate.inc:261 setup/class_setupStep_Migrate.inc:313
 #: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
 #: setup/class_setupStep_Migrate.inc:662 setup/class_setupStep_Migrate.inc:803
-#: setup/class_setupStep_Migrate.inc:2565
-#: setup/class_setupStep_Migrate.inc:2718
-#: setup/class_setupStep_Migrate.inc:3050 setup/setup_checks.tpl:32
+#: setup/class_setupStep_Migrate.inc:2572
+#: setup/class_setupStep_Migrate.inc:2725
+#: setup/class_setupStep_Migrate.inc:3057 setup/setup_checks.tpl:32
 #: setup/setup_checks.tpl:93
 msgid "Warning"
 msgstr ""
 #: setup/setup_checks.tpl:93
 msgid "Warning"
 msgstr ""
@@ -74,9 +74,9 @@ msgstr ""
 #: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
-#: ihtml/themes/default/msg_dialog.tpl:74
-#: ihtml/themes/default/msg_dialog.tpl:127
-#: ihtml/themes/default/msg_dialog.tpl:130
+#: ihtml/themes/default/msg_dialog.tpl:79
+#: ihtml/themes/default/msg_dialog.tpl:136
+#: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/islocked.tpl:19 include/class_baseSelectDialog.inc:62
 #: include/utils/class_msgPool.inc:308 setup/setup_migrate.tpl:163
 #: setup/setup_migrate.tpl:214 setup/setup_migrate.tpl:261
 #: ihtml/themes/default/islocked.tpl:19 include/class_baseSelectDialog.inc:62
 #: include/utils/class_msgPool.inc:308 setup/setup_migrate.tpl:163
 #: setup/setup_migrate.tpl:214 setup/setup_migrate.tpl:261
@@ -104,15 +104,15 @@ msgstr ""
 
 #: ihtml/themes/default/login.tpl:42 ihtml/themes/default/login.tpl:44
 #: ihtml/themes/default/password.tpl:69 ihtml/themes/default/password.tpl:71
 
 #: ihtml/themes/default/login.tpl:42 ihtml/themes/default/login.tpl:44
 #: ihtml/themes/default/password.tpl:69 ihtml/themes/default/password.tpl:71
-#: plugins/admin/users/class_divListUsers.inc:80
+#: plugins/admin/users/class_divListUsers.inc:81
 msgid "Username"
 msgstr ""
 
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:20
 msgid "Username"
 msgstr ""
 
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:20
-#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:236
+#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr ""
 
 msgid "Password"
 msgstr ""
 
@@ -192,7 +192,6 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
 msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
-#: plugins/personal/generic/generic.tpl:137
 #, php-format
 msgid "Set"
 msgstr ""
 #, php-format
 msgid "Set"
 msgstr ""
@@ -242,7 +241,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1050
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
 msgid "Members"
 msgstr ""
 
 msgid "Members"
 msgstr ""
 
@@ -275,7 +274,7 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:13
-#: plugins/admin/users/class_userManagement.inc:265
+#: plugins/admin/users/class_userManagement.inc:274
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -288,8 +287,9 @@ msgid "Verify password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:51
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: plugins/admin/users/class_divListUsers.inc:136
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/user-list.xml:107 plugins/admin/users/user-list.xml:193
 msgid "Change password"
 msgstr ""
 
 msgid "Change password"
 msgstr ""
 
@@ -332,9 +332,9 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:747
-#: include/class_acl.inc:754 include/class_acl.inc:761
-#: include/class_acl.inc:767 include/utils/class_msgPool.inc:463
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
+#: include/class_acl.inc:778 include/class_acl.inc:785
+#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
 #: plugins/admin/departments/class_departmentGeneric.inc:574
 msgid "Object"
 msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:574
 msgid "Object"
 msgstr ""
@@ -379,17 +379,22 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
 msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/default/msg_dialog.tpl:52
-#: ihtml/themes/default/msg_dialog.tpl:95 html/index.php:223
-#: html/index.php:227 include/password-methods/class_password-methods.inc:250
-#: include/class_tabs.inc:50 include/class_plugin.inc:659
-#: include/class_plugin.inc:700 include/class_plugin.inc:742
-#: include/class_plugin.inc:1612 include/utils/class_msgPool.inc:153
+#: ihtml/themes/default/msg_dialog.tpl:57
+#: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
+#: html/index.php:228 include/password-methods/class_password-methods.inc:250
+#: include/functions.inc:2843 include/functions.inc:2857
+#: include/functions.inc:2887 include/functions.inc:2895
+#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:2926 include/functions.inc:2935
+#: include/functions.inc:2994 include/class_tabs.inc:54
+#: include/class_plugin.inc:661 include/class_plugin.inc:702
+#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
-#: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_gosaSupportDaemon.inc:1160
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
+#: include/utils/class_msgPool.inc:493 include/class_log.inc:138
+#: include/class_log.inc:219 include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1194
 #: include/class_CopyPasteHandler.inc:117
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:117
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
@@ -398,38 +403,40 @@ msgstr ""
 #: include/class_CopyPasteHandler.inc:192
 #: include/class_CopyPasteHandler.inc:268
 #: include/class_CopyPasteHandler.inc:367 include/class_msg_dialog.inc:99
 #: include/class_CopyPasteHandler.inc:192
 #: include/class_CopyPasteHandler.inc:268
 #: include/class_CopyPasteHandler.inc:367 include/class_msg_dialog.inc:99
-#: plugins/admin/groups/class_groupGeneric.inc:627
-#: plugins/admin/groups/class_groupGeneric.inc:633
-#: plugins/admin/groups/class_groupGeneric.inc:981
-#: plugins/admin/groups/class_groupGeneric.inc:986
-#: plugins/admin/groups/class_groupGeneric.inc:1247
-#: plugins/personal/generic/class_user.inc:412
-#: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:806
-#: plugins/personal/generic/class_user.inc:1382
+#: plugins/admin/groups/class_groupGeneric.inc:617
+#: plugins/admin/groups/class_groupGeneric.inc:623
+#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:784
+#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1429
 #: plugins/personal/generic/main.inc:115
 #: plugins/personal/generic/main.inc:115
-#: plugins/personal/posix/class_posixAccount.inc:1382
-#: setup/class_setupStep_Migrate.inc:1197 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
 msgid "Error"
 msgstr ""
 
 #: setup/setup_checks.tpl:91
 #, php-format
 msgid "Error"
 msgstr ""
 
-#: ihtml/themes/default/msg_dialog.tpl:71
-#: ihtml/themes/default/msg_dialog.tpl:73
-#: ihtml/themes/default/msg_dialog.tpl:124
-#: ihtml/themes/default/msg_dialog.tpl:126
-#: ihtml/themes/default/msg_dialog.tpl:129 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:76
+#: ihtml/themes/default/msg_dialog.tpl:78
+#: ihtml/themes/default/msg_dialog.tpl:133
+#: ihtml/themes/default/msg_dialog.tpl:135
+#: ihtml/themes/default/msg_dialog.tpl:138 include/utils/class_msgPool.inc:314
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
 #: setup/class_setupStep_Migrate.inc:658 setup/class_setupStep_Migrate.inc:799
 #: setup/class_setupStep_Migrate.inc:1045
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
 #: setup/class_setupStep_Migrate.inc:658 setup/class_setupStep_Migrate.inc:799
 #: setup/class_setupStep_Migrate.inc:1045
-#: setup/class_setupStep_Migrate.inc:2007
-#: setup/class_setupStep_Migrate.inc:2149
-#: setup/class_setupStep_Migrate.inc:2571
-#: setup/class_setupStep_Migrate.inc:2725
-#: setup/class_setupStep_Migrate.inc:3055 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:2012
+#: setup/class_setupStep_Migrate.inc:2156
+#: setup/class_setupStep_Migrate.inc:2578
+#: setup/class_setupStep_Migrate.inc:2732
+#: setup/class_setupStep_Migrate.inc:3062 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87
 #, php-format
 msgid "Ok"
 #: setup/setup_checks.tpl:87
 #, php-format
 msgid "Ok"
@@ -447,9 +454,9 @@ msgstr ""
 msgid "Your password has been changed successfully."
 msgstr ""
 
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:41 html/main.php:329
-#: plugins/admin/users/class_userManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:379
+#: ihtml/themes/default/password.tpl:41 html/main.php:339
+#: plugins/admin/users/class_userManagement.inc:325
+#: plugins/admin/users/class_userManagement.inc:388
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -552,7 +559,7 @@ msgstr ""
 
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
-#: include/class_pluglist.inc:203
+#: include/class_pluglist.inc:207
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -578,41 +585,44 @@ msgstr ""
 msgid "GOsa main menu"
 msgstr ""
 
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:336
+#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_departmentGeneric.inc:386
 msgid "Fatal error"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:386
 msgid "Fatal error"
 msgstr ""
 
-#: html/password.php:58 html/index.php:143
+#: html/password.php:58 html/index.php:144
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/password.php:74 html/index.php:143 html/index.php:215
+#: html/password.php:74 html/index.php:144 html/index.php:216
 #: html/main.php:228
 #: include/password-methods/class_password-methods-ssha.inc:51
 #: include/password-methods/class_password-methods-sha.inc:48
 #: html/main.php:228
 #: include/password-methods/class_password-methods-ssha.inc:51
 #: include/password-methods/class_password-methods-sha.inc:48
-#: include/functions.inc:637 include/functions.inc:2556
-#: include/functions.inc:2580 include/functions.inc:2593
-#: include/class_plugin.inc:1330 include/class_plugin.inc:1343
-#: include/class_plugin.inc:1361 include/utils/class_timezone.inc:47
-#: include/class_config.inc:124 include/class_config.inc:628
-#: include/class_pluglist.inc:177 include/class_CopyPasteHandler.inc:118
+#: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:651
+#: include/functions.inc:2550 include/functions.inc:2574
+#: include/functions.inc:2587 include/utils/class_timezone.inc:47
+#: include/class_config.inc:123 include/class_config.inc:636
+#: include/class_config.inc:1021 include/class_config.inc:1034
+#: include/class_config.inc:1052 include/class_pluglist.inc:177
+#: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:185
 #: include/class_CopyPasteHandler.inc:193
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:185
 #: include/class_CopyPasteHandler.inc:193
-#: plugins/admin/groups/class_groupGeneric.inc:163
-#: plugins/admin/groups/class_groupGeneric.inc:755
+#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
 msgstr ""
 
 msgid "Configuration error"
 msgstr ""
 
-#: html/password.php:74 html/index.php:164 html/setup.php:66
+#: html/password.php:74 html/index.php:165 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:603
+#: html/password.php:159 plugins/personal/generic/class_user.inc:566
 msgid "Password method"
 msgstr ""
 
 msgid "Password method"
 msgstr ""
 
@@ -620,7 +630,7 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:260
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -637,16 +647,16 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: plugins/personal/generic/class_user.inc:1225
-#: plugins/personal/generic/class_user.inc:1238
-#: plugins/personal/generic/class_user.inc:1252
-#: plugins/personal/generic/class_user.inc:1254
+#: plugins/personal/generic/class_user.inc:1267
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/class_user.inc:1296
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr ""
 
-#: html/password.php:224 html/index.php:324
+#: html/password.php:224 html/index.php:321
 msgid "Please check the username/password combination."
 msgstr ""
 
 msgid "Please check the username/password combination."
 msgstr ""
 
@@ -658,11 +668,11 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/password.php:280 html/index.php:416
+#: html/password.php:280 html/index.php:413
 msgid "Session will not be encrypted."
 msgstr ""
 
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/password.php:280 html/index.php:416
+#: html/password.php:280 html/index.php:413
 msgid "Enter SSL session"
 msgstr ""
 
 msgid "Enter SSL session"
 msgstr ""
 
@@ -676,38 +686,39 @@ msgid ""
 "ini settings."
 msgstr ""
 
 "ini settings."
 msgstr ""
 
-#: html/index.php:164
+#: html/index.php:165
 msgid "Smarty error"
 msgstr ""
 
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:216
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:223
+#: html/index.php:224
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:227
+#: html/index.php:228
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:253 html/index.php:268 html/index.php:281
-#: include/class_acl.inc:1193 include/class_MultiSelectWindow.inc:550
-#: include/functions.inc:364 include/functions.inc:390
-#: include/functions.inc:398 include/functions.inc:427
-#: include/functions.inc:652 include/functions.inc:695
-#: include/functions.inc:737 include/functions.inc:782
-#: include/functions.inc:2535 include/functions.inc:2782
-#: include/class_plugin.inc:1243 include/class_plugin.inc:1292
-#: include/class_plugin.inc:1296 include/class_plugin.inc:1311
-#: include/class_plugin.inc:1398 include/class_plugin.inc:1456
-#: include/class_plugin.inc:1522 include/class_plugin.inc:1537
-#: include/class_ldap.inc:708 include/class_ldap.inc:1174
-#: include/class_config.inc:258 plugins/admin/ogroups/class_ogroup.inc:1033
+#: html/index.php:254 html/index.php:265 html/index.php:278
+#: include/class_SnapshotHandler.inc:124 include/class_acl.inc:1219
+#: include/class_MultiSelectWindow.inc:553 include/functions.inc:365
+#: include/functions.inc:391 include/functions.inc:399
+#: include/functions.inc:434 include/functions.inc:666
+#: include/functions.inc:709 include/functions.inc:751
+#: include/functions.inc:796 include/functions.inc:2529
+#: include/functions.inc:2770 include/class_plugin.inc:1280
+#: include/class_plugin.inc:1329 include/class_plugin.inc:1333
+#: include/class_plugin.inc:1348 include/class_plugin.inc:1385
+#: include/class_plugin.inc:1443 include/class_plugin.inc:1509
+#: include/class_plugin.inc:1524 include/class_ldap.inc:725
+#: include/class_ldap.inc:1191 include/class_config.inc:270
+#: plugins/admin/ogroups/class_ogroup.inc:1033
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/ogroups/class_ogroup.inc:1047
-#: plugins/admin/groups/class_groupGeneric.inc:785
-#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:1104
 #: plugins/admin/departments/class_departmentGeneric.inc:241
 #: plugins/admin/departments/class_departmentGeneric.inc:429
 #: plugins/admin/departments/class_departmentGeneric.inc:702
 #: plugins/admin/departments/class_departmentGeneric.inc:241
 #: plugins/admin/departments/class_departmentGeneric.inc:429
 #: plugins/admin/departments/class_departmentGeneric.inc:702
@@ -715,54 +726,54 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:633
 #: plugins/admin/acl/class_aclRole.inc:673
 #: plugins/admin/acl/class_aclRole.inc:687
 #: plugins/admin/acl/class_aclRole.inc:633
 #: plugins/admin/acl/class_aclRole.inc:673
 #: plugins/admin/acl/class_aclRole.inc:687
-#: plugins/personal/generic/class_user.inc:722
-#: plugins/personal/generic/class_user.inc:1084
-#: plugins/personal/posix/class_posixAccount.inc:678
-#: plugins/personal/posix/class_posixAccount.inc:1007
-#: setup/class_setupStep_Migrate.inc:1208
-#: setup/class_setupStep_Migrate.inc:1236
-#: setup/class_setupStep_Migrate.inc:1285
-#: setup/class_setupStep_Migrate.inc:1334
-#: setup/class_setupStep_Migrate.inc:2137
-#: setup/class_setupStep_Migrate.inc:2432
-#: setup/class_setupStep_Migrate.inc:2436
-#: setup/class_setupStep_Migrate.inc:2626
-#: setup/class_setupStep_Migrate.inc:2646
-#: setup/class_setupStep_Migrate.inc:2763
-#: setup/class_setupStep_Migrate.inc:3110
-#: setup/class_setupStep_Migrate.inc:3124
+#: plugins/personal/generic/class_user.inc:687
+#: plugins/personal/generic/class_user.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:699
+#: plugins/personal/posix/class_posixAccount.inc:1031
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1239
+#: setup/class_setupStep_Migrate.inc:1288
+#: setup/class_setupStep_Migrate.inc:1337
+#: setup/class_setupStep_Migrate.inc:2142
+#: setup/class_setupStep_Migrate.inc:2439
+#: setup/class_setupStep_Migrate.inc:2443
+#: setup/class_setupStep_Migrate.inc:2633
+#: setup/class_setupStep_Migrate.inc:2653
+#: setup/class_setupStep_Migrate.inc:2770
+#: setup/class_setupStep_Migrate.inc:3117
+#: setup/class_setupStep_Migrate.inc:3131
 msgid "LDAP error"
 msgstr ""
 
 msgid "LDAP error"
 msgstr ""
 
-#: html/index.php:268
+#: html/index.php:265
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:278
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:302
+#: html/index.php:299
 msgid "Please specify a valid username!"
 msgstr ""
 
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:302
 msgid "Please specify your password!"
 msgstr ""
 
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:317
+#: html/index.php:314
 msgid "Authentication error"
 msgstr ""
 
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:317
+#: html/index.php:314
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:371
+#: html/index.php:368
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:422
+#: html/index.php:419
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -791,28 +802,28 @@ msgstr ""
 msgid "Running out of memory!"
 msgstr ""
 
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:284
+#: html/main.php:285
 msgid "User ACL checks disabled"
 msgstr ""
 
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:329
+#: html/main.php:339
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:339
+#: html/main.php:349
 msgid "Plugin"
 msgstr ""
 
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:340
+#: html/main.php:350
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:354
+#: html/main.php:364
 msgid "Configuration Error"
 msgstr ""
 
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:355
+#: html/main.php:365
 #, php-format
 msgid ""
 "FATAL: not all POST variables have been transfered by PHP - please inform "
 #, php-format
 msgid ""
 "FATAL: not all POST variables have been transfered by PHP - please inform "
@@ -858,6 +869,21 @@ msgstr ""
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
+#: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
+#: include/class_config.inc:1022 include/class_config.inc:1053
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable '%s' is not "
+"set."
+msgstr ""
+
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required compression module "
+"is missing. Please install '%s'."
+msgstr ""
+
 #: include/class_acl.inc:26
 msgid "Access control"
 msgstr ""
 #: include/class_acl.inc:26
 msgid "Access control"
 msgstr ""
@@ -866,69 +892,73 @@ msgstr ""
 msgid "Manage access control lists"
 msgstr ""
 
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:201 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
 msgid "All categories"
 msgstr ""
 
 msgid "All categories"
 msgstr ""
 
-#: include/class_acl.inc:209
+#: include/class_acl.inc:220
 msgid "Reset ACLs"
 msgstr ""
 
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:210 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
 msgid "One level"
 msgstr ""
 
 msgid "One level"
 msgstr ""
 
-#: include/class_acl.inc:211 include/class_acl.inc:216
+#: include/class_acl.inc:222 include/class_acl.inc:227
 #: plugins/admin/acl/class_aclRole.inc:133
 msgid "Current object"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:133
 msgid "Current object"
 msgstr ""
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
 msgid "Complete subtree"
 msgstr ""
 
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree (permanent)"
 msgstr ""
 
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:214 include/class_acl.inc:217
+#: include/class_acl.inc:225 include/class_acl.inc:228
 msgid "Use ACL defined in role"
 msgstr ""
 
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1549
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/users/user-list.xml:15
+#: plugins/personal/generic/class_user.inc:1596
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1301
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr ""
 
-#: include/class_acl.inc:482 include/class_MultiSelectWindow.inc:258
+#: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260
 #: include/class_MultiSelectWindow.inc:260
-#: include/class_baseSelectDialog.inc:49
+#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:234
+#: include/class_listing.inc:914 include/class_listing.inc:916
 #: plugins/admin/acl/class_aclRole.inc:392
 msgid "Up"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:392
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:484 plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:234
+#: plugins/admin/acl/class_aclRole.inc:394
 msgid "Down"
 msgstr ""
 
 msgid "Down"
 msgstr ""
 
-#: include/class_acl.inc:489 include/class_acl.inc:537
+#: include/class_acl.inc:500 include/class_acl.inc:548
 #: plugins/admin/groups/class_divListGroup.inc:139
 #: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:134
+#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/users/user-list.xml:100
 #: plugins/admin/acl/class_aclRole.inc:397
 #: plugins/admin/acl/class_aclRole.inc:446
 msgid "Edit"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:397
 #: plugins/admin/acl/class_aclRole.inc:446
 msgid "Edit"
 msgstr ""
 
-#: include/class_acl.inc:489 include/class_acl.inc:493
-#: include/class_acl.inc:1225 include/class_acl.inc:1226
-#: include/class_acl.inc:1231 include/class_tabs.inc:391
+#: include/class_acl.inc:500 include/class_acl.inc:504
+#: include/class_acl.inc:1251 include/class_acl.inc:1252
+#: include/class_acl.inc:1257 include/class_tabs.inc:399
 #: plugins/admin/acl/class_aclManagement.inc:26
 #: plugins/admin/acl/class_aclManagement.inc:293
 #: plugins/admin/acl/class_divListACL.inc:179
 #: plugins/admin/acl/class_aclManagement.inc:26
 #: plugins/admin/acl/class_aclManagement.inc:293
 #: plugins/admin/acl/class_divListACL.inc:179
@@ -938,114 +968,118 @@ msgstr ""
 msgid "ACL"
 msgstr ""
 
 msgid "ACL"
 msgstr ""
 
-#: include/class_acl.inc:493 include/class_acl.inc:541
+#: include/class_acl.inc:504 include/class_acl.inc:552
 #: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
 #: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Delete"
 msgstr ""
 
 #: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
 #: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_acl.inc:529
+#: include/class_acl.inc:540
 msgid "No ACL settings for this category!"
 msgstr ""
 
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:531
+#: include/class_acl.inc:542
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:537 include/class_acl.inc:541
+#: include/class_acl.inc:548 include/class_acl.inc:552
 msgid "category ACL"
 msgstr ""
 
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:591
+#: include/class_acl.inc:602
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:601 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
 msgid "All objects in current subtree"
 msgstr ""
 
 msgid "All objects in current subtree"
 msgstr ""
 
-#: include/class_acl.inc:749 include/class_acl.inc:756
+#: include/class_acl.inc:773 include/class_acl.inc:780
 msgid "Show/hide advanced settings"
 msgstr ""
 
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:797
 msgid "Create objects"
 msgstr ""
 
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:774
+#: include/class_acl.inc:798
 msgid "Move objects"
 msgstr ""
 
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:775
+#: include/class_acl.inc:799
 msgid "Remove objects"
 msgstr ""
 
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:777
+#: include/class_acl.inc:801
 msgid "Grant permission to owner"
 msgstr ""
 
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:781 include/class_acl.inc:884
-#: include/class_acl.inc:888
+#: include/class_acl.inc:805 include/class_acl.inc:910
+#: include/class_acl.inc:914
 msgid "read"
 msgstr ""
 
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:782 include/class_acl.inc:886
-#: include/class_acl.inc:889
+#: include/class_acl.inc:806 include/class_acl.inc:912
+#: include/class_acl.inc:915
 msgid "write"
 msgstr ""
 
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:786
+#: include/class_acl.inc:810
 msgid "Complete object"
 msgstr ""
 
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:928 include/class_session.inc:76
+#: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:467 include/functions.inc:627
-#: include/functions.inc:724 include/functions.inc:1107
-#: include/functions.inc:1918 include/functions.inc:1952
-#: include/functions.inc:1972 include/class_ldap.inc:648
-#: include/class_ldap.inc:696 include/class_log.inc:88
+#: include/functions.inc:474 include/functions.inc:641
+#: include/functions.inc:738 include/functions.inc:1121
+#: include/functions.inc:1946 include/functions.inc:1980
+#: include/functions.inc:2000 include/class_ldap.inc:665
+#: include/class_ldap.inc:713 include/class_log.inc:88
 #: include/class_CopyPasteHandler.inc:159
 #: include/class_CopyPasteHandler.inc:269
 msgid "Internal error"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
 #: include/class_CopyPasteHandler.inc:269
 msgid "Internal error"
 msgstr ""
 
-#: include/class_acl.inc:928
+#: include/class_acl.inc:954
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:971
+#: include/class_acl.inc:997
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1031 include/class_acl.inc:1033
+#: include/class_acl.inc:1057 include/class_acl.inc:1059
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1033
+#: include/class_acl.inc:1059
 msgid "unknown role"
 msgstr ""
 
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1041
+#: include/class_acl.inc:1067
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1056
-msgid "ACL takes effect for all users"
+#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+msgid "inactive"
+msgstr ""
+
+#: include/class_acl.inc:1082
+msgid "No members"
 msgstr ""
 
 msgstr ""
 
-#: include/class_acl.inc:1226
+#: include/class_acl.inc:1252
 msgid "Access control list"
 msgstr ""
 
 msgid "Access control list"
 msgstr ""
 
-#: include/class_acl.inc:1231
+#: include/class_acl.inc:1257
 msgid "ACL roles"
 msgstr ""
 
 msgid "ACL roles"
 msgstr ""
 
@@ -1055,48 +1089,51 @@ msgid "Close"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:250
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47
+#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
 msgid "Go to root department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:250
 #: include/class_MultiSelectWindow.inc:252
 msgid "Go to root department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:250
 #: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47
+#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_listing.inc:908
 msgid "Root"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:258
 msgid "Root"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49
+#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
 msgid "Go up one department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:266
 msgid "Go up one department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51
+#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
 msgid "Go to users department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:266
 #: include/class_MultiSelectWindow.inc:268
 msgid "Go to users department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:266
 #: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51
+#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_listing.inc:924
 msgid "Home"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:273
 msgid "Home"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52
+#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
 msgid "Reload list"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:273
 msgid "Reload list"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52
+#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
 #: plugins/admin/ogroups/class_divListOGroup.inc:148
 #: plugins/admin/groups/class_divListGroup.inc:122
 #: plugins/admin/ogroups/class_divListOGroup.inc:148
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/users/class_divListUsers.inc:120
+#: plugins/admin/users/user-list.tpl:13
 #: plugins/admin/departments/class_divListDepartment.inc:87
 #: plugins/admin/acl/class_divListACL.inc:104
 msgid "Submit"
 msgstr ""
 
 #: plugins/admin/departments/class_divListDepartment.inc:87
 #: plugins/admin/acl/class_divListACL.inc:104
 msgid "Submit"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:550
+#: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
@@ -1122,26 +1159,29 @@ msgstr ""
 
 #: include/class_baseSelectDialog.inc:65
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
 
 #: include/class_baseSelectDialog.inc:65
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1130
+#: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_divListGroup.inc:121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/groups/class_groupGeneric.inc:1306
-#: plugins/admin/users/class_divListUsers.inc:113
+#: plugins/admin/groups/class_groupGeneric.inc:1261
+#: plugins/admin/users/class_divListUsers.inc:118
+#: plugins/admin/users/user-list.tpl:13
 #: plugins/admin/departments/class_departmentGeneric.inc:621
 #: plugins/admin/departments/locality.tpl:28
 #: plugins/admin/departments/generic.tpl:39
 #: plugins/admin/departments/class_departmentGeneric.inc:621
 #: plugins/admin/departments/locality.tpl:28
 #: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
 #: plugins/admin/departments/class_divListDepartment.inc:85
 #: plugins/admin/departments/class_localityGeneric.inc:89
 #: plugins/admin/departments/class_organizationGeneric.inc:121
 #: plugins/admin/departments/class_countryGeneric.inc:89
 #: plugins/admin/departments/class_dcObject.inc:88
 #: plugins/admin/departments/class_divListDepartment.inc:85
 #: plugins/admin/departments/class_localityGeneric.inc:89
 #: plugins/admin/departments/class_organizationGeneric.inc:121
 #: plugins/admin/departments/class_countryGeneric.inc:89
 #: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/class_divListACL.inc:102
 #: plugins/admin/acl/class_aclRole.inc:751 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/class_divListACL.inc:102
 #: plugins/admin/acl/class_aclRole.inc:751 plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1563
-#: plugins/personal/generic/generic.tpl:170
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr ""
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr ""
@@ -1150,252 +1190,345 @@ msgstr ""
 msgid "Filter entries with this syntax"
 msgstr ""
 
 msgid "Filter entries with this syntax"
 msgstr ""
 
-#: include/functions.inc:120
+#: include/class_listing.inc:281
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/groups/class_divListGroup.inc:73
+#: plugins/admin/users/class_divListUsers.inc:75
+#: plugins/admin/departments/class_divListDepartment.inc:59
+#: plugins/admin/acl/class_divListACL.inc:67 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr ""
+
+#: include/class_listing.inc:470
+msgid "created by"
+msgstr ""
+
+#: include/class_listing.inc:1259 include/class_listing.inc:1309
+#: include/class_plugin.inc:2071
+msgid "Copy"
+msgstr ""
+
+#: include/class_listing.inc:1265 include/class_listing.inc:1299
+#: include/class_plugin.inc:2075
+msgid "Cut"
+msgstr ""
+
+#: include/class_listing.inc:1273 include/class_listing.inc:1275
+#: include/class_plugin.inc:2082 include/class_plugin.inc:2085
+#: include/class_CopyPasteHandler.inc:506
+msgid "Paste"
+msgstr ""
+
+#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+msgid "Cut this entry"
+msgstr ""
+
+#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+msgid "Copy this entry"
+msgstr ""
+
+#: include/class_listing.inc:1341 include/class_listing.inc:1343
+msgid "Restore snapshots"
+msgstr ""
+
+#: include/class_listing.inc:1357
+msgid "Export list"
+msgstr ""
+
+#: include/class_listing.inc:1392 include/class_listing.inc:1393
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+msgid "Restore snapshot"
+msgstr ""
+
+#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+msgid "Create a new snapshot from this object"
+msgstr ""
+
+#: include/functions.inc:121
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:127
+#: include/functions.inc:128
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:337
+#: include/functions.inc:338
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:398
+#: include/functions.inc:399
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:467
+#: include/functions.inc:474
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:627 include/functions.inc:724
+#: include/functions.inc:641 include/functions.inc:738
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:637
+#: include/functions.inc:651
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:637
+#: include/functions.inc:651
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:745
+#: include/functions.inc:759
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1035
+#: include/functions.inc:1049
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1037
+#: include/functions.inc:1051
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr ""
 
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1054
+#: include/functions.inc:1068
 msgid "incomplete"
 msgstr ""
 
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1336
+#: include/functions.inc:1361
 msgid "Continue anyway"
 msgstr ""
 
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1338
+#: include/functions.inc:1363
 msgid "Edit anyway"
 msgstr ""
 
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1340
+#: include/functions.inc:1365
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1524
+#: include/functions.inc:1549
 msgid "Entries per page"
 msgstr ""
 
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1552
+#: include/functions.inc:1577 include/class_filter.inc:302
 msgid "Apply filter"
 msgstr ""
 
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1795
+#: include/functions.inc:1823 include/class_filter.inc:268
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1839
+#: include/functions.inc:1867
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1918
+#: include/functions.inc:1946
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1952 include/functions.inc:1972
+#: include/functions.inc:1980 include/functions.inc:2000
 msgid "Cannot write to revision file!"
 msgstr ""
 
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2193 include/functions.inc:2197
-#: include/functions.inc:2203
+#: include/functions.inc:2188 include/functions.inc:2192
+#: include/functions.inc:2198
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2225
+#: include/functions.inc:2220
 msgid "LDAP warning"
 msgstr ""
 
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2225
+#: include/functions.inc:2220
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2251
+#: include/functions.inc:2246
 msgid "Used to store account specific informations."
 msgstr ""
 
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2258
+#: include/functions.inc:2253
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2301
+#: include/functions.inc:2298
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2303
+#: include/functions.inc:2301
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2306
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2311
-#, php-format
-msgid "Version mismatch for optional object class '%s' (!=%s)!"
-msgstr ""
-
-#: include/functions.inc:2315
+#: include/functions.inc:2309
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2331
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2338
+#: include/functions.inc:2332
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2342
+#: include/functions.inc:2336
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2343
+#: include/functions.inc:2337
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2367
+#: include/functions.inc:2361
 msgid "German"
 msgstr ""
 
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2368
+#: include/functions.inc:2362
 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2369
+#: include/functions.inc:2363
 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2370
+#: include/functions.inc:2364
 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2371
+#: include/functions.inc:2365
 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2372
+#: include/functions.inc:2366
 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2373
+#: include/functions.inc:2367
 msgid "Polish"
 msgstr ""
 
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2375
+#: include/functions.inc:2369
 msgid "Chinese"
 msgstr ""
 
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2376
+#: include/functions.inc:2370
 msgid "Vietnamese"
 msgstr ""
 
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2377
+#: include/functions.inc:2371
 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:2555
+#: include/functions.inc:2549
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2580
+#: include/functions.inc:2574
 msgid "Cannot generate samba hash!"
 msgstr ""
 
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2593
+#: include/functions.inc:2587
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/class_tabs.inc:51
+#: include/functions.inc:2843 include/functions.inc:2857
+#: include/functions.inc:2895 include/functions.inc:2907
+#: include/functions.inc:2911 include/functions.inc:2926
+#: include/functions.inc:2935
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: include/functions.inc:2843
+msgid "unknown idAllocation method!"
+msgstr ""
+
+#: include/functions.inc:2857
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: include/functions.inc:2887
+msgid "Cannot create sambaUnixIdPool entry!"
+msgstr ""
+
+#: include/functions.inc:2895
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: include/functions.inc:2907 include/functions.inc:2911
+msgid "no ID available!"
+msgstr ""
+
+#: include/functions.inc:2935
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: include/functions.inc:2994
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: include/class_tabs.inc:55
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr ""
 
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:259
+#: include/class_tabs.inc:266
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:394
+#: include/class_tabs.inc:404
 msgid "References"
 msgstr ""
 
 msgid "References"
 msgstr ""
 
@@ -1404,10 +1537,6 @@ msgstr ""
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2013
-msgid "Restore snapshot"
-msgstr ""
-
 #: include/class_SnapShotDialog.inc:145
 msgid "Remove snapshot"
 msgstr ""
 #: include/class_SnapShotDialog.inc:145
 msgid "Remove snapshot"
 msgstr ""
@@ -1418,13 +1547,15 @@ msgstr ""
 
 #: include/class_SnapShotDialog.inc:179
 #: plugins/generic/references/contents.tpl:11
 
 #: include/class_SnapShotDialog.inc:179
 #: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/class_ogroup.inc:1131
+#: plugins/admin/ogroups/class_ogroup.inc:1122
 #: plugins/admin/ogroups/generic.tpl:15 plugins/admin/groups/generic.tpl:24
 #: plugins/admin/ogroups/generic.tpl:15 plugins/admin/groups/generic.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:1305
+#: plugins/admin/groups/class_groupGeneric.inc:1260
 #: plugins/admin/departments/class_departmentGeneric.inc:317
 #: plugins/admin/departments/class_departmentGeneric.inc:619
 #: plugins/admin/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_departmentGeneric.inc:317
 #: plugins/admin/departments/class_departmentGeneric.inc:619
 #: plugins/admin/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
 #: plugins/admin/departments/class_localityGeneric.inc:60
 #: plugins/admin/departments/class_localityGeneric.inc:88
 #: plugins/admin/departments/class_organizationGeneric.inc:91
 #: plugins/admin/departments/class_localityGeneric.inc:60
 #: plugins/admin/departments/class_localityGeneric.inc:88
 #: plugins/admin/departments/class_organizationGeneric.inc:91
@@ -1433,6 +1564,7 @@ msgstr ""
 #: plugins/admin/departments/class_countryGeneric.inc:88
 #: plugins/admin/departments/class_dcObject.inc:59
 #: plugins/admin/departments/class_dcObject.inc:87
 #: plugins/admin/departments/class_countryGeneric.inc:88
 #: plugins/admin/departments/class_dcObject.inc:59
 #: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/organization.tpl:19
@@ -1440,6 +1572,22 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
 msgid "Description"
 msgstr ""
 
+#: include/exporter/class_cvsExporter.inc:48
+msgid "CSV"
+msgstr ""
+
+#: include/exporter/class_PDF.inc:24
+msgid "Page"
+msgstr ""
+
+#: include/exporter/class_pdfExporter.inc:18
+msgid "No PDF export possible: there is no FPDF library installed."
+msgstr ""
+
+#: include/exporter/class_pdfExporter.inc:145
+msgid "PDF"
+msgstr ""
+
 #: include/class_multi_plug.inc:362
 msgid "You are currently editing mutliple entries."
 msgstr ""
 #: include/class_multi_plug.inc:362
 msgid "You are currently editing mutliple entries."
 msgstr ""
@@ -1468,158 +1616,121 @@ msgstr ""
 msgid "No valid certificate loaded!"
 msgstr ""
 
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/php_setup.inc:93
+#: include/php_setup.inc:100
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:98
+#: include/php_setup.inc:105
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:98
+#: include/php_setup.inc:105
 msgid "Send bugreport"
 msgstr ""
 
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:103
+#: include/php_setup.inc:110
 msgid "Toggle information"
 msgstr ""
 
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:113
+#: include/php_setup.inc:120
 msgid "PHP error"
 msgstr ""
 
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:132
+#: include/php_setup.inc:139
 msgid "class"
 msgstr ""
 
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:138
+#: include/php_setup.inc:145
 msgid "function"
 msgstr ""
 
 msgid "function"
 msgstr ""
 
-#: include/php_setup.inc:143
+#: include/php_setup.inc:150
 msgid "static"
 msgstr ""
 
 msgid "static"
 msgstr ""
 
-#: include/php_setup.inc:147
+#: include/php_setup.inc:154
 msgid "method"
 msgstr ""
 
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:187
 msgid "Trace"
 msgstr ""
 
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:181
+#: include/php_setup.inc:188
 msgid "File"
 msgstr ""
 
 msgid "File"
 msgstr ""
 
-#: include/php_setup.inc:181
+#: include/php_setup.inc:188
 msgid "Line"
 msgstr ""
 
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:181
+#: include/php_setup.inc:188
 msgid "Type"
 msgstr ""
 
 msgid "Type"
 msgstr ""
 
-#: include/php_setup.inc:182
+#: include/php_setup.inc:189
 msgid "Arguments"
 msgstr ""
 
 msgid "Arguments"
 msgstr ""
 
-#: include/class_plugin.inc:510
-msgid ""
-"The object has changed since opened in GOsa. All changes that may be done by "
-"others get lost if you save this entry!"
-msgstr ""
-
-#: include/class_plugin.inc:1331 include/class_plugin.inc:1362
-#, php-format
-msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+#: plugins/personal/posix/posix_groups.tpl:68
+msgid "Search in subtrees"
 msgstr ""
 
 msgstr ""
 
-#: include/class_plugin.inc:1344
-#, php-format
+#: include/class_plugin.inc:512
 msgid ""
 msgid ""
-"The snapshot functionality is enabled, but the required compression module "
-"is missing. Please install '%s'."
+"The object has changed since opened in GOsa. All changes that may be done by "
+"others get lost if you save this entry!"
 msgstr ""
 
 msgstr ""
 
-#: include/class_plugin.inc:1560 include/class_plugin.inc:1572
-#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
+#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1574 include/class_plugin.inc:1587
 #: plugins/admin/ogroups/class_ogroupManagement.inc:237
 #: plugins/admin/groups/class_groupManagement.inc:356
 #: plugins/admin/ogroups/class_ogroupManagement.inc:237
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:344
-#: plugins/admin/users/class_userManagement.inc:584
+#: plugins/admin/users/class_userManagement.inc:353
+#: plugins/admin/users/class_userManagement.inc:593
 #: plugins/admin/acl/class_aclManagement.inc:268
 msgid "Permission"
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:268
 msgid "Permission"
 msgstr ""
 
-#: include/class_plugin.inc:1560
+#: include/class_plugin.inc:1547
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
-#: include/class_plugin.inc:1600
+#: include/class_plugin.inc:1559 include/class_plugin.inc:1574
+#: include/class_plugin.inc:1587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: include/class_plugin.inc:1812
+#: include/class_plugin.inc:1799
 msgid "Changing ACL dn"
 msgstr ""
 
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1812
+#: include/class_plugin.inc:1799
 msgid "from"
 msgstr ""
 
 msgid "from"
 msgstr ""
 
-#: include/class_plugin.inc:1813 setup/class_setupStep_Migrate.inc:1246
-#: setup/class_setupStep_Migrate.inc:1296
-#: setup/class_setupStep_Migrate.inc:1344
+#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: setup/class_setupStep_Migrate.inc:1299
+#: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr ""
 
 msgid "to"
 msgstr ""
 
-#: include/class_plugin.inc:1995 include/class_plugin.inc:1997
+#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
 msgid "Restore"
 msgstr ""
 
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2020
-msgid "Create snapshot"
-msgstr ""
-
-#: include/class_plugin.inc:2021
-msgid "Create a new snapshot from this object"
-msgstr ""
-
-#: include/class_plugin.inc:2039
+#: include/class_plugin.inc:2029
 msgid "cut"
 msgstr ""
 
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2039
-msgid "Cut this entry"
-msgstr ""
-
-#: include/class_plugin.inc:2047
+#: include/class_plugin.inc:2037
 msgid "copy"
 msgstr ""
 
 msgid "copy"
 msgstr ""
 
-#: include/class_plugin.inc:2047
-msgid "Copy this entry"
-msgstr ""
-
-#: include/class_plugin.inc:2081
-msgid "Copy"
-msgstr ""
-
-#: include/class_plugin.inc:2085
-msgid "Cut"
-msgstr ""
-
-#: include/class_plugin.inc:2092 include/class_plugin.inc:2095
-#: include/class_CopyPasteHandler.inc:506
-msgid "Paste"
-msgstr ""
-
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -1646,6 +1757,18 @@ msgid ""
 "correct timezone offset."
 msgstr ""
 
 "correct timezone offset."
 msgstr ""
 
+#: include/utils/class_xml.inc:48
+msgid "in"
+msgstr ""
+
+#: include/utils/class_xml.inc:50
+msgid "on line"
+msgstr ""
+
+#: include/utils/class_xml.inc:51
+msgid "XML error"
+msgstr ""
+
 #: include/utils/class_msgPool.inc:15
 #, php-format
 msgid "Select to list objects of type '%s'."
 #: include/utils/class_msgPool.inc:15
 #, php-format
 msgid "Select to list objects of type '%s'."
@@ -1666,12 +1789,6 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:23
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-#: plugins/personal/posix/posix_groups.tpl:68
-msgid "Search in subtrees"
-msgstr ""
-
 #: include/utils/class_msgPool.inc:33
 msgid "This object will be deleted!"
 msgstr ""
 #: include/utils/class_msgPool.inc:33
 msgid "This object will be deleted!"
 msgstr ""
@@ -1852,7 +1969,7 @@ msgstr ""
 
 #: include/utils/class_msgPool.inc:237
 #, php-format
 
 #: include/utils/class_msgPool.inc:237
 #, php-format
-msgid "'%s' must be smaller than %d!"
+msgid "'%s' must be smaller than %s!"
 msgstr ""
 
 #: include/utils/class_msgPool.inc:245
 msgstr ""
 
 #: include/utils/class_msgPool.inc:245
@@ -1909,7 +2026,7 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2861
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr ""
 #, php-format
 msgid "Add"
 msgstr ""
@@ -2065,163 +2182,167 @@ msgid "Saturday"
 msgstr ""
 
 #: include/utils/class_msgPool.inc:452
 msgstr ""
 
 #: include/utils/class_msgPool.inc:452
+msgid "MySQL operation failed!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:460
 msgid "read operation"
 msgstr ""
 
 msgid "read operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:460
 msgid "add operation"
 msgstr ""
 
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:460
 msgid "modify operation"
 msgstr ""
 
 msgid "modify operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:453
+#: include/utils/class_msgPool.inc:461
 msgid "delete operation"
 msgstr ""
 
 msgid "delete operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:453
+#: include/utils/class_msgPool.inc:461
 msgid "search operation"
 msgstr ""
 
 msgid "search operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:453
+#: include/utils/class_msgPool.inc:461
 msgid "authentication"
 msgstr ""
 
 msgid "authentication"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:456
+#: include/utils/class_msgPool.inc:464
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:458
+#: include/utils/class_msgPool.inc:466
 msgid "LDAP operation failed!"
 msgstr ""
 
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:473
+#: include/utils/class_msgPool.inc:481
 msgid "Upload failed!"
 msgstr ""
 
 msgid "Upload failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:476
+#: include/utils/class_msgPool.inc:484
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:483
+#: include/utils/class_msgPool.inc:491
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:485
+#: include/utils/class_msgPool.inc:493
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
+#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:498
+#: include/utils/class_msgPool.inc:506
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:500
+#: include/utils/class_msgPool.inc:508
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:514
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:512
+#: include/utils/class_msgPool.inc:520
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:518
+#: include/utils/class_msgPool.inc:526
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:524
+#: include/utils/class_msgPool.inc:532
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:530
+#: include/utils/class_msgPool.inc:538
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:536
+#: include/utils/class_msgPool.inc:544
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:542
+#: include/utils/class_msgPool.inc:550
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:548
+#: include/utils/class_msgPool.inc:556
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:554
+#: include/utils/class_msgPool.inc:562
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:560
+#: include/utils/class_msgPool.inc:568
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:231 include/class_ldap.inc:264
+#: include/class_ldap.inc:232 include/class_ldap.inc:265
 msgid "Performance warning"
 msgstr ""
 
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:231 include/class_ldap.inc:264
+#: include/class_ldap.inc:232 include/class_ldap.inc:265
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:648
+#: include/class_ldap.inc:665
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:696
+#: include/class_ldap.inc:713
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:783
+#: include/class_ldap.inc:800
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:785
+#: include/class_ldap.inc:802
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1007
+#: include/class_ldap.inc:1024
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1036
+#: include/class_ldap.inc:1053
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2249,53 +2370,53 @@ msgstr ""
 msgid "Logging to MySQL database will be disabled for server '%s'!"
 msgstr ""
 
 msgid "Logging to MySQL database will be disabled for server '%s'!"
 msgstr ""
 
-#: include/class_log.inc:164 include/class_log.inc:173
-#: include/class_log.inc:186 include/class_log.inc:203
-#: include/class_log.inc:241
+#: include/class_log.inc:165 include/class_log.inc:174
+#: include/class_log.inc:187 include/class_log.inc:204
+#: include/class_log.inc:242
 msgid "MySQL logging"
 msgstr ""
 
 msgid "MySQL logging"
 msgstr ""
 
-#: include/class_log.inc:218
+#: include/class_log.inc:219
 #, php-format
 msgid "Cannot add location to the database!"
 msgstr ""
 
 #, php-format
 msgid "Cannot add location to the database!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:104
+#: include/class_gosaSupportDaemon.inc:109
 msgid "GOsa support daemon"
 msgstr ""
 
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:779
+#: include/class_gosaSupportDaemon.inc:784
 msgid "Cannot not parse XML!"
 msgstr ""
 
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1174
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1194
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
 
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
 
-#: include/class_config.inc:121
+#: include/class_config.inc:120
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:258
+#: include/class_config.inc:270
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:628
+#: include/class_config.inc:636
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:978
+#: include/class_config.inc:986
 msgid "Configuration"
 msgstr ""
 
 msgid "Configuration"
 msgstr ""
 
-#: include/class_config.inc:978
+#: include/class_config.inc:986
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2309,8 +2430,8 @@ msgstr ""
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
-#: include/class_pluglist.inc:193 include/class_pluglist.inc:194
-#: include/class_pluglist.inc:307
+#: include/class_pluglist.inc:197 include/class_pluglist.inc:198
+#: include/class_pluglist.inc:311
 msgid "Unknown"
 msgstr ""
 
 msgid "Unknown"
 msgstr ""
 
@@ -2360,11 +2481,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_groupGeneric.inc:1295
+#: plugins/admin/ogroups/class_ogroup.inc:1111
+#: plugins/admin/groups/class_groupGeneric.inc:1250
+#: plugins/admin/users/class_userManagement.inc:1066
 #: plugins/admin/departments/class_departmentGeneric.inc:609
 #: plugins/personal/generic/class_user.inc:37
 #: plugins/admin/departments/class_departmentGeneric.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1543
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
@@ -2378,26 +2500,29 @@ msgstr ""
 #: plugins/admin/ogroups/class_divListOGroup.inc:204
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_divListGroup.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:204
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:205
+#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/users/class_divListUsers.inc:210
+#: plugins/admin/users/class_userManagement.inc:1073
 msgid "Mail"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_divListGroup.inc:192
 msgid "Mail"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_divListGroup.inc:192
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/personal/posix/class_posixAccount.inc:295
+#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/users/class_divListUsers.inc:216
+#: plugins/admin/users/class_userManagement.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:320
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
+#: plugins/admin/users/class_userManagement.inc:1090
 msgid "FAX"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:53
 msgid "FAX"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr ""
 
 msgid "Proxy"
 msgstr ""
 
@@ -2415,10 +2540,10 @@ msgstr ""
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_ogroupManagement.inc:534
 #: plugins/admin/groups/class_divListGroup.inc:79
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_ogroupManagement.inc:534
 #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/users/class_divListUsers.inc:80
-#: plugins/admin/departments/class_departmentManagement.inc:604
-#: plugins/personal/generic/class_user.inc:1568
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/admin/users/class_divListUsers.inc:81
+#: plugins/admin/departments/class_departmentManagement.inc:616
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr ""
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr ""
@@ -2426,14 +2551,16 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:536
 #: plugins/admin/groups/class_divListGroup.inc:196
 #: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:536
 #: plugins/admin/groups/class_divListGroup.inc:196
-#: plugins/admin/users/class_divListUsers.inc:207
+#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/users/class_divListUsers.inc:212
+#: plugins/admin/users/class_userManagement.inc:1094
 #: plugins/admin/departments/class_departmentGeneric.inc:328
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/organization.tpl:88
 #: plugins/admin/departments/class_departmentGeneric.inc:328
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1263
-#: plugins/personal/generic/class_user.inc:1671
-#: plugins/personal/generic/generic.tpl:338
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/class_user.inc:1305
+#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/generic.tpl:346
+#: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 msgid "Phone"
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 msgid "Phone"
@@ -2447,7 +2574,7 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:535
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
+#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
 msgid "Server"
 msgstr ""
 
 msgid "Server"
 msgstr ""
 
@@ -2517,23 +2644,13 @@ msgstr ""
 msgid "List of object groups"
 msgstr ""
 
 msgid "List of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:77
-#: plugins/admin/groups/class_divListGroup.inc:73
-#: plugins/admin/users/class_divListUsers.inc:74
-#: plugins/admin/departments/class_divListDepartment.inc:59
-#: plugins/admin/acl/class_divListACL.inc:67 setup/setup_migrate.tpl:93
-#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
-#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
-#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr ""
-
 #: plugins/admin/ogroups/class_divListOGroup.inc:84
 #: plugins/admin/groups/class_divListGroup.inc:80
 #: plugins/admin/ogroups/class_divListOGroup.inc:84
 #: plugins/admin/groups/class_divListGroup.inc:80
-#: plugins/admin/users/class_divListUsers.inc:81
+#: plugins/admin/users/class_divListUsers.inc:82
+#: plugins/admin/users/user-list.xml:57
 #: plugins/admin/departments/locality.tpl:8
 #: plugins/admin/departments/generic.tpl:7
 #: plugins/admin/departments/locality.tpl:8
 #: plugins/admin/departments/generic.tpl:7
+#: plugins/admin/departments/domain.tpl:8
 #: plugins/admin/departments/country.tpl:8
 #: plugins/admin/departments/dcObject.tpl:8
 #: plugins/admin/departments/organization.tpl:7
 #: plugins/admin/departments/country.tpl:8
 #: plugins/admin/departments/dcObject.tpl:8
 #: plugins/admin/departments/organization.tpl:7
@@ -2544,8 +2661,9 @@ msgstr ""
 #: plugins/admin/ogroups/class_divListOGroup.inc:152
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:126
 #: plugins/admin/ogroups/class_divListOGroup.inc:152
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:126
-#: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:119
+#: plugins/admin/users/class_divListUsers.inc:83
+#: plugins/admin/users/class_divListUsers.inc:124
+#: plugins/admin/users/user-list.xml:62
 #: plugins/admin/departments/class_divListDepartment.inc:66
 #: plugins/admin/departments/class_divListDepartment.inc:90
 #: plugins/admin/acl/class_divListACL.inc:74
 #: plugins/admin/departments/class_divListDepartment.inc:66
 #: plugins/admin/departments/class_divListDepartment.inc:90
 #: plugins/admin/acl/class_divListACL.inc:74
@@ -2568,12 +2686,13 @@ msgstr ""
 #: plugins/admin/groups/class_divListGroup.inc:89
 #: plugins/admin/groups/class_divListGroup.inc:91
 #: plugins/admin/groups/class_divListGroup.inc:93
 #: plugins/admin/groups/class_divListGroup.inc:89
 #: plugins/admin/groups/class_divListGroup.inc:91
 #: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
 #: plugins/admin/users/class_divListUsers.inc:87
 #: plugins/admin/users/class_divListUsers.inc:88
 #: plugins/admin/users/class_divListUsers.inc:89
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
 #: plugins/admin/users/class_divListUsers.inc:87
 #: plugins/admin/users/class_divListUsers.inc:88
 #: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/users/class_divListUsers.inc:90
+#: plugins/admin/users/class_divListUsers.inc:93
 #, php-format
 msgid "Show %s"
 msgstr ""
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2637,7 +2756,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:148
 #: plugins/admin/groups/class_divListGroup.inc:122
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:148
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/users/class_divListUsers.inc:120
 #: plugins/admin/departments/class_divListDepartment.inc:87
 #: plugins/admin/acl/class_divListACL.inc:104
 msgid "Submit department"
 #: plugins/admin/departments/class_divListDepartment.inc:87
 #: plugins/admin/acl/class_divListACL.inc:104
 msgid "Submit department"
@@ -2645,7 +2764,8 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:157
 #: plugins/admin/groups/class_divListGroup.inc:131
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:157
 #: plugins/admin/groups/class_divListGroup.inc:131
-#: plugins/admin/users/class_divListUsers.inc:124
+#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/user-list.xml:72
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/acl/class_divListACL.inc:112
 #: setup/class_setupStep_Migrate.inc:1035
 #: plugins/admin/departments/class_divListDepartment.inc:94
 #: plugins/admin/acl/class_divListACL.inc:112
 #: setup/class_setupStep_Migrate.inc:1035
@@ -2655,19 +2775,20 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:141
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:141
-#: plugins/admin/users/class_divListUsers.inc:138
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/users/user-list.xml:114
 #: plugins/admin/departments/class_divListDepartment.inc:110
 #: plugins/admin/acl/class_divListACL.inc:118
 #: plugins/personal/generic/generic_certs.tpl:21
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
 #: plugins/admin/departments/class_divListDepartment.inc:110
 #: plugins/admin/acl/class_divListACL.inc:118
 #: plugins/personal/generic/generic_certs.tpl:21
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2862
+#: setup/class_setupStep_Migrate.inc:2869
 msgid "Remove"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:228
 #: plugins/admin/groups/class_divListGroup.inc:234
 msgid "Remove"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:228
 #: plugins/admin/groups/class_divListGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:257
+#: plugins/admin/users/class_divListUsers.inc:262
 #: plugins/admin/departments/class_divListDepartment.inc:158
 #: plugins/admin/acl/class_divListACL.inc:164
 #: plugins/admin/acl/class_divListACL.inc:184
 #: plugins/admin/departments/class_divListDepartment.inc:158
 #: plugins/admin/acl/class_divListACL.inc:164
 #: plugins/admin/acl/class_divListACL.inc:184
@@ -2682,7 +2803,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
 #: plugins/admin/groups/class_divListGroup.inc:241
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
 #: plugins/admin/groups/class_divListGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:286
 #: plugins/admin/departments/class_divListDepartment.inc:161
 #: plugins/admin/acl/class_divListACL.inc:191
 msgid "delete"
 #: plugins/admin/departments/class_divListDepartment.inc:161
 #: plugins/admin/acl/class_divListACL.inc:191
 msgid "delete"
@@ -2700,13 +2821,13 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:283
 #: plugins/admin/groups/class_divListGroup.inc:304
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:283
 #: plugins/admin/groups/class_divListGroup.inc:304
-#: plugins/admin/users/class_divListUsers.inc:372
+#: plugins/admin/users/class_divListUsers.inc:377
 #: plugins/admin/departments/class_divListDepartment.inc:201
 msgid "Number of listed departments"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/admin/departments/class_divListDepartment.inc:201
 msgid "Number of listed departments"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1117
 #: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr ""
 #: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr ""
@@ -2717,7 +2838,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:176
 #: plugins/admin/groups/class_groupManagement.inc:195
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:176
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:211
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Infrastructure error"
 msgstr ""
 
 msgid "Infrastructure error"
 msgstr ""
 
@@ -2732,8 +2853,8 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:407
 #: plugins/admin/groups/class_groupManagement.inc:461
 #: plugins/admin/groups/class_groupManagement.inc:492
 #: plugins/admin/groups/class_groupManagement.inc:407
 #: plugins/admin/groups/class_groupManagement.inc:461
 #: plugins/admin/groups/class_groupManagement.inc:492
-#: plugins/admin/users/class_userManagement.inc:546
-#: plugins/admin/users/class_userManagement.inc:550
+#: plugins/admin/users/class_userManagement.inc:555
+#: plugins/admin/users/class_userManagement.inc:559
 #: plugins/admin/departments/class_departmentManagement.inc:250
 #: plugins/admin/acl/class_aclManagement.inc:166
 #: plugins/admin/acl/class_aclManagement.inc:209
 #: plugins/admin/departments/class_departmentManagement.inc:250
 #: plugins/admin/acl/class_aclManagement.inc:166
 #: plugins/admin/acl/class_aclManagement.inc:209
@@ -2743,12 +2864,14 @@ msgid "Permission error"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:530
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/users/user-list.xml:24
 msgid "Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:531
 msgid "Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:531
-#: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
-#: setup/setup_config2.tpl:331
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/user-list.xml:79 setup/setup_config2.tpl:227
+#: setup/setup_config2.tpl:272
 msgid "User"
 msgstr ""
 
 msgid "User"
 msgstr ""
 
@@ -2821,7 +2944,7 @@ msgid "applications"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:493
+#: plugins/admin/users/class_userManagement.inc:502
 msgid "none"
 msgstr ""
 
 msgid "none"
 msgstr ""
 
@@ -2838,21 +2961,21 @@ msgid "winstations"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:521
-#: plugins/personal/posix/class_posixAccount.inc:623
-#: setup/setup_config2.tpl:201
+#: plugins/admin/groups/class_groupGeneric.inc:511
+#: plugins/personal/posix/class_posixAccount.inc:639
+#: setup/setup_config2.tpl:142
 msgid "disabled"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 msgid "disabled"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:521
-#: plugins/personal/posix/class_posixAccount.inc:623
+#: plugins/admin/groups/class_groupGeneric.inc:511
+#: plugins/personal/posix/class_posixAccount.inc:639
 msgid "full access"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 msgid "full access"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
-#: plugins/admin/groups/class_groupGeneric.inc:522
-#: plugins/personal/posix/class_posixAccount.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:512
+#: plugins/personal/posix/class_posixAccount.inc:640
 msgid "allow access to these hosts"
 msgstr ""
 
 msgid "allow access to these hosts"
 msgstr ""
 
@@ -2869,23 +2992,29 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1129
+#: plugins/admin/ogroups/class_ogroup.inc:1120
 #: plugins/admin/groups/class_divListGroup.inc:79
 #: plugins/admin/groups/class_divListGroup.inc:79
+#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: plugins/admin/groups/class_groupGeneric.inc:1137
 #: plugins/admin/groups/class_groupGeneric.inc:1139
 #: plugins/admin/groups/class_groupGeneric.inc:1139
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1147
-#: plugins/admin/groups/class_groupGeneric.inc:1159
-#: plugins/admin/groups/class_groupGeneric.inc:1173
-#: plugins/admin/groups/class_groupGeneric.inc:1180
-#: plugins/admin/groups/class_groupGeneric.inc:1304
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/users/class_userManagement.inc:841
-#: plugins/admin/users/class_userManagement.inc:853
+#: plugins/admin/groups/class_groupGeneric.inc:1151
+#: plugins/admin/groups/class_groupGeneric.inc:1165
+#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_groupGeneric.inc:1259
+#: plugins/admin/users/class_userManagement.inc:776
+#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:862
 #: plugins/admin/departments/class_departmentGeneric.inc:307
 #: plugins/admin/departments/class_departmentGeneric.inc:309
 #: plugins/admin/departments/class_departmentGeneric.inc:314
 #: plugins/admin/departments/class_departmentGeneric.inc:321
 #: plugins/admin/departments/class_departmentGeneric.inc:325
 #: plugins/admin/departments/class_departmentGeneric.inc:307
 #: plugins/admin/departments/class_departmentGeneric.inc:309
 #: plugins/admin/departments/class_departmentGeneric.inc:314
 #: plugins/admin/departments/class_departmentGeneric.inc:321
 #: plugins/admin/departments/class_departmentGeneric.inc:325
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
 #: plugins/admin/departments/class_localityGeneric.inc:44
 #: plugins/admin/departments/class_localityGeneric.inc:46
 #: plugins/admin/departments/class_localityGeneric.inc:51
 #: plugins/admin/departments/class_localityGeneric.inc:44
 #: plugins/admin/departments/class_localityGeneric.inc:46
 #: plugins/admin/departments/class_localityGeneric.inc:51
@@ -2910,10 +3039,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:750
 #: plugins/admin/acl/class_aclRole.inc:762 plugins/admin/acl/paste_role.tpl:4
 #: plugins/admin/acl/acl_role.tpl:7
 #: plugins/admin/acl/class_aclRole.inc:750
 #: plugins/admin/acl/class_aclRole.inc:762 plugins/admin/acl/paste_role.tpl:4
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1230
-#: plugins/personal/generic/class_user.inc:1243
-#: plugins/personal/generic/class_user.inc:1280
-#: plugins/personal/generic/class_user.inc:1686 setup/setup_migrate.tpl:283
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1285
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1733 setup/setup_migrate.tpl:283
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr ""
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr ""
@@ -2922,15 +3051,15 @@ msgstr ""
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1121
+#: plugins/admin/ogroups/class_ogroup.inc:1112
 msgid "Object group generic"
 msgstr ""
 
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1132
+#: plugins/admin/ogroups/class_ogroup.inc:1123
 msgid "Sytem trust"
 msgstr ""
 
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1133
+#: plugins/admin/ogroups/class_ogroup.inc:1124
 msgid "Member"
 msgstr ""
 
 msgid "Member"
 msgstr ""
 
@@ -2957,23 +3086,24 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
 #: plugins/admin/departments/locality.tpl:37
 #: plugins/admin/departments/generic.tpl:49
 #: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
 #: plugins/admin/departments/locality.tpl:37
 #: plugins/admin/departments/generic.tpl:49
+#: plugins/admin/departments/domain.tpl:37
 #: plugins/admin/departments/country.tpl:37
 #: plugins/admin/departments/dcObject.tpl:37
 #: plugins/admin/departments/organization.tpl:49
 #: plugins/admin/departments/country.tpl:37
 #: plugins/admin/departments/dcObject.tpl:37
 #: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:180
+#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
 #: plugins/personal/generic/multiple_generic.tpl:56
 msgid "Select a base"
 msgstr ""
 
 #: plugins/admin/ogroups/generic.tpl:41
 #: plugins/personal/generic/multiple_generic.tpl:56
 msgid "Select a base"
 msgstr ""
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1312
-#: plugins/personal/posix/generic.tpl:126
+#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr ""
 
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:169
-#: plugins/admin/groups/generic.tpl:203 plugins/personal/posix/generic.tpl:128
-#: plugins/personal/posix/generic.tpl:156
+#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
+#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr ""
 
 msgid "Trust mode"
 msgstr ""
 
@@ -3005,8 +3135,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_divListGroup.inc:198
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_divListGroup.inc:198
-#: plugins/admin/users/class_divListUsers.inc:203
-#: plugins/personal/posix/class_posixAccount.inc:295
+#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_userManagement.inc:1086
+#: plugins/personal/posix/class_posixAccount.inc:320
 msgid "Environment"
 msgstr ""
 
 msgid "Environment"
 msgstr ""
 
@@ -3090,7 +3221,7 @@ msgid "Display users of department"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:46
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:96
+#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr ""
 
 msgid "Display users matching"
 msgstr ""
 
@@ -3124,31 +3255,31 @@ msgstr ""
 msgid "Forced ID number"
 msgstr ""
 
 msgid "Forced ID number"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:83 plugins/admin/groups/generic.tpl:110
+#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
 msgid "Select to create a samba conform group"
 msgstr ""
 
 msgid "Select to create a samba conform group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:95 plugins/admin/groups/generic.tpl:118
+#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
 msgid "in domain"
 msgstr ""
 
 msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:140
+#: plugins/admin/groups/generic.tpl:137
 msgid "Members are in a phone pickup group"
 msgstr ""
 
 msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:155
+#: plugins/admin/groups/generic.tpl:152
 msgid "Members are in a nagios group"
 msgstr ""
 
 msgid "Members are in a nagios group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:245
+#: plugins/admin/groups/generic.tpl:242
 msgid "Group members"
 msgstr ""
 
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:249
 msgid "In all groups"
 msgstr ""
 
 msgid "In all groups"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:255
+#: plugins/admin/groups/generic.tpl:252
 msgid "Not in all groups"
 msgstr ""
 
 msgid "Not in all groups"
 msgstr ""
 
@@ -3199,14 +3330,14 @@ msgid "User name of which groups are shown"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:188
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:188
-#: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:87
+#: plugins/admin/users/class_divListUsers.inc:206
 msgid "Posix"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:244
 msgid "Posix"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:273
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:290
 msgid "Not allowed"
 msgstr ""
 
 msgid "Not allowed"
 msgstr ""
 
@@ -3214,101 +3345,96 @@ msgstr ""
 msgid "Number of listed groups"
 msgstr ""
 
 msgid "Number of listed groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:163
+#: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_groupGeneric.inc:478
 msgid "Samba group"
 msgstr ""
 
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_groupGeneric.inc:478
 msgid "Domain admins"
 msgstr ""
 
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_groupGeneric.inc:478
 msgid "Domain users"
 msgstr ""
 
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:489
+#: plugins/admin/groups/class_groupGeneric.inc:479
 msgid "Domain guests"
 msgstr ""
 
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:494
+#: plugins/admin/groups/class_groupGeneric.inc:484
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:628
+#: plugins/admin/groups/class_groupGeneric.inc:618
 #, php-format
 #, php-format
-msgid "Adding UID '%s' to group '%s' faild: cannot find user object!"
+msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:634
+#: plugins/admin/groups/class_groupGeneric.inc:624
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:712
+#: plugins/admin/groups/class_groupGeneric.inc:702
 msgid "! unknown UID"
 msgstr ""
 
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:755
+#: plugins/admin/groups/class_groupGeneric.inc:745
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:981
+#: plugins/admin/groups/class_groupGeneric.inc:971
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:986
+#: plugins/admin/groups/class_groupGeneric.inc:976
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1088
+#: plugins/admin/groups/class_groupGeneric.inc:1080
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
-#: plugins/admin/groups/class_groupGeneric.inc:1192
-#: plugins/admin/groups/class_groupGeneric.inc:1308
-#: plugins/personal/posix/class_posixAccount.inc:1084
-#: plugins/personal/posix/class_posixAccount.inc:1087
-#: plugins/personal/posix/generic.tpl:68
-#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:1181
+#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/personal/posix/class_posixAccount.inc:1113
+#: plugins/personal/posix/class_posixAccount.inc:1116
+#: plugins/personal/posix/generic.tpl:74
+#: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr ""
 
 msgid "GID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1247
-#: plugins/personal/posix/class_posixAccount.inc:1382
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:1296
+#: plugins/admin/groups/class_groupGeneric.inc:1251
 msgid "Generic group settings"
 msgstr ""
 
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1310
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 msgid "Samba group type"
 msgstr ""
 
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1311
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Samba domain name"
 msgstr ""
 
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1313
+#: plugins/admin/groups/class_groupGeneric.inc:1268
 msgid "Phone pickup group"
 msgstr ""
 
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1314
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Nagios group"
 msgstr ""
 
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1316
+#: plugins/admin/groups/class_groupGeneric.inc:1271
 msgid "Group member"
 msgstr ""
 
 msgid "Group member"
 msgstr ""
 
@@ -3340,139 +3466,148 @@ msgstr ""
 msgid "User administration"
 msgstr ""
 
 msgid "User administration"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:55
 #: plugins/admin/users/class_divListUsers.inc:56
 #: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/users/user-list.xml:11
 msgid "List of users"
 msgstr ""
 
 msgid "List of users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:128
+#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:133
 #: plugins/admin/users/template.tpl:15
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:764
-#: plugins/admin/users/templatize.tpl:15
+#: plugins/admin/users/class_userManagement.inc:773
+#: plugins/admin/users/user-list.xml:87 plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr ""
 
 msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:84
+#: plugins/admin/users/class_divListUsers.inc:85
 msgid "templates"
 msgstr ""
 
 msgid "templates"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:86
 msgid "GOsa object"
 msgstr ""
 
 msgid "GOsa object"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:86
 msgid "functional users"
 msgstr ""
 
 msgid "functional users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:86
+#: plugins/admin/users/class_divListUsers.inc:87
 msgid "POSIX users"
 msgstr ""
 
 msgid "POSIX users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:87
+#: plugins/admin/users/class_divListUsers.inc:88
 msgid "mail users"
 msgstr ""
 
 msgid "mail users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/users/class_divListUsers.inc:89
 msgid "samba users"
 msgstr ""
 
 msgid "samba users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/users/class_divListUsers.inc:90
 msgid "proxy users"
 msgstr ""
 
 msgid "proxy users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:140
+#: plugins/admin/users/class_divListUsers.inc:93
+msgid "phone users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
 msgid "Apply template"
 msgstr ""
 
 msgid "Apply template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:204
 msgid "GOsa"
 msgstr ""
 
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:205
+#: plugins/admin/users/class_userManagement.inc:1067
 msgid "Edit generic properties"
 msgstr ""
 
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "Edit UNIX properties"
 msgstr ""
 
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:204
+#: plugins/admin/users/class_divListUsers.inc:209
+#: plugins/admin/users/class_userManagement.inc:1087
 msgid "Edit environment properties"
 msgstr ""
 
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:211
+#: plugins/admin/users/class_userManagement.inc:1075
 msgid "Edit mail properties"
 msgstr ""
 
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:213
+#: plugins/admin/users/class_userManagement.inc:1095
 msgid "Edit phone properties"
 msgstr ""
 
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:209
+#: plugins/admin/users/class_divListUsers.inc:214
 #: plugins/admin/departments/class_departmentGeneric.inc:331
 #: plugins/admin/departments/class_departmentGeneric.inc:627
 #: plugins/admin/departments/generic.tpl:96
 #: plugins/admin/departments/class_organizationGeneric.inc:127
 #: plugins/admin/departments/organization.tpl:96
 #: plugins/admin/departments/class_departmentGeneric.inc:331
 #: plugins/admin/departments/class_departmentGeneric.inc:627
 #: plugins/admin/departments/generic.tpl:96
 #: plugins/admin/departments/class_organizationGeneric.inc:127
 #: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1266
-#: plugins/personal/generic/class_user.inc:1674
-#: plugins/personal/generic/generic.tpl:363
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1721
+#: plugins/personal/generic/generic.tpl:371
+#: plugins/personal/generic/generic.tpl:539
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:210
+#: plugins/admin/users/class_divListUsers.inc:215
 msgid "Edit fax properies"
 msgstr ""
 
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:212
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_userManagement.inc:1079
 msgid "Edit samba properties"
 msgstr ""
 
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:213
+#: plugins/admin/users/class_divListUsers.inc:218
+#: plugins/admin/users/class_userManagement.inc:1082
 msgid "Netatalk"
 msgstr ""
 
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:214
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/users/class_userManagement.inc:1083
 msgid "Edit netatalk properties"
 msgstr ""
 
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:220
 msgid "Create user from template"
 msgstr ""
 
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:216
+#: plugins/admin/users/class_divListUsers.inc:221
 msgid "Create user with this template"
 msgstr ""
 
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:247
-msgid "inactive"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:250
-#: plugins/personal/posix/class_posixAccount.inc:159
-#: plugins/personal/posix/class_posixAccount.inc:161
-#: plugins/personal/posix/class_posixAccount.inc:163
+#: plugins/admin/users/class_divListUsers.inc:255
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
 msgid "active"
 msgstr ""
 
 msgid "active"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:258
-#: plugins/admin/users/class_userManagement.inc:602
+#: plugins/admin/users/class_divListUsers.inc:263
+#: plugins/admin/users/class_userManagement.inc:611
 msgid "user"
 msgstr ""
 
 msgid "user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:274
 msgid "password"
 msgstr ""
 
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Delete user"
 msgstr ""
 
 msgid "Delete user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:371
+#: plugins/admin/users/class_divListUsers.inc:376
 msgid "Number of listed users"
 msgstr ""
 
 msgid "Number of listed users"
 msgstr ""
 
@@ -3530,44 +3665,104 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:379
+#: plugins/admin/users/class_userManagement.inc:325
+#: plugins/admin/users/class_userManagement.inc:388
 msgid "You have no permission to change this users password!"
 msgstr ""
 
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:546
+#: plugins/admin/users/class_userManagement.inc:555
 #, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr ""
 
 #, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:550
+#: plugins/admin/users/class_userManagement.inc:559
 msgid "You have no permission to use this template!"
 msgstr ""
 
 msgid "You have no permission to use this template!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:652
-#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/users/class_userManagement.inc:661
+#: plugins/admin/users/class_userManagement.inc:680
 msgid "Account locking"
 msgstr ""
 
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:662
 msgid "You have no permission to change the lock status for this user!"
 msgstr ""
 
 msgid "You have no permission to change the lock status for this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:681
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account has not been locked!"
 msgstr ""
 
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account has not been locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:770
-#: plugins/admin/users/class_userManagement.inc:844
-#: plugins/personal/generic/class_user.inc:1235
+#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/users/class_userManagement.inc:853
 #: plugins/personal/generic/class_user.inc:1277
 #: plugins/personal/generic/class_user.inc:1277
-#: plugins/personal/generic/class_user.inc:1555
-#: plugins/personal/generic/class_user.inc:1683
+#: plugins/personal/generic/class_user.inc:1324
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1730
 msgid "Given name"
 msgstr ""
 
 msgid "Given name"
 msgstr ""
 
+#: plugins/admin/users/class_userManagement.inc:1050
+msgid "Unlock account"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:1052
+msgid "Lock account"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:1070
+#: plugins/personal/posix/class_posixAccount.inc:300
+#: plugins/personal/posix/class_posixAccount.inc:320
+#: plugins/personal/posix/class_posixAccount.inc:322
+#: plugins/personal/posix/class_posixAccount.inc:325
+msgid "POSIX"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:1071
+msgid "Edit POSIX properties"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:1091
+msgid "Edit FAX properties"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:49
+msgid "Name / Department"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:175
+msgid "Edit user"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:184
+msgid "%{filter:lockLabel(userPassword)}"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:206
+msgid "Remove user"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl:11
+msgid "Show templates"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl:12
+msgid "Show functional users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl:13
+msgid "Show mail users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl:14
+msgid "Show POSIX users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl:15
+msgid "Show samba users"
+msgstr ""
+
 #: plugins/admin/users/templatize.tpl:2
 msgid "Applying a template"
 msgstr ""
 #: plugins/admin/users/templatize.tpl:2
 msgid "Applying a template"
 msgstr ""
@@ -3582,6 +3777,10 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
 msgid "No templates available!"
 msgstr ""
 
+#: plugins/admin/users/user-list.tpl:13
+msgid "Update"
+msgstr ""
+
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3637,8 +3836,8 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:65
 #: plugins/admin/departments/class_organizationGeneric.inc:123
 #: plugins/admin/departments/organization.tpl:65
 #: plugins/admin/departments/generic.tpl:65
 #: plugins/admin/departments/class_organizationGeneric.inc:123
 #: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/class_user.inc:1626
+#: plugins/personal/generic/generic.tpl:397
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr ""
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr ""
@@ -3650,8 +3849,8 @@ msgstr ""
 #: plugins/admin/departments/class_organizationGeneric.inc:124
 #: plugins/admin/departments/organization.tpl:61
 #: plugins/admin/departments/organization.tpl:73
 #: plugins/admin/departments/class_organizationGeneric.inc:124
 #: plugins/admin/departments/organization.tpl:61
 #: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1580
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:389
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr ""
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr ""
@@ -3659,8 +3858,8 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:625
 #: plugins/admin/departments/generic.tpl:81
 #: plugins/admin/departments/organization.tpl:81
 #: plugins/admin/departments/class_departmentGeneric.inc:625
 #: plugins/admin/departments/generic.tpl:81
 #: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:188
+#: plugins/personal/generic/generic.tpl:405
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3673,10 +3872,12 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:629
 #: plugins/admin/departments/locality.tpl:50
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_departmentGeneric.inc:629
 #: plugins/admin/departments/locality.tpl:50
 #: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
+#: plugins/admin/departments/domain.tpl:50
 #: plugins/admin/departments/country.tpl:50
 #: plugins/admin/departments/dcObject.tpl:50
 #: plugins/admin/departments/organization.tpl:114
 #: plugins/admin/departments/country.tpl:50
 #: plugins/admin/departments/dcObject.tpl:50
 #: plugins/admin/departments/organization.tpl:114
@@ -3709,7 +3910,7 @@ msgid "Name of locality to create"
 msgstr ""
 
 #: plugins/admin/departments/locality.tpl:22
 msgstr ""
 
 #: plugins/admin/departments/locality.tpl:22
-#: plugins/admin/departments/generic.tpl:22
+#: plugins/admin/departments/domain.tpl:22
 #: plugins/admin/departments/country.tpl:22
 #: plugins/admin/departments/dcObject.tpl:22
 #: plugins/admin/departments/organization.tpl:22
 #: plugins/admin/departments/country.tpl:22
 #: plugins/admin/departments/dcObject.tpl:22
 #: plugins/admin/departments/organization.tpl:22
@@ -3718,6 +3919,7 @@ msgstr ""
 
 #: plugins/admin/departments/locality.tpl:31
 #: plugins/admin/departments/generic.tpl:43
 
 #: plugins/admin/departments/locality.tpl:31
 #: plugins/admin/departments/generic.tpl:43
+#: plugins/admin/departments/domain.tpl:31
 #: plugins/admin/departments/country.tpl:31
 #: plugins/admin/departments/dcObject.tpl:31
 #: plugins/admin/departments/organization.tpl:43
 #: plugins/admin/departments/country.tpl:31
 #: plugins/admin/departments/dcObject.tpl:31
 #: plugins/admin/departments/organization.tpl:43
@@ -3726,6 +3928,7 @@ msgstr ""
 
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
+#: plugins/admin/departments/domain.tpl:52
 #: plugins/admin/departments/country.tpl:52
 #: plugins/admin/departments/dcObject.tpl:52
 #: plugins/admin/departments/organization.tpl:116
 #: plugins/admin/departments/country.tpl:52
 #: plugins/admin/departments/dcObject.tpl:52
 #: plugins/admin/departments/organization.tpl:116
@@ -3740,6 +3943,10 @@ msgstr ""
 msgid "Name of subtree to create"
 msgstr ""
 
 msgid "Name of subtree to create"
 msgstr ""
 
+#: plugins/admin/departments/generic.tpl:22
+msgid "Descriptive text for   department"
+msgstr ""
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
@@ -3770,6 +3977,14 @@ msgstr ""
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
+#: plugins/admin/departments/class_domain.inc:77
+#: plugins/admin/departments/class_domain.inc:78
+#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_dcObject.inc:77
+#: plugins/admin/departments/class_dcObject.inc:78
+msgid "Domain Component"
+msgstr ""
+
 #: plugins/admin/departments/class_divListDepartment.inc:47
 #: plugins/admin/departments/class_divListDepartment.inc:48
 msgid "List of departments"
 #: plugins/admin/departments/class_divListDepartment.inc:47
 #: plugins/admin/departments/class_divListDepartment.inc:48
 msgid "List of departments"
@@ -3798,28 +4013,26 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:556
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:556
-#: plugins/admin/departments/class_dcObject.inc:77
-#: plugins/admin/departments/class_dcObject.inc:78
-msgid "Domain Component"
+msgid "Domain"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
 #: plugins/admin/departments/class_countryGeneric.inc:78
 #: plugins/admin/departments/class_countryGeneric.inc:79
 msgid "Country"
 msgstr ""
 
 #: plugins/admin/departments/class_countryGeneric.inc:78
 #: plugins/admin/departments/class_countryGeneric.inc:79
 msgid "Country"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
 #: plugins/admin/departments/class_localityGeneric.inc:78
 #: plugins/admin/departments/class_localityGeneric.inc:79
 msgid "Locality"
 msgstr ""
 
 #: plugins/admin/departments/class_localityGeneric.inc:78
 #: plugins/admin/departments/class_localityGeneric.inc:79
 msgid "Locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
 #: plugins/admin/departments/class_organizationGeneric.inc:109
 #: plugins/admin/departments/class_organizationGeneric.inc:110
 #: plugins/admin/departments/class_organizationGeneric.inc:109
 #: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1567
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:287
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:23
 msgid "Organization"
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:23
 msgid "Organization"
@@ -3830,7 +4043,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Postal address"
 msgstr ""
 
 msgid "Postal address"
 msgstr ""
 
@@ -3843,6 +4056,14 @@ msgstr ""
 msgid "Country name"
 msgstr ""
 
 msgid "Country name"
 msgstr ""
 
+#: plugins/admin/departments/domain.tpl:11
+msgid "Domain name"
+msgstr ""
+
+#: plugins/admin/departments/domain.tpl:14
+msgid "Name of domain to create"
+msgstr ""
+
 #: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
 msgid "Department management"
 msgstr ""
 #: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
 msgid "Department management"
 msgstr ""
@@ -3915,8 +4136,8 @@ msgstr ""
 #: plugins/admin/acl/class_divListACL.inc:114
 #: plugins/admin/acl/class_divListACL.inc:152
 #: plugins/admin/acl/class_aclRole.inc:742
 #: plugins/admin/acl/class_divListACL.inc:114
 #: plugins/admin/acl/class_divListACL.inc:152
 #: plugins/admin/acl/class_aclRole.inc:742
-#: plugins/personal/generic/class_user.inc:1539
-#: plugins/personal/generic/generic.tpl:448
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr ""
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr ""
@@ -4003,244 +4224,261 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:258
+msgid "Please add a single IP address or a network/netmask combination!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:283
 msgid "female"
 msgstr ""
 
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:314
+#: plugins/personal/generic/class_user.inc:283
 msgid "male"
 msgstr ""
 
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:412
+#: plugins/personal/generic/class_user.inc:381
 msgid "Cannot upload file!"
 msgstr ""
 
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:513
+#: plugins/personal/generic/class_user.inc:476
 msgid "Serial number"
 msgstr ""
 
 msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:558
+#: plugins/personal/generic/class_user.inc:521
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:531
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:571
+#: plugins/personal/generic/class_user.inc:534
 msgid "valid"
 msgstr ""
 
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:535
 msgid "invalid"
 msgstr ""
 
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:577
+#: plugins/personal/generic/class_user.inc:540
 msgid "No certificate installed"
 msgstr ""
 
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:603
+#: plugins/personal/generic/class_user.inc:566
 msgid "The selected password method is no longer available."
 msgstr ""
 
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1196
+#: plugins/personal/generic/class_user.inc:1144
+msgid "Cannot build RDN: no + allowed to build sub RDN!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1151
+msgid "Cannot build RDN: attribute is not defined!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1169
+msgid "Cannot build RDN: invalid attribute parameters!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1240
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1258
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/class_user.inc:1668
-#: plugins/personal/generic/generic.tpl:210
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1269
-#: plugins/personal/generic/class_user.inc:1677
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1272
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/class_user.inc:1319
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:119
+msgid "Date of birth"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1429
 msgid "Cannot open certificate!"
 msgstr ""
 
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1528
-#: plugins/personal/generic/generic.tpl:471
+#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1529
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1530
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1531
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1532
-#: plugins/personal/generic/generic.tpl:462
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1533
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1534
-#: plugins/personal/generic/generic.tpl:430
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1535
-#: plugins/personal/generic/generic.tpl:439
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1537
-#: plugins/personal/generic/generic.tpl:549
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1538
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1540
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1544
+#: plugins/personal/generic/class_user.inc:1591
 msgid "Generic user settings"
 msgstr ""
 
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1548
-#: plugins/personal/posix/class_posixAccount.inc:1564
-#: plugins/personal/password/class_password.inc:145
+#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr ""
 
 msgid "My account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1601
 msgid "Surname"
 msgstr ""
 
 msgid "Surname"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1603
 msgid "User identification"
 msgstr ""
 
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1557
+#: plugins/personal/generic/class_user.inc:1604
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1605
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1560
-#: plugins/personal/generic/generic.tpl:119
-msgid "Date of birth"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1608
 msgid "Gender"
 msgstr ""
 
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1562
+#: plugins/personal/generic/class_user.inc:1609
 msgid "Preferred language"
 msgstr ""
 
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Department number"
 msgstr ""
 
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1617
 msgid "Employee number"
 msgstr ""
 
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1571
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Room number"
 msgstr ""
 
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Telefon number"
 msgstr ""
 
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1622
 msgid "Pager number"
 msgstr ""
 
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Mobile number"
 msgstr ""
 
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Fax number"
 msgstr ""
 
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Home postal address"
 msgstr ""
 
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Home phone number"
 msgstr ""
 
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/class_user.inc:1633
 msgid "User password method"
 msgstr ""
 
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1634
 msgid "User certificates"
 msgstr ""
 
 msgid "User certificates"
 msgstr ""
 
@@ -4268,68 +4506,72 @@ msgstr ""
 msgid "Template name"
 msgstr ""
 
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:144
+#: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr ""
 
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:157
+#: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:175
+#: plugins/personal/generic/generic.tpl:169
 #: plugins/personal/generic/multiple_generic.tpl:53
 msgid "Choose subtree to place user in"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:53
 msgid "Choose subtree to place user in"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:202
+#: plugins/personal/generic/generic.tpl:196
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:223
+#: plugins/personal/generic/generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:240
+#: plugins/personal/generic/generic.tpl:234
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:243
+#: plugins/personal/generic/generic.tpl:237
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:251
-msgid "Last logon"
+#: plugins/personal/generic/generic.tpl:250
+msgid "Restrict login to"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:256
+msgid "IP or network"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:267
+#: plugins/personal/generic/generic.tpl:275
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:303
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:311
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:329
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/generic.tpl:337
+#: plugins/personal/generic/generic.tpl:519
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr ""
 
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/personal/generic/generic.tpl:533
 msgid "Please use the phone tab"
 msgstr ""
 
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -4381,156 +4623,154 @@ msgstr ""
 msgid "Edit users POSIX settings"
 msgstr ""
 
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:168
 msgid "expired"
 msgstr ""
 
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:156
+#: plugins/personal/posix/class_posixAccount.inc:170
 msgid "grace time active"
 msgstr ""
 
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "password not changeable"
 msgstr ""
 
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:161
+#: plugins/personal/posix/class_posixAccount.inc:175
 msgid "password expired"
 msgstr ""
 
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:233
 msgid "unconfigured"
 msgstr ""
 
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:219
+#: plugins/personal/posix/class_posixAccount.inc:244
 msgid "automatic"
 msgstr ""
 
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/personal/posix/class_posixAccount.inc:297
-#: plugins/personal/posix/class_posixAccount.inc:300
-msgid "POSIX"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:471
+#: plugins/personal/posix/class_posixAccount.inc:510
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:514
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:479
+#: plugins/personal/posix/class_posixAccount.inc:518
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:483
+#: plugins/personal/posix/class_posixAccount.inc:522
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:837
+#: plugins/personal/posix/class_posixAccount.inc:861
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:895
-#: plugins/personal/posix/class_posixAccount.inc:1203
+#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:1237
 msgid "Group of user"
 msgstr ""
 
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:990
+#: plugins/personal/posix/class_posixAccount.inc:1014
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1066
-#: plugins/personal/posix/class_posixAccount.inc:1069
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/posix/class_posixAccount.inc:1095
+#: plugins/personal/posix/class_posixAccount.inc:1098
+#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1176
+#: plugins/personal/posix/class_posixAccount.inc:1576
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1077
-#: plugins/personal/posix/class_posixAccount.inc:1080
-#: plugins/personal/posix/generic.tpl:57
-#: plugins/personal/posix/paste_generic.tpl:28
+#: plugins/personal/posix/class_posixAccount.inc:1106
+#: plugins/personal/posix/class_posixAccount.inc:1109
+#: plugins/personal/posix/generic.tpl:63
+#: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr ""
 
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
-#: plugins/personal/posix/class_posixAccount.inc:1148
+#: plugins/personal/posix/class_posixAccount.inc:1129
+#: plugins/personal/posix/class_posixAccount.inc:1182
 msgid "shadowMin"
 msgstr ""
 
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1100
-#: plugins/personal/posix/class_posixAccount.inc:1153
+#: plugins/personal/posix/class_posixAccount.inc:1134
+#: plugins/personal/posix/class_posixAccount.inc:1187
 msgid "shadowMax"
 msgstr ""
 
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1105
-#: plugins/personal/posix/class_posixAccount.inc:1158
+#: plugins/personal/posix/class_posixAccount.inc:1139
+#: plugins/personal/posix/class_posixAccount.inc:1192
 msgid "shadowWarning"
 msgstr ""
 
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1119
-#: plugins/personal/posix/class_posixAccount.inc:1172
+#: plugins/personal/posix/class_posixAccount.inc:1153
+#: plugins/personal/posix/class_posixAccount.inc:1206
 msgid "shadowInactive"
 msgstr ""
 
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1560
+#: plugins/personal/posix/class_posixAccount.inc:1566
 msgid "POSIX account"
 msgstr ""
 
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1572
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1573
+#: plugins/personal/posix/class_posixAccount.inc:1579
 msgid "Group ID"
 msgstr ""
 
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1575
+#: plugins/personal/posix/class_posixAccount.inc:1581
 msgid "Force password change on login"
 msgstr ""
 
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Shadow min"
 msgstr ""
 
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow max"
 msgstr ""
 
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow warning"
 msgstr ""
 
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow inactive"
 msgstr ""
 
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow expire"
 msgstr ""
 
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1587
+msgid "Public SSH key"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "System trust model"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:25
 msgid "System trust model"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:25
+#: plugins/personal/posix/paste_generic.tpl:17
 msgid "Primary group"
 msgstr ""
 
 msgid "Primary group"
 msgstr ""
 
@@ -4538,30 +4778,42 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:53
-#: plugins/personal/posix/paste_generic.tpl:23
+#: plugins/personal/posix/generic.tpl:41
+msgid "Last logon"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:59
+#: plugins/personal/posix/paste_generic.tpl:31
 msgid "Force UID/GID"
 msgstr ""
 
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:83
-#: plugins/personal/posix/paste_generic.tpl:47
+#: plugins/personal/posix/generic.tpl:89
+#: plugins/personal/posix/paste_generic.tpl:55
 msgid "Group membership"
 msgstr ""
 
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:85
-#: plugins/personal/posix/paste_generic.tpl:54
+#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/paste_generic.tpl:62
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:94
+#: plugins/personal/posix/generic.tpl:100
 msgid "Common group"
 msgstr ""
 
 msgid "Common group"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:98
-msgid "Non common group"
+#: plugins/personal/posix/generic.tpl:104
+msgid "Groups differ"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:119
+#: plugins/personal/posix/generic.tpl:127
+msgid "SSH keys"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:128
+msgid "Edit public ssh keys..."
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:132
 msgid "Account"
 msgstr ""
 
 msgid "Account"
 msgstr ""
 
@@ -4645,7 +4897,7 @@ msgstr ""
 msgid "You have no permission to change your password."
 msgstr ""
 
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:141
+#: plugins/personal/password/class_password.inc:146
 msgid "User password"
 msgstr ""
 
 msgid "User password"
 msgstr ""
 
@@ -4777,70 +5029,50 @@ msgid "Enable Copy & Paste"
 msgstr ""
 
 #: setup/setup_config2.tpl:112
 msgstr ""
 
 #: setup/setup_config2.tpl:112
-msgid "Enable DNS extension"
-msgstr ""
-
-#: setup/setup_config2.tpl:124
-msgid "Enable DHCP extension"
-msgstr ""
-
-#: setup/setup_config2.tpl:136
-msgid "Enable mime type management"
-msgstr ""
-
-#: setup/setup_config2.tpl:148
-msgid "Enable FAI release management"
-msgstr ""
-
-#: setup/setup_config2.tpl:160
-msgid "Enable user netatalk plugin"
-msgstr ""
-
-#: setup/setup_config2.tpl:171
 msgid "Government mode"
 msgstr ""
 
 msgid "Government mode"
 msgstr ""
 
-#: setup/setup_config2.tpl:182
+#: setup/setup_config2.tpl:123
 msgid "Logging options"
 msgstr ""
 
 msgid "Logging options"
 msgstr ""
 
-#: setup/setup_config2.tpl:186
+#: setup/setup_config2.tpl:127
 msgid "Syslog"
 msgstr ""
 
 msgid "Syslog"
 msgstr ""
 
-#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
 msgid "MySQL"
 msgstr ""
 
 msgid "MySQL"
 msgstr ""
 
-#: setup/setup_config2.tpl:193
+#: setup/setup_config2.tpl:134
 msgid "Mail settings"
 msgstr ""
 
 msgid "Mail settings"
 msgstr ""
 
-#: setup/setup_config2.tpl:197
+#: setup/setup_config2.tpl:138
 msgid "Mail method"
 msgstr ""
 
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:213
+#: setup/setup_config2.tpl:154
 msgid "Account identification attribute"
 msgstr ""
 
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:227
+#: setup/setup_config2.tpl:168
 msgid "Vacation templates"
 msgstr ""
 
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:243
+#: setup/setup_config2.tpl:184
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:253
+#: setup/setup_config2.tpl:194
 msgid "Snapshots / Undo"
 msgstr ""
 
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
+#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
 msgid "Enable snapshots"
 msgstr ""
 
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
+#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
 msgid "Snapshot base"
 msgstr ""
 
 msgid "Snapshot base"
 msgstr ""
 
@@ -4888,10 +5120,10 @@ msgstr ""
 #: setup/setup_migrate.tpl:54 setup/class_setupStep_Migrate.inc:376
 #: setup/class_setupStep_Migrate.inc:665 setup/class_setupStep_Migrate.inc:805
 #: setup/class_setupStep_Migrate.inc:1034
 #: setup/setup_migrate.tpl:54 setup/class_setupStep_Migrate.inc:376
 #: setup/class_setupStep_Migrate.inc:665 setup/class_setupStep_Migrate.inc:805
 #: setup/class_setupStep_Migrate.inc:1034
-#: setup/class_setupStep_Migrate.inc:2127
-#: setup/class_setupStep_Migrate.inc:2568
-#: setup/class_setupStep_Migrate.inc:2722
-#: setup/class_setupStep_Migrate.inc:3052
+#: setup/class_setupStep_Migrate.inc:2132
+#: setup/class_setupStep_Migrate.inc:2575
+#: setup/class_setupStep_Migrate.inc:2729
+#: setup/class_setupStep_Migrate.inc:3059
 msgid "Migrate"
 msgstr ""
 
 msgid "Migrate"
 msgstr ""
 
@@ -5067,17 +5299,17 @@ msgstr ""
 msgid "Finish - write the configuration file"
 msgstr ""
 
 msgid "Finish - write the configuration file"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:100
+#: setup/class_setupStep_Finish.inc:104
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
 msgstr ""
 
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:102
+#: setup/class_setupStep_Finish.inc:106
 msgid "The configuration is currently not readable or it does not exists."
 msgstr ""
 
 msgid "The configuration is currently not readable or it does not exists."
 msgstr ""
 
-#: setup/class_setupStep_Finish.inc:111
+#: setup/class_setupStep_Finish.inc:115
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
 #, php-format
 msgid ""
 "After downloading and placing the file under %s, please make sure that the "
@@ -5153,136 +5385,136 @@ msgid ""
 "Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
 msgstr ""
 
 "Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:152
+#: setup/class_setupStep_Checks.inc:153
 msgid "imagick"
 msgstr ""
 
 msgid "imagick"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:153
+#: setup/class_setupStep_Checks.inc:154
 msgid "GOsa requires this extension to handle images."
 msgstr ""
 
 msgid "GOsa requires this extension to handle images."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:159
+#: setup/class_setupStep_Checks.inc:169
 msgid "compression module"
 msgstr ""
 
 msgid "compression module"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:160
+#: setup/class_setupStep_Checks.inc:170
 msgid "GOsa requires this extension to handle snapshots."
 msgstr ""
 
 msgid "GOsa requires this extension to handle snapshots."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:171
+#: setup/class_setupStep_Checks.inc:181
 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 ""
 
 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:172
+#: setup/class_setupStep_Checks.inc:182
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:180
+#: setup/class_setupStep_Checks.inc:190
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
 msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:181
+#: setup/class_setupStep_Checks.inc:191
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:182
+#: setup/class_setupStep_Checks.inc:192
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:189 setup/class_setupStep_Checks.inc:205
-#: setup/class_setupStep_Checks.inc:221 setup/class_setupStep_Checks.inc:237
+#: setup/class_setupStep_Checks.inc:199 setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:231 setup/class_setupStep_Checks.inc:247
 msgid "Off"
 msgstr ""
 
 msgid "Off"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:190
+#: setup/class_setupStep_Checks.inc:200
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini should be set to 'Off'."
 msgstr ""
 
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:191
+#: setup/class_setupStep_Checks.inc:201
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:198
+#: setup/class_setupStep_Checks.inc:208
 msgid ""
 "GOsa needs at least 32MB of memory. Setting it below this limit may cause "
 "errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
 msgid ""
 "GOsa needs at least 32MB 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:199
+#: setup/class_setupStep_Checks.inc:209
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:206
+#: setup/class_setupStep_Checks.inc:216
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:207
+#: setup/class_setupStep_Checks.inc:217
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:214
+#: setup/class_setupStep_Checks.inc:224
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
 msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:215
+#: setup/class_setupStep_Checks.inc:225
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 
 msgid ""
 "Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:222
+#: setup/class_setupStep_Checks.inc:232
 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 ""
 
 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:223
+#: setup/class_setupStep_Checks.inc:233
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:229
+#: setup/class_setupStep_Checks.inc:239
 msgid "On"
 msgstr ""
 
 msgid "On"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:230
+#: setup/class_setupStep_Checks.inc:240
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:231
+#: setup/class_setupStep_Checks.inc:241
 msgid "Search for 'magic_quotes_gpc' in your php.ini and set it to 'On'."
 msgstr ""
 
 msgid "Search for 'magic_quotes_gpc' in your php.ini and set it to 'On'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:238
+#: setup/class_setupStep_Checks.inc:248
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:239
+#: setup/class_setupStep_Checks.inc:249
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 
 msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:249
+#: setup/class_setupStep_Checks.inc:259
 msgid "Configuration writeable"
 msgstr ""
 
 msgid "Configuration writeable"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:250
+#: setup/class_setupStep_Checks.inc:260
 msgid "The configuration file can't be written"
 msgstr ""
 
 msgid "The configuration file can't be written"
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:251
+#: setup/class_setupStep_Checks.inc:261
 #, php-format
 msgid ""
 "GOsa reads its configuration from a file located in (%s/%s). The setup can "
 #, php-format
 msgid ""
 "GOsa reads its configuration from a file located in (%s/%s). The setup can "
@@ -5337,59 +5569,67 @@ msgstr ""
 msgid "Enable edit locking"
 msgstr ""
 
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl:172
+#: setup/setup_config3.tpl:174
+msgid "Gosa support daemon"
+msgstr ""
+
+#: setup/setup_config3.tpl:193
+msgid "Daemon timeout"
+msgstr ""
+
+#: setup/setup_config3.tpl:207
 msgid "Login and session"
 msgstr ""
 
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:175
+#: setup/setup_config3.tpl:210
 msgid "Login attribute"
 msgstr ""
 
 msgid "Login attribute"
 msgstr ""
 
-#: setup/setup_config3.tpl:186
+#: setup/setup_config3.tpl:221
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:198
+#: setup/setup_config3.tpl:233
 msgid "Enforce encrypted connections"
 msgstr ""
 
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: setup/setup_config3.tpl:210
+#: setup/setup_config3.tpl:245
 msgid "Warn if session is not encrypted"
 msgstr ""
 
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: setup/setup_config3.tpl:222
+#: setup/setup_config3.tpl:257
 msgid "Remember dialog filter settings"
 msgstr ""
 
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: setup/setup_config3.tpl:234
+#: setup/setup_config3.tpl:269
 msgid "Session lifetime"
 msgstr ""
 
 msgid "Session lifetime"
 msgstr ""
 
-#: setup/setup_config3.tpl:243
+#: setup/setup_config3.tpl:278
 msgid "Debugging"
 msgstr ""
 
 msgid "Debugging"
 msgstr ""
 
-#: setup/setup_config3.tpl:247
+#: setup/setup_config3.tpl:282
 msgid "Show PHP errors"
 msgstr ""
 
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl:259
+#: setup/setup_config3.tpl:294
 msgid "Maximum LDAP query time"
 msgstr ""
 
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: setup/setup_config3.tpl:277
+#: setup/setup_config3.tpl:312
 msgid "Log LDAP statistics"
 msgstr ""
 
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:289
+#: setup/setup_config3.tpl:324
 msgid "Debug level"
 msgstr ""
 
 msgid "Debug level"
 msgstr ""
 
-#: setup/setup_config3.tpl:294 setup/setup_config3.tpl:297
+#: setup/setup_config3.tpl:329 setup/setup_config3.tpl:332
 msgid "Disabled"
 msgstr ""
 
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl:295 setup/setup_config3.tpl:298
+#: setup/setup_config3.tpl:330 setup/setup_config3.tpl:333
 msgid "Enabled"
 msgstr ""
 
 msgid "Enabled"
 msgstr ""
 
@@ -5427,16 +5667,16 @@ msgid "Did the setup procedure help you to get started?"
 msgstr ""
 
 #: setup/setup_feedback.tpl:62 setup/setup_feedback.tpl:80
 msgstr ""
 
 #: setup/setup_feedback.tpl:62 setup/setup_feedback.tpl:80
-#: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:89
+#: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:93
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Config2.inc:167
+#: setup/class_setupStep_Config2.inc:137
 msgid "Yes"
 msgstr ""
 
 #: setup/setup_feedback.tpl:64 setup/setup_feedback.tpl:82
 msgid "Yes"
 msgstr ""
 
 #: setup/setup_feedback.tpl:64 setup/setup_feedback.tpl:82
-#: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:89
+#: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:93
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Config2.inc:167
+#: setup/class_setupStep_Config2.inc:137
 msgid "No"
 msgstr ""
 
 msgid "No"
 msgstr ""
 
@@ -5500,11 +5740,15 @@ msgstr ""
 msgid "Create your configuration file"
 msgstr ""
 
 msgid "Create your configuration file"
 msgstr ""
 
-#: setup/setup_finish.tpl:13
+#: setup/setup_finish.tpl:10
+msgid "Depending on the user name your webserver is running on:"
+msgstr ""
+
+#: setup/setup_finish.tpl:28
 msgid "Download configuration"
 msgstr ""
 
 msgid "Download configuration"
 msgstr ""
 
-#: setup/setup_finish.tpl:18
+#: setup/setup_finish.tpl:33
 msgid "Status: "
 msgstr ""
 
 msgid "Status: "
 msgstr ""
 
@@ -5627,7 +5871,7 @@ msgid "Checking for invisible users"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:165
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:165
-#: setup/class_setupStep_Migrate.inc:3203
+#: setup/class_setupStep_Migrate.inc:3210
 msgid "Checking for super administrator"
 msgstr ""
 
 msgid "Checking for super administrator"
 msgstr ""
 
@@ -5668,10 +5912,10 @@ msgstr ""
 #: setup/class_setupStep_Migrate.inc:492 setup/class_setupStep_Migrate.inc:569
 #: setup/class_setupStep_Migrate.inc:654 setup/class_setupStep_Migrate.inc:795
 #: setup/class_setupStep_Migrate.inc:891
 #: setup/class_setupStep_Migrate.inc:492 setup/class_setupStep_Migrate.inc:569
 #: setup/class_setupStep_Migrate.inc:654 setup/class_setupStep_Migrate.inc:795
 #: setup/class_setupStep_Migrate.inc:891
-#: setup/class_setupStep_Migrate.inc:2032
-#: setup/class_setupStep_Migrate.inc:2498
-#: setup/class_setupStep_Migrate.inc:2689
-#: setup/class_setupStep_Migrate.inc:2826
+#: setup/class_setupStep_Migrate.inc:2037
+#: setup/class_setupStep_Migrate.inc:2505
+#: setup/class_setupStep_Migrate.inc:2696
+#: setup/class_setupStep_Migrate.inc:2833
 msgid "LDAP query failed"
 msgstr ""
 
 msgid "LDAP query failed"
 msgstr ""
 
@@ -5680,10 +5924,10 @@ msgstr ""
 #: setup/class_setupStep_Migrate.inc:493 setup/class_setupStep_Migrate.inc:570
 #: setup/class_setupStep_Migrate.inc:655 setup/class_setupStep_Migrate.inc:796
 #: setup/class_setupStep_Migrate.inc:892
 #: setup/class_setupStep_Migrate.inc:493 setup/class_setupStep_Migrate.inc:570
 #: setup/class_setupStep_Migrate.inc:655 setup/class_setupStep_Migrate.inc:796
 #: setup/class_setupStep_Migrate.inc:892
-#: setup/class_setupStep_Migrate.inc:2033
-#: setup/class_setupStep_Migrate.inc:2499
-#: setup/class_setupStep_Migrate.inc:2690
-#: setup/class_setupStep_Migrate.inc:2827
+#: setup/class_setupStep_Migrate.inc:2038
+#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2697
+#: setup/class_setupStep_Migrate.inc:2834
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
@@ -5701,12 +5945,12 @@ msgstr ""
 #: setup/class_setupStep_Migrate.inc:597
 #: setup/class_setupStep_Migrate.inc:1031
 #: setup/class_setupStep_Migrate.inc:1049
 #: setup/class_setupStep_Migrate.inc:597
 #: setup/class_setupStep_Migrate.inc:1031
 #: setup/class_setupStep_Migrate.inc:1049
-#: setup/class_setupStep_Migrate.inc:1984
-#: setup/class_setupStep_Migrate.inc:1997
-#: setup/class_setupStep_Migrate.inc:2052
-#: setup/class_setupStep_Migrate.inc:2073
-#: setup/class_setupStep_Migrate.inc:2125
-#: setup/class_setupStep_Migrate.inc:3205
+#: setup/class_setupStep_Migrate.inc:1989
+#: setup/class_setupStep_Migrate.inc:2002
+#: setup/class_setupStep_Migrate.inc:2057
+#: setup/class_setupStep_Migrate.inc:2078
+#: setup/class_setupStep_Migrate.inc:2130
+#: setup/class_setupStep_Migrate.inc:3212
 msgid "Failed"
 msgstr ""
 
 msgid "Failed"
 msgstr ""
 
@@ -5742,7 +5986,7 @@ msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:713 setup/class_setupStep_Migrate.inc:856
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:713 setup/class_setupStep_Migrate.inc:856
-#: setup/class_setupStep_Migrate.inc:1116
+#: setup/class_setupStep_Migrate.inc:1119
 msgid "Migration error"
 msgstr ""
 
 msgid "Migration error"
 msgstr ""
 
@@ -5769,121 +6013,121 @@ msgstr ""
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1116
+#: setup/class_setupStep_Migrate.inc:1119
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1154
-#: setup/class_setupStep_Migrate.inc:1164
+#: setup/class_setupStep_Migrate.inc:1157
+#: setup/class_setupStep_Migrate.inc:1167
 msgid "Input error"
 msgstr ""
 
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1157
 msgid "Uid"
 msgstr ""
 
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1159
+#: setup/class_setupStep_Migrate.inc:1162
 msgid "Password error"
 msgstr ""
 
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1159
+#: setup/class_setupStep_Migrate.inc:1162
 msgid "Provided passwords do not match!"
 msgstr ""
 
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1164
+#: setup/class_setupStep_Migrate.inc:1167
 msgid "Specify a valid user ID!"
 msgstr ""
 
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1200
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1236
-#: setup/class_setupStep_Migrate.inc:1285
-#: setup/class_setupStep_Migrate.inc:1334
+#: setup/class_setupStep_Migrate.inc:1239
+#: setup/class_setupStep_Migrate.inc:1288
+#: setup/class_setupStep_Migrate.inc:1337
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1249
 msgid "Winstation will be moved from"
 msgstr ""
 
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1257
-#: setup/class_setupStep_Migrate.inc:1306
+#: setup/class_setupStep_Migrate.inc:1260
+#: setup/class_setupStep_Migrate.inc:1309
 msgid "Updating following references too"
 msgstr ""
 
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1296
+#: setup/class_setupStep_Migrate.inc:1299
 msgid "Group will be moved from"
 msgstr ""
 
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1344
+#: setup/class_setupStep_Migrate.inc:1347
 msgid "User will be moved from"
 msgstr ""
 
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1354
+#: setup/class_setupStep_Migrate.inc:1357
 msgid "The following references will be updated"
 msgstr ""
 
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1985
+#: setup/class_setupStep_Migrate.inc:1990
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1986
-#: setup/class_setupStep_Migrate.inc:1999
+#: setup/class_setupStep_Migrate.inc:1991
+#: setup/class_setupStep_Migrate.inc:2004
 msgid "Try to create root object"
 msgstr ""
 
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1998
+#: setup/class_setupStep_Migrate.inc:2003
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2053
+#: setup/class_setupStep_Migrate.inc:2058
 #, php-format
 msgid "Missing GOsa object class '%s'!"
 msgstr ""
 
 #, php-format
 msgid "Missing GOsa object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2054
+#: setup/class_setupStep_Migrate.inc:2059
 msgid "Please check your installation."
 msgstr ""
 
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2075
+#: setup/class_setupStep_Migrate.inc:2080
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
 #, 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:2432
+#: setup/class_setupStep_Migrate.inc:2439
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2567
+#: setup/class_setupStep_Migrate.inc:2574
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2627
+#: setup/class_setupStep_Migrate.inc:2634
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
-#: setup/class_setupStep_Migrate.inc:2764
+#: setup/class_setupStep_Migrate.inc:2654
+#: setup/class_setupStep_Migrate.inc:2771
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2720
+#: setup/class_setupStep_Migrate.inc:2727
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:3051
+#: setup/class_setupStep_Migrate.inc:3058
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -5947,19 +6191,19 @@ msgstr ""
 msgid "I have read the license and accept it"
 msgstr ""
 
 msgid "I have read the license and accept it"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:77 setup/class_setupStep_Config3.inc:78
+#: setup/class_setupStep_Config3.inc:81 setup/class_setupStep_Config3.inc:82
 msgid "GOsa settings 3/3"
 msgstr ""
 
 msgid "GOsa settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:79
+#: setup/class_setupStep_Config3.inc:83
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:198
+#: setup/class_setupStep_Config3.inc:212
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:202
+#: setup/class_setupStep_Config3.inc:216
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -6208,11 +6452,11 @@ msgstr ""
 msgid "The given password differ value is not numeric."
 msgstr ""
 
 msgid "The given password differ value is not numeric."
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:80 setup/class_setupStep_Config2.inc:81
 msgid "GOsa settings 2/3"
 msgstr ""
 
 msgid "GOsa settings 2/3"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:88
+#: setup/class_setupStep_Config2.inc:82
 msgid "Customize special parameters"
 msgstr ""
 
 msgid "Customize special parameters"
 msgstr ""