Updated objectclass condition

[gosa.git] / gosa-core / locale / core / messages.po

diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po
index e7e3c0670f234df44a130f80a52ae3fc82d68a97..e97164044ac301bcba4cd0e557a42f307dc4be1f 100644 (file)
--- a/gosa-core/locale/core/messages.po
+++ b/gosa-core/locale/core/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-03 13:15+0200\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"
@@ -35,25 +35,25 @@ msgstr ""
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
-#: html/index.php:63 html/index.php:416 html/index.php:422
-#: include/functions.inc:759 include/functions.inc:2185
-#: include/functions.inc:2189 include/functions.inc:2195
+#: 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:1091
+#: plugins/admin/groups/class_groupGeneric.inc:1080
 #: plugins/admin/users/remove.tpl:2
 #: 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/personal/posix/class_posixAccount.inc:878
-#: plugins/personal/posix/class_posixAccount.inc:1031
+#: 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: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 ""
@@ -104,7 +104,7 @@ 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
-#: plugins/admin/users/class_divListUsers.inc:80
+#: plugins/admin/users/class_divListUsers.inc:81
 msgid "Username"
 msgstr ""
 
@@ -192,7 +192,6 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
-#: plugins/personal/generic/generic.tpl:137
 #, php-format
 msgid "Set"
 msgstr ""
@@ -288,8 +287,8 @@ msgid "Verify password"
 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 ""
@@ -381,17 +380,21 @@ msgid "Continue"
 msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:57
-#: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:223
-#: html/index.php:227 include/password-methods/class_password-methods.inc:250
-#: 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: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:1172
-#: include/class_gosaSupportDaemon.inc:1192
+#: 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: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
@@ -400,22 +403,20 @@ msgstr ""
 #: 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:1250
-#: plugins/personal/generic/class_user.inc:256
-#: plugins/personal/generic/class_user.inc:422
-#: plugins/personal/generic/class_user.inc:523
-#: plugins/personal/generic/class_user.inc:831
-#: plugins/personal/generic/class_user.inc:1188
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1211
-#: plugins/personal/generic/class_user.inc:1467
+#: 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/posix/class_posixAccount.inc:1428
-#: 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"
@@ -431,11 +432,11 @@ msgstr ""
 #: 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"
@@ -453,7 +454,7 @@ msgstr ""
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:41 html/main.php:338
+#: 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
@@ -558,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
-#: 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?"
@@ -590,20 +591,20 @@ msgstr ""
 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 ""
 
-#: 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
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:651
-#: include/functions.inc:2548 include/functions.inc:2572
-#: include/functions.inc:2585 include/utils/class_timezone.inc:47
-#: include/class_config.inc:124 include/class_config.inc:636
+#: 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
@@ -611,17 +612,17 @@ msgstr ""
 #: 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 ""
 
-#: 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 ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:613
+#: html/password.php:159 plugins/personal/generic/class_user.inc:566
 msgid "Password method"
 msgstr ""
 
@@ -646,16 +647,16 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: plugins/personal/generic/class_user.inc:1310
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1337
-#: plugins/personal/generic/class_user.inc:1339
+#: 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 ""
 
-#: html/password.php:224 html/index.php:324
+#: html/password.php:224 html/index.php:321
 msgid "Please check the username/password combination."
 msgstr ""
 
@@ -667,11 +668,11 @@ 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 ""
 
-#: html/password.php:280 html/index.php:416
+#: html/password.php:280 html/index.php:413
 msgid "Enter SSL session"
 msgstr ""
 
@@ -685,39 +686,39 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:164
+#: html/index.php:165
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:216
 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 ""
 
-#: html/index.php:227
+#: html/index.php:228
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:253 html/index.php:268 html/index.php:281
+#: 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:550 include/functions.inc:365
+#: 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:2527
-#: include/functions.inc:2774 include/class_plugin.inc:1280
+#: 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:709
-#: include/class_ldap.inc:1175 include/class_config.inc:266
+#: 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/groups/class_groupGeneric.inc:785
-#: plugins/admin/groups/class_groupGeneric.inc:1115
+#: 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
@@ -725,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/personal/generic/class_user.inc:734
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/personal/posix/class_posixAccount.inc:719
-#: plugins/personal/posix/class_posixAccount.inc:1048
-#: 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 ""
 
-#: html/index.php:268
+#: html/index.php:265
 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 ""
 
-#: html/index.php:302
+#: html/index.php:299
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:302
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:317
+#: html/index.php:314
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:317
+#: html/index.php:314
 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 ""
 
-#: html/index.php:422
+#: html/index.php:419
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -801,28 +802,28 @@ msgstr ""
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:284
+#: html/main.php:285
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:338
+#: html/main.php:339
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:348
+#: html/main.php:349
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:349
+#: html/main.php:350
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:363
+#: html/main.php:364
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:364
+#: html/main.php:365
 #, php-format
 msgid ""
 "FATAL: not all POST variables have been transfered by PHP - please inform "
@@ -922,12 +923,12 @@ msgstr ""
 
 #: 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:1634
+#: plugins/personal/generic/class_user.inc:1596
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1304
+#: 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"
@@ -936,7 +937,7 @@ msgstr ""
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260
 #: include/class_baseSelectDialog.inc:49 include/class_listing.inc:234
-#: include/class_listing.inc:897 include/class_listing.inc:899
+#: include/class_listing.inc:914 include/class_listing.inc:916
 #: plugins/admin/acl/class_aclRole.inc:392
 msgid "Up"
 msgstr ""
@@ -948,7 +949,7 @@ msgstr ""
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
 #: 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
@@ -1034,9 +1035,9 @@ msgstr ""
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:474 include/functions.inc:641
 #: include/functions.inc:738 include/functions.inc:1121
-#: include/functions.inc:1943 include/functions.inc:1977
-#: include/functions.inc:1997 include/class_ldap.inc:649
-#: include/class_ldap.inc:697 include/class_log.inc:88
+#: 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"
@@ -1066,8 +1067,12 @@ msgstr ""
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
+#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+msgid "inactive"
+msgstr ""
+
 #: include/class_acl.inc:1082
-msgid "ACL takes effect for all users"
+msgid "No members"
 msgstr ""
 
 #: include/class_acl.inc:1252
@@ -1084,51 +1089,51 @@ msgid "Close"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:889
+#: 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
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:889
-#: include/class_listing.inc:891
+#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_listing.inc:908
 msgid "Root"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:897
+#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
 msgid "Go up one department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:905
+#: 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
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:905
-#: include/class_listing.inc:907
+#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_listing.inc:924
 msgid "Home"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:912
+#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
 msgid "Reload list"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:912
+#: 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/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 ""
 
-#: include/class_MultiSelectWindow.inc:550
+#: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
@@ -1154,27 +1159,29 @@ msgstr ""
 
 #: 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/groups/class_groupGeneric.inc:1309
-#: 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_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/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/personal/generic/class_user.inc:1648
-#: 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 ""
@@ -1186,7 +1193,7 @@ msgstr ""
 #: 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:74
+#: 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
@@ -1196,52 +1203,52 @@ msgstr ""
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:469
+#: include/class_listing.inc:470
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1242 include/class_listing.inc:1292
+#: include/class_listing.inc:1259 include/class_listing.inc:1309
 #: include/class_plugin.inc:2071
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1248 include/class_listing.inc:1282
+#: include/class_listing.inc:1265 include/class_listing.inc:1299
 #: include/class_plugin.inc:2075
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1256 include/class_listing.inc:1258
+#: 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:1282 include/class_plugin.inc:2029
+#: include/class_listing.inc:1299 include/class_plugin.inc:2029
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1292 include/class_plugin.inc:2037
+#: include/class_listing.inc:1309 include/class_plugin.inc:2037
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1324 include/class_listing.inc:1326
+#: include/class_listing.inc:1341 include/class_listing.inc:1343
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1340
+#: include/class_listing.inc:1357
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1376
+#: 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:1385 include/class_plugin.inc:2010
+#: include/class_listing.inc:1402 include/class_plugin.inc:2010
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1386 include/class_plugin.inc:2011
+#: include/class_listing.inc:1403 include/class_plugin.inc:2011
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -1305,7 +1312,7 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr ""
 
@@ -1334,150 +1341,181 @@ msgstr ""
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1820 include/class_filter.inc:268
+#: include/functions.inc:1823 include/class_filter.inc:268
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1864
+#: include/functions.inc:1867
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1943
+#: include/functions.inc:1946
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1977 include/functions.inc:1997
+#: include/functions.inc:1980 include/functions.inc:2000
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2185 include/functions.inc:2189
-#: include/functions.inc:2195
+#: include/functions.inc:2188 include/functions.inc:2192
+#: include/functions.inc:2198
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2217
+#: include/functions.inc:2220
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2217
+#: include/functions.inc:2220
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2243
+#: include/functions.inc:2246
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2250
+#: include/functions.inc:2253
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2293
+#: include/functions.inc:2298
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2295
+#: include/functions.inc:2301
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2301
+#: include/functions.inc:2306
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2303
-#, php-format
-msgid "Version mismatch for optional object class '%s' (!=%s)!"
-msgstr ""
-
-#: include/functions.inc:2307
+#: include/functions.inc:2309
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2329
+#: 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 ""
 
-#: include/functions.inc:2330
+#: include/functions.inc:2332
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2334
+#: 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 ""
 
-#: include/functions.inc:2335
+#: include/functions.inc:2337
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2359
+#: include/functions.inc:2361
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2360
+#: include/functions.inc:2362
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2363
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2362
+#: include/functions.inc:2364
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2363
+#: include/functions.inc:2365
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2364
+#: include/functions.inc:2366
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2365
+#: include/functions.inc:2367
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2367
+#: include/functions.inc:2369
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2368
+#: include/functions.inc:2370
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2369
+#: include/functions.inc:2371
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:2547
+#: include/functions.inc:2549
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2572
+#: include/functions.inc:2574
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2585
+#: include/functions.inc:2587
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
+#: 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 ""
@@ -1509,13 +1547,15 @@ msgstr ""
 
 #: 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/groups/class_groupGeneric.inc:1308
+#: 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_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
@@ -1524,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/domain.tpl:19
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/organization.tpl:19
@@ -1539,7 +1580,11 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
-#: include/exporter/class_pdfExporter.inc:142
+#: 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 ""
 
@@ -1668,9 +1713,9 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: include/class_plugin.inc:1800 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 ""
 
@@ -1981,7 +2026,7 @@ 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 ""
@@ -2269,35 +2314,35 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:649
+#: include/class_ldap.inc:665
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:697
+#: include/class_ldap.inc:713
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:784
+#: include/class_ldap.inc:800
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:786
+#: include/class_ldap.inc:802
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1008
+#: 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 ""
 
-#: include/class_ldap.inc:1037
+#: include/class_ldap.inc:1053
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2344,22 +2389,22 @@ msgstr ""
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1172
+#: include/class_gosaSupportDaemon.inc:1174
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1192
+#: include/class_gosaSupportDaemon.inc:1194
 #, 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 ""
 
-#: include/class_config.inc:266
+#: include/class_config.inc:270
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
@@ -2385,8 +2430,8 @@ 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 ""
 
@@ -2436,12 +2481,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_groupGeneric.inc:1298
+#: 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/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
@@ -2455,8 +2500,8 @@ msgstr ""
 #: 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 ""
@@ -2464,10 +2509,10 @@ 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/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:315
+#: plugins/personal/posix/class_posixAccount.inc:320
 msgid "Samba"
 msgstr ""
 
@@ -2477,7 +2522,7 @@ 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 ""
 
@@ -2495,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/users/class_divListUsers.inc:80
-#: plugins/admin/departments/class_departmentManagement.inc:604
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:301
+#: 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 ""
@@ -2506,15 +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/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/personal/generic/class_user.inc:1348
-#: plugins/personal/generic/class_user.inc:1756
-#: plugins/personal/generic/generic.tpl:352
-#: plugins/personal/generic/generic.tpl:533
+#: 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"
@@ -2600,10 +2646,11 @@ msgstr ""
 
 #: 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/domain.tpl:8
 #: plugins/admin/departments/country.tpl:8
 #: plugins/admin/departments/dcObject.tpl:8
 #: plugins/admin/departments/organization.tpl:7
@@ -2614,8 +2661,8 @@ msgstr ""
 #: 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
@@ -2639,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/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:90
+#: plugins/admin/users/class_divListUsers.inc:93
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2708,7 +2756,7 @@ msgstr ""
 
 #: 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"
@@ -2716,7 +2764,7 @@ msgstr ""
 
 #: 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
@@ -2727,20 +2775,20 @@ msgstr ""
 
 #: 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
-#: 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
-#: 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
@@ -2755,7 +2803,7 @@ msgstr ""
 
 #: 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"
@@ -2773,13 +2821,13 @@ msgstr ""
 
 #: 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/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 ""
@@ -2821,7 +2869,7 @@ msgid "Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:531
-#: plugins/admin/users/class_divListUsers.inc:126
+#: 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"
@@ -2913,21 +2961,21 @@ msgid "winstations"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:521
-#: plugins/personal/posix/class_posixAccount.inc:659
+#: 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
-#: plugins/admin/groups/class_groupGeneric.inc:521
-#: plugins/personal/posix/class_posixAccount.inc:659
+#: 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
-#: plugins/admin/groups/class_groupGeneric.inc:522
-#: plugins/personal/posix/class_posixAccount.inc:660
+#: plugins/admin/groups/class_groupGeneric.inc:512
+#: plugins/personal/posix/class_posixAccount.inc:640
 msgid "allow access to these hosts"
 msgstr ""
 
@@ -2944,15 +2992,15 @@ msgstr ""
 
 #: 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_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:1150
-#: plugins/admin/groups/class_groupGeneric.inc:1162
-#: plugins/admin/groups/class_groupGeneric.inc:1176
-#: plugins/admin/groups/class_groupGeneric.inc:1183
-#: plugins/admin/groups/class_groupGeneric.inc:1307
+#: 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: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
@@ -2961,6 +3009,12 @@ msgstr ""
 #: 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
@@ -2985,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/personal/generic/class_user.inc:1315
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1771 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 ""
@@ -2997,15 +3051,15 @@ 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 ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1132
+#: plugins/admin/ogroups/class_ogroup.inc:1123
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1133
+#: plugins/admin/ogroups/class_ogroup.inc:1124
 msgid "Member"
 msgstr ""
 
@@ -3032,22 +3086,23 @@ 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/departments/domain.tpl:37
 #: plugins/admin/departments/country.tpl:37
 #: plugins/admin/departments/dcObject.tpl:37
 #: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl: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/admin/groups/class_groupGeneric.inc:1315
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 #: plugins/personal/posix/generic.tpl:139
 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:141
+#: 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 ""
@@ -3080,9 +3135,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_divListGroup.inc:198
-#: plugins/admin/users/class_divListUsers.inc:203
+#: plugins/admin/users/class_divListUsers.inc:208
 #: plugins/admin/users/class_userManagement.inc:1086
-#: plugins/personal/posix/class_posixAccount.inc:315
+#: plugins/personal/posix/class_posixAccount.inc:320
 msgid "Environment"
 msgstr ""
 
@@ -3166,7 +3221,7 @@ msgid "Display users of department"
 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 ""
 
@@ -3200,31 +3255,31 @@ 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 ""
 
-#: 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 ""
 
-#: plugins/admin/groups/generic.tpl:140
+#: plugins/admin/groups/generic.tpl:137
 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 ""
 
-#: plugins/admin/groups/generic.tpl:245
+#: plugins/admin/groups/generic.tpl:242
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:249
 msgid "In all groups"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:255
+#: plugins/admin/groups/generic.tpl:252
 msgid "Not in all groups"
 msgstr ""
 
@@ -3275,14 +3330,14 @@ msgid "User name of which groups are shown"
 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
-#: 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 ""
 
@@ -3290,101 +3345,96 @@ 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_groupGeneric.inc:478
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_groupGeneric.inc:478
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_groupGeneric.inc:478
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:489
+#: plugins/admin/groups/class_groupGeneric.inc:479
 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:628
+#: plugins/admin/groups/class_groupGeneric.inc:618
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:712
+#: plugins/admin/groups/class_groupGeneric.inc:702
 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:981
+#: plugins/admin/groups/class_groupGeneric.inc:971
 #, 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1091
+#: plugins/admin/groups/class_groupGeneric.inc:1080
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
-#: plugins/admin/groups/class_groupGeneric.inc:1195
-#: plugins/admin/groups/class_groupGeneric.inc:1311
-#: plugins/personal/posix/class_posixAccount.inc:1130
-#: plugins/personal/posix/class_posixAccount.inc:1133
+#: 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/personal/posix/class_posixAccount.inc:1428
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:1299
+#: plugins/admin/groups/class_groupGeneric.inc:1251
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1313
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1314
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1316
+#: plugins/admin/groups/class_groupGeneric.inc:1268
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1317
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1319
+#: plugins/admin/groups/class_groupGeneric.inc:1271
 msgid "Group member"
 msgstr ""
 
@@ -3416,148 +3466,148 @@ 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:57
 #: plugins/admin/users/user-list.xml:11
 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/class_userManagement.inc:773
 #: plugins/admin/users/user-list.xml:87 plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:84
+#: plugins/admin/users/class_divListUsers.inc:85
 msgid "templates"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:86
 msgid "GOsa object"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:86
 msgid "functional users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:86
+#: plugins/admin/users/class_divListUsers.inc:87
 msgid "POSIX users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:87
+#: plugins/admin/users/class_divListUsers.inc:88
 msgid "mail users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/users/class_divListUsers.inc:89
 msgid "samba users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/users/class_divListUsers.inc:90
 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 ""
 
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:204
 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 ""
 
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:207
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1759
-#: plugins/personal/generic/generic.tpl:377
-#: plugins/personal/generic/generic.tpl:545
+#: 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/admin/users/class_divListUsers.inc:210
+#: plugins/admin/users/class_divListUsers.inc:215
 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 ""
 
-#: plugins/admin/users/class_divListUsers.inc:213
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/users/class_userManagement.inc:1082
 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 ""
 
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:220
 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 ""
 
-#: plugins/admin/users/class_divListUsers.inc:247
-msgid "inactive"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:250
+#: 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 ""
 
-#: plugins/admin/users/class_divListUsers.inc:258
+#: plugins/admin/users/class_divListUsers.inc:263
 #: plugins/admin/users/class_userManagement.inc:611
 msgid "user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:274
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Delete user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:371
+#: plugins/admin/users/class_divListUsers.inc:376
 msgid "Number of listed users"
 msgstr ""
 
@@ -3646,10 +3696,10 @@ msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:779
 #: plugins/admin/users/class_userManagement.inc:853
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1640
-#: plugins/personal/generic/class_user.inc:1768
+#: plugins/personal/generic/class_user.inc:1277
+#: 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 ""
 
@@ -3662,10 +3712,10 @@ msgid "Lock account"
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:1070
-#: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/personal/posix/class_posixAccount.inc:315
-#: plugins/personal/posix/class_posixAccount.inc:317
+#: 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 ""
 
@@ -3786,8 +3836,8 @@ msgstr ""
 #: 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:1664
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/personal/generic/class_user.inc:1626
+#: plugins/personal/generic/generic.tpl:397
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr ""
@@ -3799,8 +3849,8 @@ msgstr ""
 #: 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:1665
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:389
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr ""
@@ -3808,8 +3858,8 @@ msgstr ""
 #: 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:411
+#: 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"
@@ -3822,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_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
+#: plugins/admin/departments/domain.tpl:50
 #: plugins/admin/departments/country.tpl:50
 #: plugins/admin/departments/dcObject.tpl:50
 #: plugins/admin/departments/organization.tpl:114
@@ -3858,7 +3910,7 @@ msgid "Name of locality to create"
 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
@@ -3867,6 +3919,7 @@ msgstr ""
 
 #: 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
@@ -3875,6 +3928,7 @@ msgstr ""
 
 #: 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
@@ -3889,6 +3943,10 @@ 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"
@@ -3919,6 +3977,14 @@ 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"
@@ -3947,28 +4013,26 @@ msgid ""
 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 ""
 
-#: 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_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_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/personal/generic/class_user.inc:1652
-#: plugins/personal/generic/generic.tpl:293
+#: 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"
@@ -3979,7 +4043,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Postal address"
 msgstr ""
 
@@ -3992,6 +4056,14 @@ 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 ""
@@ -4064,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/personal/generic/class_user.inc:1624
-#: plugins/personal/generic/generic.tpl:462
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr ""
@@ -4152,260 +4224,261 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
+#: 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:324
+#: plugins/personal/generic/class_user.inc:283
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:283
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:422
+#: plugins/personal/generic/class_user.inc:381
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:523
+#: plugins/personal/generic/class_user.inc:476
 msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:521
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:578
+#: plugins/personal/generic/class_user.inc:531
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:581
+#: plugins/personal/generic/class_user.inc:534
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:582
+#: plugins/personal/generic/class_user.inc:535
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:587
+#: plugins/personal/generic/class_user.inc:540
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:566
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1188
+#: plugins/personal/generic/class_user.inc:1144
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1211
+#: plugins/personal/generic/class_user.inc:1169
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1240
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1343
-#: plugins/personal/generic/class_user.inc:1670
-#: plugins/personal/generic/class_user.inc:1753
-#: 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/class_user.inc:1354
-#: plugins/personal/generic/class_user.inc:1762
-#: plugins/personal/generic/generic.tpl:361
+#: 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/class_user.inc:1357
-#: plugins/personal/generic/class_user.inc:1765
-#: plugins/personal/generic/generic.tpl:369
+#: 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/class_user.inc:1467
+#: 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 ""
 
-#: plugins/personal/generic/class_user.inc:1613
-#: plugins/personal/generic/generic.tpl:485
+#: 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/class_user.inc:1614
-#: plugins/personal/generic/generic.tpl:510
+#: 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/class_user.inc:1615
-#: plugins/personal/generic/generic.tpl:427
+#: 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/class_user.inc:1616
-#: plugins/personal/generic/generic.tpl:554
+#: 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/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:476
+#: 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/class_user.inc:1618
-#: plugins/personal/generic/generic.tpl:435
+#: 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/class_user.inc:1619
-#: plugins/personal/generic/generic.tpl:444
+#: 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/class_user.inc:1620
-#: plugins/personal/generic/generic.tpl:453
+#: 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/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:563
+#: 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/class_user.inc:1623
-#: plugins/personal/generic/generic.tpl:494
+#: 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/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:502
+#: 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/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1591
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1633
-#: plugins/personal/posix/class_posixAccount.inc:1624
-#: 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 ""
 
-#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1601
 msgid "Surname"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1603
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1604
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1643
+#: 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/class_user.inc:1645
-#: plugins/personal/generic/generic.tpl:119
-msgid "Date of birth"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1608
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/class_user.inc:1609
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/class_user.inc:1617
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:325
+#: 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/class_user.inc:1658
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1659
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1660
+#: plugins/personal/generic/class_user.inc:1622
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1662
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1671
+#: plugins/personal/generic/class_user.inc:1633
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1634
 msgid "User certificates"
 msgstr ""
 
@@ -4433,72 +4506,72 @@ msgstr ""
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:144
+#: plugins/personal/generic/generic.tpl:138
 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/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/generic.tpl:202
+#: plugins/personal/generic/generic.tpl:196
 #: 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/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/generic.tpl:243
+#: plugins/personal/generic/generic.tpl:237
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:250
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:262
+#: plugins/personal/generic/generic.tpl:256
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:281
+#: plugins/personal/generic/generic.tpl:275
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:303
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/generic.tpl:311
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:343
-#: plugins/personal/generic/generic.tpl:525
+#: 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/generic.tpl:539
+#: plugins/personal/generic/generic.tpl:533
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -4566,133 +4639,133 @@ msgstr ""
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:228
+#: plugins/personal/posix/class_posixAccount.inc:233
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:239
+#: plugins/personal/posix/class_posixAccount.inc:244
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:504
+#: plugins/personal/posix/class_posixAccount.inc:510
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:508
+#: plugins/personal/posix/class_posixAccount.inc:514
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:512
+#: plugins/personal/posix/class_posixAccount.inc:518
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/posix/class_posixAccount.inc:522
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:878
+#: plugins/personal/posix/class_posixAccount.inc:861
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:936
-#: plugins/personal/posix/class_posixAccount.inc:1249
+#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:1237
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1031
+#: 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 ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1112
-#: plugins/personal/posix/class_posixAccount.inc:1115
-#: plugins/personal/posix/class_posixAccount.inc:1185
-#: plugins/personal/posix/class_posixAccount.inc:1188
-#: plugins/personal/posix/class_posixAccount.inc:1630
+#: 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/class_posixAccount.inc:1123
-#: plugins/personal/posix/class_posixAccount.inc:1126
+#: 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 ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1141
-#: plugins/personal/posix/class_posixAccount.inc:1194
+#: plugins/personal/posix/class_posixAccount.inc:1129
+#: plugins/personal/posix/class_posixAccount.inc:1182
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1146
-#: plugins/personal/posix/class_posixAccount.inc:1199
+#: plugins/personal/posix/class_posixAccount.inc:1134
+#: plugins/personal/posix/class_posixAccount.inc:1187
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1151
-#: plugins/personal/posix/class_posixAccount.inc:1204
+#: plugins/personal/posix/class_posixAccount.inc:1139
+#: plugins/personal/posix/class_posixAccount.inc:1192
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1165
-#: plugins/personal/posix/class_posixAccount.inc:1218
+#: plugins/personal/posix/class_posixAccount.inc:1153
+#: plugins/personal/posix/class_posixAccount.inc:1206
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1620
+#: plugins/personal/posix/class_posixAccount.inc:1566
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1631
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1632
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1633
+#: plugins/personal/posix/class_posixAccount.inc:1579
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1635
+#: plugins/personal/posix/class_posixAccount.inc:1581
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1636
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1637
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1638
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1639
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1640
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1641
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1642
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "System trust model"
 msgstr ""
 
@@ -4729,7 +4802,7 @@ msgid "Common group"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:104
-msgid "Non common group"
+msgid "Groups differ"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:127
@@ -4824,7 +4897,7 @@ 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 ""
 
@@ -5047,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/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 ""
 
@@ -5798,7 +5871,7 @@ msgid "Checking for invisible users"
 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 ""
 
@@ -5839,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: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 ""
 
@@ -5851,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: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 ""
 
@@ -5872,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: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 ""
 
@@ -5913,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
-#: setup/class_setupStep_Migrate.inc:1116
+#: setup/class_setupStep_Migrate.inc:1119
 msgid "Migration error"
 msgstr ""
 
@@ -5940,121 +6013,121 @@ 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 ""
 
-#: 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 ""
 
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1157
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1159
+#: setup/class_setupStep_Migrate.inc:1162
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1159
+#: setup/class_setupStep_Migrate.inc:1162
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1249
 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 ""
 
-#: setup/class_setupStep_Migrate.inc:1296
+#: setup/class_setupStep_Migrate.inc:1299
 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 ""
 
-#: setup/class_setupStep_Migrate.inc:1354
+#: setup/class_setupStep_Migrate.inc:1357
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: setup/class_setupStep_Migrate.inc:2053
+#: setup/class_setupStep_Migrate.inc:2058
 #, 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 ""
 
-#: 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 ""
 
-#: setup/class_setupStep_Migrate.inc:2432
+#: setup/class_setupStep_Migrate.inc:2439
 #, 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 ""
 
-#: setup/class_setupStep_Migrate.inc:2627
+#: setup/class_setupStep_Migrate.inc:2634
 #, 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 ""
 
-#: 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 ""
 
-#: 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 ""