Added headers and props

[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 f8cbd23df52177b0bbc14854f3bc74264c6b42fd..751301d40f4fdcfa1347cc2756eaff4ea41b2546 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: 2008-01-18 14:59+0100\n"
+"POT-Creation-Date: 2008-03-03 17:33+0100\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"
@@ -16,242 +16,25 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4 plugins/personal/password/class_password.inc:144
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/posix/class_posixAccount.inc:1457
-msgid "My account"
-msgstr ""
-
-#: contrib/gosa.conf:41
-msgid "Administration"
-msgstr ""
-
-#: contrib/gosa.conf:88
-msgid "Addons"
-msgstr ""
-
-#: contrib/gosa.conf:121
-msgid "ACL Role"
-msgstr ""
-
-#: contrib/gosa.conf:125 contrib/gosa.conf:149 contrib/gosa.conf:153
-#: contrib/gosa.conf:157 contrib/gosa.conf:162 contrib/gosa.conf:169
-#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:183
-#: contrib/gosa.conf:193 contrib/gosa.conf:207 contrib/gosa.conf:222
-#: contrib/gosa.conf:227 contrib/gosa.conf:232 contrib/gosa.conf:237
-#: contrib/gosa.conf:270 contrib/gosa.conf:274
-#: plugins/generic/references/class_reference.inc:20
-#: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/personal/posix/generic.tpl:4
-#: plugins/addons/gotomasses/goto_task.tpl:4
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/departments/class_departmentGeneric.inc:581
-#: plugins/admin/groups/class_groupGeneric.inc:992 setup/setup_feedback.tpl:46
-msgid "Generic"
-msgstr ""
-
-#: contrib/gosa.conf:126
-msgid "Unix"
-msgstr ""
-
-#: contrib/gosa.conf:127 contrib/gosa.conf:163
-#: plugins/admin/users/class_divListUsers.inc:240
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-#: plugins/admin/groups/class_divListGroup.inc:236
-msgid "Environment"
-msgstr ""
-
-#: contrib/gosa.conf:128 contrib/gosa.conf:165
-#: plugins/generic/references/class_reference.inc:24
-#: plugins/admin/users/class_divListUsers.inc:242
-#: plugins/admin/ogroups/class_divListOGroup.inc:228
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-#: plugins/admin/ogroups/tabs_ogroups.inc:223
-#: plugins/admin/groups/class_divListGroup.inc:228
-msgid "Mail"
-msgstr ""
-
-#: contrib/gosa.conf:129 plugins/generic/references/class_reference.inc:26
-#: plugins/generic/references/class_reference.inc:28
-#: plugins/admin/users/class_divListUsers.inc:248
-#: plugins/admin/groups/class_divListGroup.inc:230
-msgid "Samba"
-msgstr ""
-
-#: contrib/gosa.conf:131 contrib/gosa.conf:134
-#: plugins/admin/users/class_divListUsers.inc:250
-msgid "Netatalk"
-msgstr ""
-
-#: contrib/gosa.conf:137
-msgid "Connectivity"
-msgstr ""
-
-#: contrib/gosa.conf:138 plugins/personal/generic/multiple_generic.tpl:247
-#: plugins/personal/generic/multiple_generic.tpl:438
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
-#: plugins/admin/users/class_divListUsers.inc:246
-#: plugins/admin/departments/class_departmentGeneric.inc:600
-#: plugins/admin/departments/generic.tpl:91 html/getxls.php:222
-#: html/getxls.php:297
-msgid "Fax"
-msgstr ""
-
-#: contrib/gosa.conf:139 plugins/generic/references/class_reference.inc:40
-#: plugins/personal/generic/multiple_generic.tpl:217
-#: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
-#: plugins/admin/users/class_divListUsers.inc:244
-#: plugins/admin/ogroups/class_ogroupManagement.inc:455
-#: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/groups/class_divListGroup.inc:234
-msgid "Phone"
-msgstr ""
-
-#: contrib/gosa.conf:141
-msgid "Scalix"
-msgstr ""
-
-#: contrib/gosa.conf:144
-msgid "Nagios"
-msgstr ""
-
-#: contrib/gosa.conf:164
-msgid "Applications"
-msgstr ""
-
-#: contrib/gosa.conf:170
-msgid "Options"
-msgstr ""
-
-#: contrib/gosa.conf:179
-msgid "Parameter"
-msgstr ""
-
-#: contrib/gosa.conf:184 contrib/gosa.conf:194 contrib/gosa.conf:208
-#: plugins/admin/ogroups/tabs_ogroups.inc:111
-msgid "Startup"
-msgstr ""
-
-#: contrib/gosa.conf:185 contrib/gosa.conf:209
-#: plugins/admin/ogroups/tabs_ogroups.inc:104
-msgid "Devices"
-msgstr ""
-
-#: contrib/gosa.conf:186 contrib/gosa.conf:210
-#: plugins/generic/references/class_reference.inc:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:459
-msgid "Printer"
-msgstr ""
-
-#: contrib/gosa.conf:187 contrib/gosa.conf:201 contrib/gosa.conf:211
-#: ihtml/themes/default/msg_dialog.tpl:64
-#: ihtml/themes/default/msg_dialog.tpl:110
-#: ihtml/themes/default/MultiSelectWindow.tpl:44
-#: ihtml/themes/default/MultiSelectWindow.tpl:84 setup/setup_ldap.tpl:121
-msgid "Information"
-msgstr ""
-
-#: contrib/gosa.conf:189 contrib/gosa.conf:203 contrib/gosa.conf:218
-#: contrib/gosa.conf:223 contrib/gosa.conf:228 contrib/gosa.conf:233
-#: contrib/gosa.conf:238
-msgid "Inventory"
-msgstr ""
-
-#: contrib/gosa.conf:195
-msgid "Services"
-msgstr ""
-
-#: contrib/gosa.conf:197 contrib/gosa.conf:199 contrib/gosa.conf:214
-#: contrib/gosa.conf:216
-msgid "FAI summary"
-msgstr ""
-
-#: contrib/gosa.conf:287
-msgid "OGo"
-msgstr ""
-
-#: contrib/gosa.conf:298
-msgid "Export"
-msgstr ""
-
-#: contrib/gosa.conf:299
-msgid "Excel Export"
-msgstr ""
-
-#: contrib/gosa.conf:300 plugins/addons/notifications/contents.tpl:54
-msgid "Import"
-msgstr ""
-
-#: contrib/gosa.conf:301
-msgid "CSV Import"
-msgstr ""
-
-#: contrib/gosa.conf:306 contrib/gosa.conf:336
-msgid "Partitions"
-msgstr ""
-
-#: contrib/gosa.conf:310 contrib/gosa.conf:340
-msgid "Script"
-msgstr ""
-
-#: contrib/gosa.conf:314 contrib/gosa.conf:344
-msgid "Hooks"
-msgstr ""
-
-#: contrib/gosa.conf:318 contrib/gosa.conf:348
-msgid "Variables"
-msgstr ""
-
-#: contrib/gosa.conf:322 contrib/gosa.conf:352
-msgid "Templates"
-msgstr ""
-
-#: contrib/gosa.conf:326 contrib/gosa.conf:356
-msgid "Profiles"
-msgstr ""
-
-#: contrib/gosa.conf:327 contrib/gosa.conf:357
-#: plugins/admin/ogroups/tabs_ogroups.inc:115
-#: plugins/admin/acl/class_divListACL.inc:54
-msgid "Summary"
-msgstr ""
-
-#: contrib/gosa.conf:331 contrib/gosa.conf:361
-msgid "Packages"
-msgstr ""
-
-#: contrib/gosa.conf:367
-msgid "System logs"
-msgstr ""
-
-#: contrib/gosa.conf:368
-msgid "GOsa logs"
-msgstr ""
-
 #: ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr ""
 
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/msg_dialog.tpl:62
-#: ihtml/themes/default/msg_dialog.tpl:108 ihtml/themes/default/remove.tpl:2
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/msg_dialog.tpl:57
+#: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/remove.tpl:2
 #: ihtml/themes/default/islocked.tpl:6
-#: plugins/personal/posix/class_posixAccount.inc:803
-#: plugins/addons/gotomasses/remove.tpl:2 plugins/admin/users/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2
+#: plugins/personal/posix/class_posixAccount.inc:802
+#: plugins/admin/users/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/acl/remove.tpl:2
 #: plugins/admin/groups/remove.tpl:2 setup/class_setupStep_Migrate.inc:211
 #: setup/class_setupStep_Migrate.inc:260 setup/class_setupStep_Migrate.inc:385
 #: setup/class_setupStep_Migrate.inc:460 setup/class_setupStep_Migrate.inc:596
 #: setup/class_setupStep_Migrate.inc:726 setup/setup_checks.tpl:32
-#: setup/setup_checks.tpl:93 include/class_tabs.inc:214
-#: include/functions.inc:686 include/functions.inc:2158
-#: include/functions.inc:2162 include/functions.inc:2168 html/password.php:282
-#: html/index.php:50 html/index.php:56 html/index.php:407 html/index.php:413
+#: setup/setup_checks.tpl:93 include/class_tabs.inc:216
+#: include/functions.inc:699 include/functions.inc:2238
+#: include/functions.inc:2242 include/functions.inc:2248 html/password.php:284
+#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
 msgid "Warning"
 msgstr ""
 
@@ -315,29 +98,29 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/login.tpl:40 ihtml/themes/default/login.tpl:42
-#: ihtml/themes/default/password.tpl:67 ihtml/themes/default/password.tpl:69
+#: ihtml/themes/default/password.tpl:68 ihtml/themes/default/password.tpl:70
 #: plugins/admin/users/class_divListUsers.inc:61
 msgid "Username"
 msgstr ""
 
 #: ihtml/themes/default/login.tpl:45 ihtml/themes/default/login.tpl:47
-#: ihtml/themes/default/password.tpl:38
+#: ihtml/themes/default/password.tpl:39
 #: plugins/personal/password/class_password.inc:24
 #: plugins/personal/generic/paste_generic.tpl:20 setup/setup_migrate.tpl:225
-#: setup/setup_config2.tpl:266 setup/setup_config2.tpl:311
+#: setup/setup_config2.tpl:282 setup/setup_config2.tpl:327
 msgid "Password"
 msgstr ""
 
 #: ihtml/themes/default/login.tpl:50 ihtml/themes/default/login.tpl:51
-#: ihtml/themes/default/password.tpl:58 ihtml/themes/default/password.tpl:60
+#: ihtml/themes/default/password.tpl:59 ihtml/themes/default/password.tpl:61
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/login.tpl:76 ihtml/themes/default/login.tpl:79
+#: ihtml/themes/default/login.tpl:75 ihtml/themes/default/login.tpl:78
 msgid "Sign in"
 msgstr ""
 
-#: ihtml/themes/default/login.tpl:77
+#: ihtml/themes/default/login.tpl:76
 msgid "Click here to log in"
 msgstr ""
 
@@ -375,11 +158,11 @@ msgstr ""
 #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
 #: ihtml/themes/default/acl.tpl:75 ihtml/themes/default/acl.tpl:89
 #: plugins/addons/notifications/contents.tpl:12
-#: plugins/admin/users/class_userManagement.inc:874
-#: plugins/admin/ogroups/class_ogroupManagement.inc:403
+#: plugins/admin/users/class_userManagement.inc:920
+#: plugins/admin/ogroups/class_ogroupManagement.inc:449
 #: plugins/admin/acl/acl_role.tpl:49 plugins/admin/acl/acl_role.tpl:59
 #: plugins/admin/acl/acl_role.tpl:73
-#: plugins/admin/groups/class_groupManagement.inc:469 setup/setup_ldap.tpl:16
+#: plugins/admin/groups/class_groupManagement.inc:516 setup/setup_ldap.tpl:16
 #: setup/setup_migrate.tpl:133 setup/setup_migrate.tpl:184
 #: setup/setup_migrate.tpl:250 setup/setup_migrate.tpl:305
 #: setup/setup_migrate.tpl:358
@@ -399,7 +182,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:41 html/getxls.php:121 html/getxls.php:284
+#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286
 msgid "Members"
 msgstr ""
 
@@ -435,15 +218,13 @@ msgstr ""
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/main.inc:108
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/addons/gotomasses/goto_task.tpl:56
-#: plugins/addons/gotomasses/remove.tpl:19
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:923
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/remove.tpl:19
-#: plugins/admin/users/template.tpl:50 plugins/admin/users/password.tpl:23
-#: plugins/admin/ogroups/class_ogroupManagement.inc:406
+#: plugins/admin/users/template.tpl:50 plugins/admin/users/password.tpl:32
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/remove.tpl:17 plugins/admin/ogroups/remove.tpl:21
-#: plugins/admin/departments/class_departmentManagement.inc:409
+#: plugins/admin/departments/class_departmentManagement.inc:404
 #: plugins/admin/departments/dep_move_confirm.tpl:17
 #: plugins/admin/departments/remove.tpl:17
 #: plugins/admin/departments/remove.tpl:21 plugins/admin/acl/acl_role.tpl:61
@@ -451,7 +232,7 @@ msgstr ""
 #: plugins/admin/acl/remove.tpl:17 plugins/admin/acl/remove.tpl:21
 #: plugins/admin/acl/tabs_acl_role.inc:49
 #: plugins/admin/groups/group_objects.tpl:57
-#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:519
 #: plugins/admin/groups/remove.tpl:18 plugins/admin/groups/remove.tpl:22
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
@@ -471,7 +252,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:176
+#: include/class_pluglist.inc:175
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -522,9 +303,9 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
-#: plugins/admin/departments/class_departmentGeneric.inc:545
-#: include/class_acl.inc:643 include/class_acl.inc:650
-#: include/class_acl.inc:657 include/class_acl.inc:663
+#: plugins/admin/departments/class_departmentGeneric.inc:526
+#: include/class_acl.inc:663 include/class_acl.inc:670
+#: include/class_acl.inc:677 include/class_acl.inc:683
 msgid "Object"
 msgstr ""
 
@@ -564,52 +345,54 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/addons/notifications/contents.tpl:78
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:472
-#: plugins/admin/departments/class_departmentGeneric.inc:567
+#: plugins/admin/departments/class_departmentGeneric.inc:453
+#: plugins/admin/departments/class_departmentGeneric.inc:548
 #: setup/class_setup.inc:266
 msgid "Continue"
 msgstr ""
 
-#: ihtml/themes/default/msg_dialog.tpl:60
-#: ihtml/themes/default/msg_dialog.tpl:106
+#: ihtml/themes/default/msg_dialog.tpl:55
+#: ihtml/themes/default/msg_dialog.tpl:100
 #: plugins/personal/generic/class_user.inc:374
 #: plugins/personal/generic/class_user.inc:471
 #: plugins/personal/generic/class_user.inc:732
-#: plugins/personal/generic/class_user.inc:1262
+#: plugins/personal/generic/class_user.inc:1261
 #: plugins/personal/generic/main.inc:103
-#: plugins/personal/posix/class_posixAccount.inc:1278
-#: plugins/addons/gotomasses/class_gotomasses.inc:102
-#: plugins/addons/gotomasses/class_gotomasses.inc:188
-#: plugins/addons/gotomasses/class_gotomasses.inc:203
-#: plugins/addons/gotomasses/class_gotomasses.inc:237
-#: plugins/addons/gotomasses/class_target_list.inc:229
-#: plugins/addons/gotomasses/class_target_list.inc:233
+#: plugins/personal/posix/class_posixAccount.inc:1301
 #: plugins/addons/notifications/class_msgplug.inc:117
 #: plugins/addons/notifications/class_msgplug.inc:213
+#: plugins/admin/groups/class_groupGeneric.inc:706
+#: plugins/admin/groups/class_groupGeneric.inc:711
+#: plugins/admin/groups/class_groupGeneric.inc:943
 #: setup/class_setupStep_Migrate.inc:1019 setup/setup_checks.tpl:30
-#: setup/setup_checks.tpl:91 include/class_plugin.inc:624
-#: include/class_plugin.inc:656 include/class_plugin.inc:692
-#: include/class_plugin.inc:1391 include/class_log.inc:144
-#: include/class_log.inc:152 include/class_log.inc:157
-#: include/class_log.inc:177 include/functions.inc:1175
-#: include/functions.inc:1287 include/class_CopyPasteHandler.inc:274
-#: include/class_CopyPasteHandler.inc:277
-#: include/class_CopyPasteHandler.inc:315
-#: include/class_CopyPasteHandler.inc:318 html/index.php:213
-#: html/index.php:217
+#: setup/setup_checks.tpl:91 include/class_plugin.inc:623
+#: include/class_plugin.inc:655 include/class_plugin.inc:686
+#: include/class_plugin.inc:1375 include/class_log.inc:145
+#: include/class_log.inc:157 include/class_log.inc:165
+#: include/class_log.inc:180 include/class_log.inc:218
+#: include/class_log.inc:241 include/functions.inc:1262
+#: include/functions.inc:1366 include/class_CopyPasteHandler.inc:350
+#: html/index.php:225 html/index.php:229
 msgid "Error"
 msgstr ""
 
+#: ihtml/themes/default/msg_dialog.tpl:59
+#: ihtml/themes/default/msg_dialog.tpl:104
+#: ihtml/themes/default/MultiSelectWindow.tpl:44
+#: ihtml/themes/default/MultiSelectWindow.tpl:84
+#: plugins/admin/ogroups/class_ogroup.inc:150 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr ""
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:131
 #: ihtml/themes/default/msg_dialog.tpl:133
 #: plugins/personal/generic/main.inc:159 plugins/personal/posix/main.inc:106
-#: plugins/addons/gotomasses/goto_task.tpl:55
-#: plugins/admin/users/class_userManagement.inc:871
-#: plugins/admin/ogroups/class_ogroupManagement.inc:400
+#: plugins/admin/users/class_userManagement.inc:917
+#: plugins/admin/ogroups/class_ogroupManagement.inc:446
 #: plugins/admin/acl/tabs_acl.inc:61 plugins/admin/acl/tabs_acl_role.inc:47
-#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/groups/class_groupManagement.inc:513
 #: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
 #: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:392
 #: setup/class_setupStep_Migrate.inc:467 setup/class_setupStep_Migrate.inc:539
@@ -641,22 +424,18 @@ msgid "infinite"
 msgstr ""
 
 #: ihtml/themes/default/pwd_heimdal.tpl:34
-#: plugins/addons/gotomasses/class_gotomasses.inc:348
 msgid "Hour"
 msgstr ""
 
 #: ihtml/themes/default/pwd_heimdal.tpl:36
-#: plugins/addons/gotomasses/class_gotomasses.inc:347
 msgid "Minute"
 msgstr ""
 
 #: ihtml/themes/default/pwd_heimdal.tpl:38
-#: plugins/addons/gotomasses/class_gotomasses.inc:346
 msgid "Day"
 msgstr ""
 
 #: ihtml/themes/default/pwd_heimdal.tpl:40
-#: plugins/addons/gotomasses/class_gotomasses.inc:349
 msgid "Month"
 msgstr ""
 
@@ -680,9 +459,9 @@ msgstr ""
 #: ihtml/themes/default/copyPasteDialog.tpl:19
 #: plugins/personal/generic/generic_certs.tpl:91
 #: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/admin/departments/class_departmentManagement.inc:407
+#: plugins/admin/departments/class_departmentManagement.inc:402
 #: plugins/admin/departments/dep_move_confirm.tpl:15
-#: include/class_MultiSelectWindow.inc:113
+#: include/class_MultiSelectWindow.inc:133
 msgid "Save"
 msgstr ""
 
@@ -692,9 +471,8 @@ msgid ""
 "to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: ihtml/themes/default/remove.tpl:9 plugins/addons/gotomasses/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/ogroups/remove.tpl:10
-#: plugins/admin/groups/remove.tpl:10
+#: ihtml/themes/default/remove.tpl:9 plugins/admin/users/remove.tpl:10
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/groups/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
@@ -702,9 +480,7 @@ msgstr ""
 #: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/posix/generic.tpl:107
 #: plugins/personal/posix/generic.tpl:149
-#: plugins/personal/posix/generic.tpl:178
-#: plugins/addons/gotomasses/remove.tpl:15
-#: plugins/addons/gotomasses/remove.tpl:17 plugins/admin/users/remove.tpl:15
+#: plugins/personal/posix/generic.tpl:178 plugins/admin/users/remove.tpl:15
 #: plugins/admin/users/remove.tpl:18 plugins/admin/ogroups/remove.tpl:15
 #: plugins/admin/ogroups/remove.tpl:19 plugins/admin/ogroups/generic.tpl:54
 #: plugins/admin/departments/remove.tpl:15
@@ -737,51 +513,59 @@ msgstr ""
 msgid "Change your password"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:33
+#: ihtml/themes/default/password.tpl:34
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:33
+#: ihtml/themes/default/password.tpl:34
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:39
-#: plugins/admin/users/class_userManagement.inc:296
+#: ihtml/themes/default/password.tpl:40
+#: plugins/admin/users/class_userManagement.inc:341
 msgid "Password change"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:51
+#: ihtml/themes/default/password.tpl:52
 msgid ""
 "This dialog provides a simple way to change your password. Enter the current "
 "password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:76 ihtml/themes/default/password.tpl:77
-#: plugins/personal/password/password.tpl:11
+#: ihtml/themes/default/password.tpl:77 ihtml/themes/default/password.tpl:78
+#: plugins/personal/password/password.tpl:13 html/password.php:221
 msgid "Current password"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:80 ihtml/themes/default/password.tpl:81
-#: ihtml/themes/default/password.tpl:84
-#: plugins/personal/password/password.tpl:16
-#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
+#: ihtml/themes/default/password.tpl:81 ihtml/themes/default/password.tpl:82
+#: ihtml/themes/default/password.tpl:85
+#: plugins/personal/password/password.tpl:18
+#: plugins/personal/generic/password.tpl:7
+#: plugins/personal/generic/main.inc:85
+#: plugins/admin/users/class_userManagement.inc:239
+#: plugins/admin/users/password.tpl:13 html/password.php:200
 msgid "New password"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:84
+#: ihtml/themes/default/password.tpl:85
 msgid "again"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:85
+#: ihtml/themes/default/password.tpl:86
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:92
+#: ihtml/themes/default/password.tpl:89
+#: plugins/personal/password/password.tpl:28
+msgid "Password strength"
+msgstr ""
+
+#: ihtml/themes/default/password.tpl:100
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:93
+#: ihtml/themes/default/password.tpl:101
 msgid "Click here to change your password"
 msgstr ""
 
@@ -880,11 +664,37 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
+#: plugins/generic/references/class_reference.inc:20
+#: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1407
+#: plugins/personal/posix/generic.tpl:4
+#: plugins/admin/ogroups/class_ogroup.inc:740
+#: plugins/admin/departments/class_departmentGeneric.inc:562
+#: plugins/admin/groups/class_groupGeneric.inc:991 setup/setup_feedback.tpl:46
+msgid "Generic"
+msgstr ""
+
 #: plugins/generic/references/class_reference.inc:22
 #: plugins/personal/posix/class_posixAccount.inc:16
 msgid "UNIX"
 msgstr ""
 
+#: plugins/generic/references/class_reference.inc:24
+#: plugins/admin/users/class_divListUsers.inc:249
+#: plugins/admin/ogroups/class_divListOGroup.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:90
+#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/groups/class_divListGroup.inc:237
+msgid "Mail"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:26
+#: plugins/generic/references/class_reference.inc:28
+#: plugins/admin/users/class_divListUsers.inc:255
+#: plugins/admin/groups/class_divListGroup.inc:239
+msgid "Samba"
+msgstr ""
+
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr ""
@@ -898,32 +708,46 @@ msgid "FTP"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:36
-#: plugins/admin/ogroups/class_ogroupManagement.inc:451
+#: plugins/admin/ogroups/class_ogroupManagement.inc:497
 #: plugins/admin/groups/class_divListGroup.inc:165
 msgid "Group"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:38
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1428
 #: plugins/personal/generic/multiple_generic.tpl:159
 #: plugins/personal/generic/generic.tpl:279
 #: plugins/admin/users/class_divListUsers.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 #: plugins/admin/departments/class_divListDepartment.inc:137
 msgid "Department"
 msgstr ""
 
+#: plugins/generic/references/class_reference.inc:40
+#: plugins/personal/generic/class_user.inc:1140
+#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/multiple_generic.tpl:217
+#: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:511
+#: plugins/admin/users/class_divListUsers.inc:251
+#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/departments/class_departmentGeneric.inc:269
+#: plugins/admin/departments/generic.tpl:83
+#: plugins/admin/groups/class_divListGroup.inc:243
+msgid "Phone"
+msgstr ""
+
 #: plugins/generic/references/class_reference.inc:42
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/admin/ogroups/tabs_ogroups.inc:122
-#: plugins/admin/groups/class_divListGroup.inc:232
+#: plugins/admin/ogroups/class_ogroupManagement.inc:498
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: plugins/admin/groups/class_divListGroup.inc:241
 msgid "Application"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:44
-#: plugins/addons/gotomasses/class_target_list.inc:180
-#: plugins/admin/ogroups/class_ogroupManagement.inc:454
-#: setup/setup_config2.tpl:248 setup/setup_config2.tpl:293
+#: plugins/admin/ogroups/class_ogroupManagement.inc:500
+#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
 msgid "Server"
 msgstr ""
 
@@ -932,32 +756,35 @@ msgid "Thin Client"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:48
-#: plugins/addons/gotomasses/class_target_list.inc:182
-#: plugins/admin/ogroups/class_ogroupManagement.inc:456
+#: plugins/admin/ogroups/class_ogroupManagement.inc:502
 msgid "Workstation"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:50
-#: plugins/addons/gotomasses/class_target_list.inc:184
 #: plugins/admin/ogroups/class_divListOGroup.inc:176
-#: plugins/admin/ogroups/class_divListOGroup.inc:294
+#: plugins/admin/ogroups/class_divListOGroup.inc:302
 msgid "Object group"
 msgstr ""
 
+#: plugins/generic/references/class_reference.inc:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+msgid "Printer"
+msgstr ""
+
 #: plugins/generic/references/contents.tpl:11
-#: plugins/addons/gotomasses/class_target_list.inc:48
 msgid "Object name"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl:11
-#: plugins/addons/gotomasses/class_gotomasses.inc:344
-#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/ogroups/class_ogroup.inc:751
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/departments/class_departmentGeneric.inc:590
+#: plugins/admin/departments/class_departmentGeneric.inc:258
+#: plugins/admin/departments/class_departmentGeneric.inc:571
 #: plugins/admin/departments/generic.tpl:16 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/acl/class_aclRole.inc:679 plugins/admin/groups/generic.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:1003 html/getxls.php:158
-#: html/getxls.php:287
+#: plugins/admin/groups/class_groupGeneric.inc:1002
+#: include/class_SnapShotDialog.inc:169 html/getxls.php:160
+#: html/getxls.php:289
 msgid "Description"
 msgstr ""
 
@@ -970,18 +797,7 @@ msgid "This object has no relationship to other objects."
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/addons/gotomasses/class_gotomasses.inc:7
-#: plugins/addons/gotomasses/class_goto_task.inc:7
-#: plugins/addons/notifications/class_msgplug.inc:7
-#: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/acl/class_aclRole.inc:7
-#: plugins/admin/acl/class_aclManagement.inc:25
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:7
-msgid "This does something"
+msgid "Change user passwords"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:77
@@ -993,7 +809,7 @@ msgstr ""
 #: plugins/personal/password/class_password.inc:106
 #: plugins/personal/password/class_password.inc:112
 #: plugins/personal/password/class_password.inc:140
-#: plugins/personal/generic/class_user.inc:1419
+#: plugins/personal/generic/class_user.inc:1418
 msgid "User password"
 msgstr ""
 
@@ -1003,23 +819,21 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/generic/main.inc:80
-#: plugins/admin/users/class_userManagement.inc:189 html/password.php:195
+#: plugins/admin/users/class_userManagement.inc:234 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:84
-#: plugins/personal/generic/main.inc:85
-#: plugins/admin/users/class_userManagement.inc:194 html/password.php:198
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:87 html/password.php:206
+#: plugins/personal/password/class_password.inc:87 html/password.php:208
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:90 html/password.php:211
+#: plugins/personal/password/class_password.inc:90 html/password.php:213
 msgid "The password used as new is to short."
 msgstr ""
 
@@ -1038,6 +852,12 @@ msgstr ""
 msgid "You have no permission to change your password."
 msgstr ""
 
+#: plugins/personal/password/class_password.inc:144
+#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/posix/class_posixAccount.inc:1480
+msgid "My account"
+msgstr ""
+
 #: plugins/personal/password/nochange.tpl:2
 msgid "Password change not allowed"
 msgstr ""
@@ -1054,38 +874,38 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:9
 #: plugins/personal/generic/main.inc:169
-#: plugins/admin/departments/class_departmentManagement.inc:444
+#: plugins/admin/departments/class_departmentManagement.inc:439
 #: plugins/admin/departments/dep_iframe.tpl:18 setup/class_setup.inc:261
-#: setup/class_setup.inc:263 include/functions.inc:1496
+#: setup/class_setup.inc:263 include/functions.inc:1576
 msgid "Back"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:2
+#: plugins/personal/password/password.tpl:4
 msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
 msgstr ""
 
-#: plugins/personal/password/password.tpl:6 plugins/admin/users/password.tpl:6
+#: plugins/personal/password/password.tpl:8 plugins/admin/users/password.tpl:8
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
 msgstr ""
 
-#: plugins/personal/password/password.tpl:21
+#: plugins/personal/password/password.tpl:23
 #: plugins/personal/generic/password.tpl:11
-#: plugins/admin/users/password.tpl:15
+#: plugins/admin/users/password.tpl:17
 msgid "Repeat new password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:30
+#: plugins/personal/password/password.tpl:39
 #: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21
+#: plugins/admin/users/password.tpl:30
 msgid "Set password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:32
+#: plugins/personal/password/password.tpl:41
 msgid "Clear fields"
 msgstr ""
 
@@ -1123,67 +943,71 @@ msgid "PKCS12 certificate"
 msgstr ""
 
 #: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/generic/class_user.inc:1400
 msgid "Certificate serial number"
 msgstr ""
 
+#: plugins/personal/generic/class_user.inc:17
+msgid "Edit organizational user settings"
+msgstr ""
+
 #: plugins/personal/generic/class_user.inc:265
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:493
 msgid "January"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:265
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:493
 msgid "February"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:265
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:493
 msgid "March"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:265
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:493
 msgid "April"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:266
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:494
 msgid "May"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:266
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:494
 msgid "June"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:266
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:494
 msgid "July"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:266
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:494
 msgid "August"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:266
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:494
 msgid "September"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:267
-#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/posix/class_posixAccount.inc:495
 msgid "October"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:267
-#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/posix/class_posixAccount.inc:495
 msgid "November"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:267
-#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/posix/class_posixAccount.inc:495
 msgid "December"
 msgstr ""
 
@@ -1230,7 +1054,7 @@ msgstr ""
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:554
+#: plugins/personal/generic/class_user.inc:554 html/password.php:163
 msgid "Password method"
 msgstr ""
 
@@ -1254,144 +1078,156 @@ msgid "Saving of user/generic account with dn '%s' failed."
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1103
-msgid "There's already a person with this 'Login' in the database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1109
-#: plugins/admin/users/class_userManagement.inc:686
-#: plugins/admin/users/class_userManagement.inc:764
-msgid "The required field 'Name' is not set."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1112
-#: plugins/admin/users/class_userManagement.inc:689
-#: plugins/admin/users/class_userManagement.inc:767
-msgid "The required field 'Given name' is not set."
-msgstr ""
-
 #: plugins/personal/generic/class_user.inc:1115
-msgid "The required field 'Login' is not set."
+#: plugins/personal/generic/class_user.inc:1129
+#: plugins/personal/generic/class_user.inc:1131
+#: plugins/personal/generic/paste_generic.tpl:15
+#: plugins/personal/generic/generic.tpl:82 plugins/admin/users/template.tpl:32
+#: html/password.php:219
+msgid "Login"
 msgstr ""
 
+#: plugins/personal/generic/class_user.inc:1109
 #: plugins/personal/generic/class_user.inc:1120
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1127
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1130
-#: plugins/personal/generic/class_user.inc:1526
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1133
-#: plugins/personal/generic/class_user.inc:1158
-#: plugins/personal/generic/class_user.inc:1529
-#: plugins/personal/generic/class_user.inc:1550
-#: plugins/admin/departments/class_departmentGeneric.inc:276
-msgid "The field 'Name' contains invalid characters."
+#: plugins/personal/generic/class_user.inc:1157
+#: plugins/personal/generic/class_user.inc:1543
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/users/class_userManagement.inc:809
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/ogroups/class_ogroup.inc:595
+#: plugins/admin/ogroups/class_ogroup.inc:605
+#: plugins/admin/ogroups/class_ogroup.inc:749
+#: plugins/admin/departments/class_departmentGeneric.inc:246
+#: plugins/admin/departments/class_departmentGeneric.inc:248
+#: plugins/admin/departments/class_departmentGeneric.inc:254
+#: plugins/admin/departments/class_departmentGeneric.inc:262
+#: plugins/admin/departments/class_departmentGeneric.inc:266
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/acl/class_aclRole.inc:677
+#: plugins/admin/acl/paste_role.tpl:4
+#: plugins/admin/groups/class_groupGeneric.inc:848
+#: plugins/admin/groups/class_groupGeneric.inc:854
+#: plugins/admin/groups/class_groupGeneric.inc:856
+#: plugins/admin/groups/class_groupGeneric.inc:868
+#: plugins/admin/groups/class_groupGeneric.inc:882
+#: plugins/admin/groups/class_groupGeneric.inc:889
+#: plugins/admin/groups/class_groupGeneric.inc:1000
+#: setup/setup_migrate.tpl:209 setup/setup_feedback.tpl:22 html/getxls.php:225
+#: html/getxls.php:292
+msgid "Name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1155
-#: plugins/personal/generic/class_user.inc:1532
-#: plugins/personal/generic/class_user.inc:1547
-msgid "The field 'Given name' contains invalid characters."
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1154
+#: plugins/personal/generic/class_user.inc:1420
+#: plugins/personal/generic/class_user.inc:1540
+#: plugins/admin/users/class_userManagement.inc:734
+#: plugins/admin/users/class_userManagement.inc:812 html/getxls.php:88
+#: html/getxls.php:225 html/getxls.php:283 html/getxls.php:299
+msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1535
-#: plugins/admin/departments/class_departmentGeneric.inc:279
-msgid "The field 'Phone' contains an invalid phone number."
+#: plugins/personal/generic/class_user.inc:1135
+#: plugins/personal/generic/class_user.inc:1426
+#: plugins/personal/generic/class_user.inc:1525
+#: plugins/personal/generic/multiple_generic.tpl:88
+#: plugins/personal/generic/generic.tpl:210
+msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1538
-#: plugins/admin/departments/class_departmentGeneric.inc:282
-msgid "The field 'Fax' contains an invalid phone number."
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/multiple_generic.tpl:247
+#: plugins/personal/generic/multiple_generic.tpl:438
+#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/generic.tpl:523
+#: plugins/admin/users/class_divListUsers.inc:253
+#: plugins/admin/departments/class_departmentGeneric.inc:272
+#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/generic.tpl:91 html/getxls.php:224
+#: html/getxls.php:299
+msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1147
-#: plugins/personal/generic/class_user.inc:1541
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/personal/generic/class_user.inc:1146
+#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/multiple_generic.tpl:227
+#: plugins/personal/generic/generic.tpl:339 html/getxls.php:301
+msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1544
-msgid "The field 'Pager' contains an invalid phone number."
+#: plugins/personal/generic/class_user.inc:1149
+#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/multiple_generic.tpl:237
+#: plugins/personal/generic/generic.tpl:347 html/getxls.php:228
+#: html/getxls.php:302
+msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1262
+#: plugins/personal/generic/class_user.inc:1261
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
 #: plugins/personal/generic/multiple_generic.tpl:371
 #: plugins/personal/generic/generic.tpl:463
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
 #: plugins/personal/generic/multiple_generic.tpl:402
 #: plugins/personal/generic/generic.tpl:488
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
 #: plugins/personal/generic/multiple_generic.tpl:302
 #: plugins/personal/generic/generic.tpl:405
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
 #: plugins/personal/generic/multiple_generic.tpl:449
 #: plugins/personal/generic/generic.tpl:532
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
 #: plugins/personal/generic/multiple_generic.tpl:360
 #: plugins/personal/generic/generic.tpl:454
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
 #: plugins/personal/generic/multiple_generic.tpl:312
 #: plugins/personal/generic/generic.tpl:413
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
 #: plugins/personal/generic/multiple_generic.tpl:323
 #: plugins/personal/generic/generic.tpl:422
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1400
+#: plugins/personal/generic/class_user.inc:1399
 #: plugins/personal/generic/multiple_generic.tpl:334
 #: plugins/personal/generic/generic.tpl:431
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
+#: plugins/personal/generic/class_user.inc:1401
 #: plugins/personal/generic/multiple_generic.tpl:460
 #: plugins/personal/generic/generic.tpl:541
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
 #: plugins/personal/generic/multiple_generic.tpl:382
 #: plugins/personal/generic/generic.tpl:472
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
+#: plugins/personal/generic/class_user.inc:1403
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/personal/generic/generic.tpl:440
 #: plugins/admin/acl/class_aclRole.inc:668
@@ -1400,163 +1236,151 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
+#: plugins/personal/generic/class_user.inc:1404
 #: plugins/personal/generic/multiple_generic.tpl:392
-#: plugins/personal/generic/generic.tpl:480 html/getxls.php:227
+#: plugins/personal/generic/generic.tpl:480 html/getxls.php:229
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
+#: plugins/personal/generic/class_user.inc:1408
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
+#: plugins/personal/generic/class_user.inc:1413
 #: plugins/addons/notifications/class_msgplug.inc:36
-#: plugins/admin/users/class_userManagement.inc:24 include/class_acl.inc:196
-#: html/getxls.php:89 html/getxls.php:90 html/getxls.php:308
+#: plugins/admin/users/class_userManagement.inc:24 include/class_acl.inc:216
+#: html/getxls.php:91 html/getxls.php:92 html/getxls.php:310
 msgid "Users"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1418
+#: plugins/personal/generic/class_user.inc:1417
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/personal/generic/generic.tpl:170
-#: plugins/addons/gotomasses/class_target_list.inc:130
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/ogroups/class_ogroup.inc:750
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:163
-#: plugins/admin/departments/class_departmentGeneric.inc:592
+#: plugins/admin/departments/class_departmentGeneric.inc:573
 #: plugins/admin/departments/class_divListDepartment.inc:125
 #: plugins/admin/departments/generic.tpl:35 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/acl/class_aclRole.inc:678
 #: plugins/admin/acl/class_divListACL.inc:134
 #: plugins/admin/groups/class_divListGroup.inc:151
 #: plugins/admin/groups/generic.tpl:39
-#: plugins/admin/groups/class_groupGeneric.inc:1002 setup/setup_ldap.tpl:55
+#: plugins/admin/groups/class_groupGeneric.inc:1001 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1420 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1419 html/getxls.php:303
 msgid "Surename"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1421 html/getxls.php:86
-#: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
-msgid "Given name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1422
+#: plugins/personal/generic/class_user.inc:1421
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1423
+#: plugins/personal/generic/class_user.inc:1422
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1424
+#: plugins/personal/generic/class_user.inc:1423
 #: plugins/personal/generic/multiple_generic.tpl:23
 #: plugins/personal/generic/generic.tpl:108
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1425 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1424 html/getxls.php:226
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1426
+#: plugins/personal/generic/class_user.inc:1425
 msgid "Home phone number"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1427
-#: plugins/personal/generic/multiple_generic.tpl:88
-#: plugins/personal/generic/generic.tpl:210
-msgid "Homepage"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1428
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: plugins/personal/generic/generic.tpl:271 setup/setup_feedback.tpl:14
-#: html/getxls.php:299
+#: html/getxls.php:301
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1430
+#: plugins/personal/generic/class_user.inc:1429
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1431
+#: plugins/personal/generic/class_user.inc:1430
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1432
+#: plugins/personal/generic/class_user.inc:1431
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1432
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1435
+#: plugins/personal/generic/class_user.inc:1434
 #: plugins/personal/generic/multiple_generic.tpl:189
 #: plugins/personal/generic/generic.tpl:303
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1435
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/personal/generic/generic.tpl:373
-#: plugins/admin/departments/class_departmentGeneric.inc:593
+#: plugins/admin/departments/class_departmentGeneric.inc:574
 #: plugins/admin/departments/generic.tpl:56
-#: plugins/admin/departments/generic.tpl:68 html/getxls.php:224
+#: plugins/admin/departments/generic.tpl:68 html/getxls.php:226
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1437
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/personal/generic/generic.tpl:381
-#: plugins/admin/departments/class_departmentGeneric.inc:597
-#: plugins/admin/departments/generic.tpl:60 html/getxls.php:228
-#: html/getxls.php:301
+#: plugins/admin/departments/class_departmentGeneric.inc:578
+#: plugins/admin/departments/generic.tpl:60 html/getxls.php:230
+#: html/getxls.php:303
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1438
+#: plugins/personal/generic/class_user.inc:1437
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1439
+#: plugins/personal/generic/class_user.inc:1438
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1440
+#: plugins/personal/generic/class_user.inc:1439
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1440
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1442
+#: plugins/personal/generic/class_user.inc:1441
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1443
+#: plugins/personal/generic/class_user.inc:1442
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1445 html/getxls.php:226
-#: html/getxls.php:298 html/getxls.php:300
+#: plugins/personal/generic/class_user.inc:1444 html/getxls.php:228
+#: html/getxls.php:300 html/getxls.php:302
 msgid "Postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1446
+#: plugins/personal/generic/class_user.inc:1445
 msgid "Fax number"
 msgstr ""
 
@@ -1597,8 +1421,8 @@ msgstr ""
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/personal/generic/generic.tpl:194
 #: plugins/personal/generic/generic.tpl:389
-#: plugins/admin/departments/class_departmentGeneric.inc:598
-#: plugins/admin/departments/generic.tpl:76 html/getxls.php:227
+#: plugins/admin/departments/class_departmentGeneric.inc:579
+#: plugins/admin/departments/generic.tpl:76 html/getxls.php:229
 msgid "Address"
 msgstr ""
 
@@ -1639,17 +1463,6 @@ msgstr ""
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/multiple_generic.tpl:227
-#: plugins/personal/generic/generic.tpl:339 html/getxls.php:299
-msgid "Mobile"
-msgstr ""
-
-#: plugins/personal/generic/multiple_generic.tpl:237
-#: plugins/personal/generic/generic.tpl:347 html/getxls.php:226
-#: html/getxls.php:300
-msgid "Pager"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr ""
@@ -1664,11 +1477,6 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/generic.tpl:82 plugins/admin/users/template.tpl:32
-msgid "Login"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl:23
 msgid "Clear password"
 msgstr ""
@@ -1704,12 +1512,12 @@ msgstr ""
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:144 html/getxls.php:86
-#: html/getxls.php:281
+#: plugins/personal/generic/generic.tpl:144 html/getxls.php:88
+#: html/getxls.php:283
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:923
+#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1010
 msgid "Configure"
 msgstr ""
 
@@ -1722,7 +1530,6 @@ msgid "You have no permission to set your password!"
 msgstr ""
 
 #: plugins/personal/generic/main.inc:172 plugins/personal/posix/main.inc:120
-#: plugins/addons/gotomasses/class_divListMasses.inc:125
 #: plugins/admin/users/class_divListUsers.inc:164
 #: plugins/admin/groups/class_divListGroup.inc:171
 msgid "Edit"
@@ -1756,7 +1563,6 @@ msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/addons/gotomasses/class_target_list.inc:61
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/groups/class_divListGroup.inc:76
 msgid "Regular expression for matching group names"
@@ -1772,7 +1578,6 @@ msgid "User name of which groups are shown"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:68
-#: plugins/addons/gotomasses/class_target_list.inc:57
 #: plugins/admin/users/class_divListUsers.inc:74
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:82
@@ -1794,244 +1599,226 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:17
+msgid "Edit users POSIX extensions"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:133
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:138
 msgid "active, password not changable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "active, password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:147
+#: plugins/personal/posix/class_posixAccount.inc:142
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:158
-#: plugins/personal/posix/class_posixAccount.inc:1115
-msgid "Group of user"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:193
+#: plugins/personal/posix/class_posixAccount.inc:187
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:204
+#: plugins/personal/posix/class_posixAccount.inc:198
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:260
+#: plugins/personal/posix/class_posixAccount.inc:254
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:280
-#: plugins/personal/posix/class_posixAccount.inc:283
+#: plugins/personal/posix/class_posixAccount.inc:274
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:284
+#: plugins/personal/posix/class_posixAccount.inc:278
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:288
+#: plugins/personal/posix/class_posixAccount.inc:282
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:448
+#: plugins/personal/posix/class_posixAccount.inc:447
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:452
+#: plugins/personal/posix/class_posixAccount.inc:451
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:456
+#: plugins/personal/posix/class_posixAccount.inc:455
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:460
+#: plugins/personal/posix/class_posixAccount.inc:459
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:593
+#: plugins/personal/posix/class_posixAccount.inc:592
 #: setup/setup_config2.tpl:188
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:593
+#: plugins/personal/posix/class_posixAccount.inc:592
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:594
+#: plugins/personal/posix/class_posixAccount.inc:593
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:647
+#: plugins/personal/posix/class_posixAccount.inc:646
 #, php-format
 msgid "Removing of user/posix account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:803
+#: plugins/personal/posix/class_posixAccount.inc:802
 msgid "Timeout while waiting for lock! Ignoring lock."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:899
-#, php-format
-msgid "Saving of user/posix account with dn '%s' failed."
+#: plugins/personal/posix/class_posixAccount.inc:896
+msgid "Uid number"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:974
-#: plugins/personal/posix/class_posixAccount.inc:1051
-msgid "The required field 'Home directory' is not set."
+#: plugins/personal/posix/class_posixAccount.inc:896
+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:977
-#: plugins/personal/posix/class_posixAccount.inc:1054
-msgid "Please enter a valid path in 'Home directory' field."
+#: plugins/personal/posix/class_posixAccount.inc:910
+#, php-format
+msgid "Saving of user/posix account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:985
-msgid "Value specified as 'UID' is not valid."
+#: plugins/personal/posix/class_posixAccount.inc:929
+#: plugins/personal/posix/class_posixAccount.inc:1122
+msgid "Group of user"
 msgstr ""
 
+#: plugins/personal/posix/class_posixAccount.inc:985
 #: plugins/personal/posix/class_posixAccount.inc:988
-msgid "Value specified as 'UID' is too small."
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:899
-msgid "Value specified as 'GID' is not valid."
+#: plugins/personal/posix/class_posixAccount.inc:1058
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1486
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/posix/generic.tpl:7
+msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:995
-#: plugins/admin/groups/class_groupGeneric.inc:902
-msgid "Value specified as 'GID' is too small."
+#: plugins/personal/posix/class_posixAccount.inc:996
+#: plugins/personal/posix/class_posixAccount.inc:999
+#: plugins/personal/posix/paste_generic.tpl:28
+#: plugins/personal/posix/generic.tpl:56 html/getxls.php:289
+msgid "UID"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:1003
-#: plugins/personal/posix/class_posixAccount.inc:1060
-msgid "Value specified as 'shadowMin' is not valid."
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1008
-#: plugins/personal/posix/class_posixAccount.inc:1065
-msgid "Value specified as 'shadowMax' is not valid."
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1013
-#: plugins/personal/posix/class_posixAccount.inc:1070
-msgid "Value specified as 'shadowWarning' is not valid."
+#: plugins/personal/posix/class_posixAccount.inc:1006
+#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/personal/posix/generic.tpl:67
+#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:1007
+msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1016
-#: plugins/personal/posix/class_posixAccount.inc:1073
-msgid "'shadowWarning' without 'shadowMax' makes no sense."
+#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1067
+msgid "shadowMin"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:1019
-#: plugins/personal/posix/class_posixAccount.inc:1076
-msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1022
-#: plugins/personal/posix/class_posixAccount.inc:1079
-msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1027
-#: plugins/personal/posix/class_posixAccount.inc:1084
-msgid "Value specified as 'shadowInactive' is not valid."
+#: plugins/personal/posix/class_posixAccount.inc:1072
+msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1030
-#: plugins/personal/posix/class_posixAccount.inc:1087
-msgid "'shadowInactive' without 'shadowMax' makes no sense."
+#: plugins/personal/posix/class_posixAccount.inc:1024
+#: plugins/personal/posix/class_posixAccount.inc:1077
+msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1035
-#: plugins/personal/posix/class_posixAccount.inc:1092
-msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1091
+msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1278
+#: plugins/personal/posix/class_posixAccount.inc:1301
 msgid "Cannot allocate a free ID: too many users!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1453
+#: plugins/personal/posix/class_posixAccount.inc:1476
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
-#: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/posix/generic.tpl:7
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1487
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1465
-#: setup/setup_migrate.tpl:217 html/getxls.php:100 html/getxls.php:135
-#: html/getxls.php:158 html/getxls.php:347 html/getxls.php:364
+#: plugins/personal/posix/class_posixAccount.inc:1488
+#: setup/setup_migrate.tpl:217 html/getxls.php:102 html/getxls.php:137
+#: html/getxls.php:160 html/getxls.php:349 html/getxls.php:366
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1489
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1491
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1492
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1493
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1494
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1495
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1496
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1474
+#: plugins/personal/posix/class_posixAccount.inc:1497
 msgid "System trust model"
 msgstr ""
 
@@ -2044,17 +1831,6 @@ msgstr ""
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/paste_generic.tpl:28
-#: plugins/personal/posix/generic.tpl:56 html/getxls.php:287
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/personal/posix/generic.tpl:67
-#: plugins/admin/groups/class_groupGeneric.inc:1008
-msgid "GID"
-msgstr ""
-
 #: plugins/personal/posix/paste_generic.tpl:47
 #: plugins/personal/posix/generic.tpl:82
 msgid "Group membership"
@@ -2070,8 +1846,6 @@ msgid "Primary group"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:36
-#: plugins/addons/gotomasses/goto_task.tpl:20
-#: plugins/addons/gotomasses/class_divListMasses.inc:46
 msgid "Status"
 msgstr ""
 
@@ -2124,214 +1898,14 @@ msgstr ""
 msgid "Regular expression for matching addresses"
 msgstr ""
 
-#: plugins/addons/gotomasses/class_gotomasses.inc:6
-#: plugins/addons/gotomasses/main.inc:50
-msgid "System deployment"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:114
-#: plugins/addons/notifications/class_msgplug.inc:99
-msgid "Permission error"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:114
-msgid "You have no permission to delete this entry!"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:135
-#, php-format
-msgid "Your are about to delete the following tasks: %s"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:237
-#, php-format
-msgid "Cannot load queue entries: %s"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:327
-msgid "GOsa ping"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:328
-msgid "Ping"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:329
-msgid "Say hello"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:337
-#: plugins/addons/gotomasses/class_gotomasses.inc:343
-#: plugins/addons/gotomasses/class_goto_task.inc:6
-msgid "System mass deployment"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:338
-msgid "Provide a mechanism to automatically activate a set of systems"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:345
-#: plugins/addons/gotomasses/class_divListMasses.inc:48
-msgid "Action"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:350
-msgid "Week day"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_gotomasses.inc:351
-#: plugins/addons/gotomasses/class_divListMasses.inc:42
-msgid "Target"
-msgstr ""
-
-#: plugins/addons/gotomasses/goto_task.tpl:12
-msgid "Job ID"
-msgstr ""
-
-#: plugins/addons/gotomasses/goto_task.tpl:28
-msgid "Mac"
-msgstr ""
-
-#: plugins/addons/gotomasses/goto_task.tpl:36
-msgid "Header Tag"
-msgstr ""
-
-#: plugins/addons/gotomasses/goto_task.tpl:40 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:169 include/class_pluglist.inc:283
-msgid "Unknown"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:37
-msgid "Select the target objects for your scheduled action."
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:38
-#: plugins/addons/gotomasses/class_target_list.inc:39
-msgid "Available targets"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:51
-msgid "Select to see object groups"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:51
-msgid "Show object groups"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:52
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:52
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:53
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:53
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:57
-#: plugins/admin/users/class_divListUsers.inc:74
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/class_divListOGroup.inc:82
-#: plugins/admin/departments/class_divListDepartment.inc:53
-#: plugins/admin/acl/class_divListACL.inc:61
-#: plugins/admin/groups/class_divListGroup.inc:73
-msgid "Select to search within subtrees"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:58
-msgid "Select to search for a specific IP range only"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:58
-msgid "Match IP range"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:62
-msgid "IP range start"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:63
-msgid "IP range end"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:132
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/ogroups/class_divListOGroup.inc:165
-#: plugins/admin/departments/class_divListDepartment.inc:127
-#: plugins/admin/acl/class_divListACL.inc:136
-#: plugins/admin/groups/class_divListGroup.inc:152
-msgid "Submit department"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:132
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/ogroups/class_divListOGroup.inc:165
-#: plugins/admin/departments/class_divListDepartment.inc:127
-#: plugins/admin/acl/class_divListACL.inc:136
-#: plugins/admin/groups/class_divListGroup.inc:152
-#: include/class_MultiSelectWindow.inc:242
-msgid "Submit"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_target_list.inc:229
-#: plugins/addons/gotomasses/class_target_list.inc:233
-msgid "IP range is invalid!"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_divListMasses.inc:21
-msgid "List of queued deamon jobs."
-msgstr ""
-
-#: plugins/addons/gotomasses/class_divListMasses.inc:25
-msgid ""
-"This menu allows you to remove and change the properties of GOsa deamon "
-"tasks."
-msgstr ""
-
-#: plugins/addons/gotomasses/class_divListMasses.inc:29
-#: plugins/addons/gotomasses/class_divListMasses.inc:30
-#, php-format
-msgid "Display entries with action %s."
-msgstr ""
-
-#: plugins/addons/gotomasses/class_divListMasses.inc:40
-msgid "#"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_divListMasses.inc:43
-msgid "Task"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_divListMasses.inc:44
-msgid "Schedule"
-msgstr ""
-
-#: plugins/addons/gotomasses/class_divListMasses.inc:127
-msgid "Reomve"
-msgstr ""
-
-#: plugins/addons/gotomasses/remove.tpl:6 plugins/admin/users/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: plugins/addons/bugsubmitter/class_bugsubmitter.inc:5
+msgid "Bug submitter"
 msgstr ""
 
-#: plugins/addons/bugsubmitter/class_bugsubmitter.inc:5
+#: plugins/addons/bugsubmitter/class_bugsubmitter.inc:6
 msgid ""
-"<a href='https://oss.gonicus.de/labs/gosa/newticket' "
-"target='_blank'>Bugsubmitter</a>"
+"<a\thref='https://oss.gonicus.de/labs/gosa/"
+"newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
 #: plugins/addons/notifications/class_msgplug.inc:6
@@ -2339,30 +1913,55 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
+#: plugins/addons/notifications/class_msgplug.inc:7
+msgid "Send user notifications"
+msgstr ""
+
 #: plugins/addons/notifications/class_msgplug.inc:36
 #: plugins/admin/groups/class_groupManagement.inc:24
-#: plugins/admin/groups/class_groupGeneric.inc:998 include/class_acl.inc:196
-#: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
+#: plugins/admin/groups/class_groupGeneric.inc:997 include/class_acl.inc:216
+#: html/getxls.php:126 html/getxls.php:128 html/getxls.php:311
 msgid "Groups"
 msgstr ""
 
+#: plugins/addons/notifications/class_msgplug.inc:99
+#: plugins/admin/ogroups/class_ogroupManagement.inc:261
+#: plugins/admin/ogroups/class_ogroupManagement.inc:313
+#: plugins/admin/ogroups/class_ogroupManagement.inc:340
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_departmentManagement.inc:249
+#: plugins/admin/departments/class_departmentManagement.inc:268
+#: plugins/admin/acl/class_aclManagement.inc:161
+#: plugins/admin/acl/class_aclManagement.inc:198
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
+#: plugins/admin/acl/class_aclManagement.inc:314
+#: plugins/admin/acl/class_aclManagement.inc:338
+#: plugins/admin/groups/class_groupManagement.inc:381
+#: plugins/admin/groups/class_groupManagement.inc:434
+#: plugins/admin/groups/class_groupManagement.inc:465
+msgid "Permission error"
+msgstr ""
+
 #: plugins/addons/notifications/class_msgplug.inc:99
 msgid "You have no permissions to send a message!"
 msgstr ""
 
 #: plugins/addons/notifications/class_msgplug.inc:103
 #: plugins/addons/notifications/class_msgplug.inc:111
-#: include/class_plugin.inc:1154 include/class_plugin.inc:1166
-#: include/class_pluglist.inc:152 include/class_config.inc:554
-#: include/functions.inc:592 include/functions.inc:2509
-#: include/functions.inc:2528 include/class_CopyPasteHandler.inc:91
-#: include/class_CopyPasteHandler.inc:99
-#: include/class_CopyPasteHandler.inc:148
-#: include/class_CopyPasteHandler.inc:156
-#: include/class_CopyPasteHandler.inc:165
-#: include/password-methods/class_password-methods-sha.inc:46
+#: plugins/admin/groups/class_groupGeneric.inc:132
+#: plugins/admin/groups/class_groupGeneric.inc:527
+#: include/class_plugin.inc:1138 include/class_plugin.inc:1150
+#: include/class_pluglist.inc:149 include/class_config.inc:558
+#: include/functions.inc:605 include/functions.inc:2589
+#: include/functions.inc:2616 include/class_CopyPasteHandler.inc:119
+#: include/class_CopyPasteHandler.inc:127
+#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:184
+#: include/class_CopyPasteHandler.inc:193
+#: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/utils/class_timezone.inc:51 html/index.php:205
+#: include/utils/class_timezone.inc:51 html/index.php:217
 msgid "Configuration error"
 msgstr ""
 
@@ -2418,6 +2017,10 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
+#: plugins/addons/notifications/contents.tpl:54
+msgid "Import"
+msgstr ""
+
 #: plugins/addons/notifications/contents.tpl:60
 msgid "Send message"
 msgstr ""
@@ -2512,11 +2115,37 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:82
+#: plugins/admin/departments/class_divListDepartment.inc:53
+#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/groups/class_divListGroup.inc:73
+msgid "Select to search within subtrees"
+msgstr ""
+
 #: plugins/admin/users/class_divListUsers.inc:77
 #: plugins/admin/groups/group_objects.tpl:46
 msgid "Display users matching"
 msgstr ""
 
+#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:127
+#: plugins/admin/acl/class_divListACL.inc:136
+#: plugins/admin/groups/class_divListGroup.inc:152
+msgid "Submit department"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:127
+#: plugins/admin/acl/class_divListACL.inc:136
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: include/class_MultiSelectWindow.inc:262
+msgid "Submit"
+msgstr ""
+
 #: plugins/admin/users/class_divListUsers.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:171
 #: plugins/admin/departments/class_divListDepartment.inc:132
@@ -2527,257 +2156,284 @@ msgid "Create"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:450
-#: setup/setup_config2.tpl:257 setup/setup_config2.tpl:302
+#: plugins/admin/ogroups/class_ogroupManagement.inc:496
+#: setup/setup_config2.tpl:273 setup/setup_config2.tpl:318
 msgid "User"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:158
+#: plugins/admin/users/class_userManagement.inc:728
 #: plugins/admin/users/template.tpl:15
 msgid "Template"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:166
-#: plugins/admin/users/class_divListUsers.inc:309
+#: plugins/admin/users/class_divListUsers.inc:316
 msgid "Change password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:174
-#: plugins/admin/ogroups/class_divListOGroup.inc:191
+#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/acl/class_divListACL.inc:159
-#: plugins/admin/groups/class_divListGroup.inc:179
+#: plugins/admin/groups/class_divListGroup.inc:188
 msgid "Copy"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:176
-#: plugins/admin/ogroups/class_divListOGroup.inc:193
+#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/ogroups/class_divListOGroup.inc:201
 #: plugins/admin/acl/class_divListACL.inc:161
-#: plugins/admin/groups/class_divListGroup.inc:181
+#: plugins/admin/groups/class_divListGroup.inc:190
 msgid "Cut"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:180
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/ogroups/class_divListOGroup.inc:197
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
+#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/ogroups/class_divListOGroup.inc:205
+#: plugins/admin/ogroups/class_divListOGroup.inc:208
 #: plugins/admin/acl/class_divListACL.inc:165
 #: plugins/admin/acl/class_divListACL.inc:168
-#: plugins/admin/groups/class_divListGroup.inc:185
-#: plugins/admin/groups/class_divListGroup.inc:188
-#: include/class_CopyPasteHandler.inc:435
+#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/groups/class_divListGroup.inc:197
+#: include/class_CopyPasteHandler.inc:483
 msgid "Paste"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:236
+#: plugins/admin/users/class_divListUsers.inc:243
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/users/class_divListUsers.inc:244
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:238
-#: plugins/admin/groups/class_divListGroup.inc:226
+#: plugins/admin/users/class_divListUsers.inc:245
+#: plugins/admin/groups/class_divListGroup.inc:235
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/users/class_divListUsers.inc:246
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:241
+#: plugins/admin/users/class_divListUsers.inc:247
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
+#: plugins/admin/groups/class_divListGroup.inc:245
+msgid "Environment"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:248
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/users/class_divListUsers.inc:250
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:245
+#: plugins/admin/users/class_divListUsers.inc:252
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:247
+#: plugins/admin/users/class_divListUsers.inc:254
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:249
+#: plugins/admin/users/class_divListUsers.inc:256
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:251
+#: plugins/admin/users/class_divListUsers.inc:257
+msgid "Netatalk"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:258
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:252
+#: plugins/admin/users/class_divListUsers.inc:259
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:253
+#: plugins/admin/users/class_divListUsers.inc:260
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:277
-#: plugins/admin/ogroups/class_divListOGroup.inc:247
+#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/ogroups/class_divListOGroup.inc:255
 #: plugins/admin/acl/class_divListACL.inc:216
-#: plugins/admin/groups/class_divListGroup.inc:256
+#: plugins/admin/groups/class_divListGroup.inc:265
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:277
-#: plugins/admin/ogroups/class_divListOGroup.inc:247
+#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/ogroups/class_divListOGroup.inc:255
 #: plugins/admin/acl/class_divListACL.inc:216
-#: plugins/admin/groups/class_divListGroup.inc:256
+#: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:279
-#: plugins/admin/ogroups/class_divListOGroup.inc:249
+#: plugins/admin/users/class_divListUsers.inc:286
+#: plugins/admin/ogroups/class_divListOGroup.inc:257
 #: plugins/admin/acl/class_divListACL.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:258
+#: plugins/admin/groups/class_divListGroup.inc:267
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:279
-#: plugins/admin/ogroups/class_divListOGroup.inc:249
+#: plugins/admin/users/class_divListUsers.inc:286
+#: plugins/admin/ogroups/class_divListOGroup.inc:257
 #: plugins/admin/acl/class_divListACL.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:258
+#: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:288
+#: plugins/admin/users/class_divListUsers.inc:295
 msgid "Deactivated"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:291
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Active"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:298
-#: plugins/admin/ogroups/class_divListOGroup.inc:253
+#: plugins/admin/users/class_divListUsers.inc:305
+#: plugins/admin/ogroups/class_divListOGroup.inc:261
 #: plugins/admin/departments/class_divListDepartment.inc:166
 #: plugins/admin/acl/class_aclRole.inc:340
 #: plugins/admin/acl/class_aclRole.inc:385
 #: plugins/admin/acl/class_divListACL.inc:223
 #: plugins/admin/acl/class_divListACL.inc:245
-#: plugins/admin/groups/class_divListGroup.inc:263 include/class_acl.inc:409
-#: include/class_acl.inc:452
+#: plugins/admin/groups/class_divListGroup.inc:272 include/class_acl.inc:429
+#: include/class_acl.inc:472
 msgid "edit"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:299
+#: plugins/admin/users/class_divListUsers.inc:306
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:308
+#: plugins/admin/users/class_divListUsers.inc:315
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/users/class_divListUsers.inc:319
 msgid "You are not allowed to change the password for this user."
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:322
-#: plugins/admin/ogroups/class_divListOGroup.inc:261
+#: plugins/admin/users/class_divListUsers.inc:329
+#: plugins/admin/ogroups/class_divListOGroup.inc:269
 #: plugins/admin/departments/class_divListDepartment.inc:171
 #: plugins/admin/acl/class_aclRole.inc:341
 #: plugins/admin/acl/class_aclRole.inc:386
 #: plugins/admin/acl/class_divListACL.inc:233
 #: plugins/admin/acl/class_divListACL.inc:249
-#: plugins/admin/groups/class_divListGroup.inc:272 include/class_acl.inc:410
-#: include/class_acl.inc:453
+#: plugins/admin/groups/class_divListGroup.inc:281 include/class_acl.inc:430
+#: include/class_acl.inc:473
 msgid "delete"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:323
-#: plugins/admin/users/class_userManagement.inc:526
+#: plugins/admin/users/class_divListUsers.inc:330
+#: plugins/admin/users/class_userManagement.inc:571
 msgid "Delete user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:326
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "You are not allowed to remove this user."
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:412
+#: plugins/admin/users/class_divListUsers.inc:419
 msgid "Number of listed users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:413
-#: plugins/admin/ogroups/class_divListOGroup.inc:311
+#: plugins/admin/users/class_divListUsers.inc:420
+#: plugins/admin/ogroups/class_divListOGroup.inc:319
 #: plugins/admin/departments/class_divListDepartment.inc:210
-#: plugins/admin/groups/class_divListGroup.inc:330
+#: plugins/admin/groups/class_divListGroup.inc:339
 msgid "Number of listed departments"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:241
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Manage users"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:186
+#: plugins/admin/ogroups/class_ogroupManagement.inc:166
+#: plugins/admin/groups/class_groupManagement.inc:184
+msgid "Daemon"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:186
+#: plugins/admin/ogroups/class_ogroupManagement.inc:166
+#: plugins/admin/groups/class_groupManagement.inc:184
+#, php-format
+msgid "Something went wrong while talking to the daemon: %s."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:286
 msgid "Password change failed."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:241
-#: plugins/admin/users/class_userManagement.inc:296
+#: plugins/admin/users/class_userManagement.inc:286
+#: plugins/admin/users/class_userManagement.inc:341
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:449
 #, php-format
 msgid "You're about to delete the following entry: %s"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:406
+#: plugins/admin/users/class_userManagement.inc:451
 #, php-format
 msgid "You're about to delete the following entries: %s"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:453
 msgid "Delete users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:436
-#: plugins/admin/users/class_userManagement.inc:558
+#: plugins/admin/users/class_userManagement.inc:481
+#: plugins/admin/users/class_userManagement.inc:603
 msgid "User delete"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:436
+#: plugins/admin/users/class_userManagement.inc:481
 #, php-format
 msgid "You are not allowed to delete the user '%s'!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:493
+#: plugins/admin/users/class_userManagement.inc:538
 msgid "Could not set user status from locked to unlocked."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:495
+#: plugins/admin/users/class_userManagement.inc:540
 msgid "Could not set user status from unlocked to locked."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:526
+#: plugins/admin/users/class_userManagement.inc:571
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:553
-msgid "User delted"
+#: plugins/admin/users/class_userManagement.inc:598
+msgid "User deleted"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:598
 msgid "User successfully removed."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:558
+#: plugins/admin/users/class_userManagement.inc:603
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:664
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:286
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:683
-msgid "Please select a valid template."
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:776
-msgid "A person with the choosen name is already used in this tree."
+#: plugins/admin/users/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
 msgstr ""
 
 #: plugins/admin/users/template.tpl:2
@@ -2791,139 +2447,149 @@ msgid ""
 "templates."
 msgstr ""
 
-#: plugins/admin/users/password.tpl:2
+#: plugins/admin/users/password.tpl:4
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
 msgstr ""
 
+#: plugins/admin/users/password.tpl:21
+msgid "Strength"
+msgstr ""
+
 #: plugins/admin/users/main.inc:43 plugins/admin/users/main.inc:49
 msgid "User administration"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:24
-#: plugins/admin/ogroups/class_ogroup.inc:758
+#: plugins/admin/ogroups/class_ogroup.inc:746
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Manage object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:229
 #, php-format
 msgid "You're about to delete the following object entry %s"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:185
+#: plugins/admin/ogroups/class_ogroupManagement.inc:231
 #, php-format
 msgid "You're about to delete the following object entries %s"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#: plugins/admin/ogroups/class_ogroupManagement.inc:267
-#: plugins/admin/ogroups/class_ogroupManagement.inc:294
-msgid "You are not allowed to delete this object group!"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:261
+#: plugins/admin/ogroups/class_ogroupManagement.inc:313
+#: plugins/admin/ogroups/class_ogroupManagement.inc:340
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_departmentManagement.inc:249
+#: plugins/admin/departments/class_departmentManagement.inc:268
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
+#: plugins/admin/acl/class_aclManagement.inc:314
+#: plugins/admin/acl/class_aclManagement.inc:338
+#: plugins/admin/groups/class_groupManagement.inc:381
+#: plugins/admin/groups/class_groupManagement.inc:434
+#: plugins/admin/groups/class_groupManagement.inc:465
+msgid "You have no permission to delete this entry!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:260
+#: plugins/admin/ogroups/class_ogroupManagement.inc:306
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:457
+#: plugins/admin/ogroups/class_ogroupManagement.inc:503
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:458
+#: plugins/admin/ogroups/class_ogroupManagement.inc:504
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:156
+#: plugins/admin/ogroups/class_ogroup.inc:150
+msgid "You cannot combine terminals and workstations in one object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:171
 msgid "This 'dn' is no object group."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:288
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:290
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:303
+#: plugins/admin/ogroups/class_ogroup.inc:291
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
+#: plugins/admin/ogroups/class_ogroup.inc:292
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:305
+#: plugins/admin/ogroups/class_ogroup.inc:293
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:306
+#: plugins/admin/ogroups/class_ogroup.inc:294
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:307
+#: plugins/admin/ogroups/class_ogroup.inc:295
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:297
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:310
+#: plugins/admin/ogroups/class_ogroup.inc:298
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:311
+#: plugins/admin/ogroups/class_ogroup.inc:299
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:318
+#: plugins/admin/ogroups/class_ogroup.inc:306
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:451
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:607
-msgid "There is already an object with this cn."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:622
-msgid "You can combine two different object types at maximum only!"
+#: plugins/admin/ogroups/class_ogroup.inc:610
+msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:678
+#: plugins/admin/ogroups/class_ogroup.inc:666
 #, php-format
 msgid "Saving of object group/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:691
+#: plugins/admin/ogroups/class_ogroup.inc:679
 #, php-format
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/ogroups/class_ogroup.inc:741
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:761 plugins/admin/acl/acl_role.tpl:7
-#: plugins/admin/acl/class_aclRole.inc:677 plugins/admin/acl/paste_role.tpl:4
-#: plugins/admin/groups/class_groupGeneric.inc:1001
-#: setup/setup_migrate.tpl:209 setup/setup_feedback.tpl:22 html/getxls.php:223
-#: html/getxls.php:290
-msgid "Name"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:764
+#: plugins/admin/ogroups/class_ogroup.inc:752
 msgid "Member"
 msgstr ""
 
@@ -2963,6 +2629,23 @@ msgstr ""
 msgid "Show applications"
 msgstr ""
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Select to see servers"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Select to see workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to see terminals"
 msgstr ""
@@ -3051,8 +2734,8 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:64
 #: plugins/admin/departments/class_departmentManagement.inc:24
-#: plugins/admin/departments/class_departmentGeneric.inc:582
-#: plugins/admin/departments/class_departmentGeneric.inc:587
+#: plugins/admin/departments/class_departmentGeneric.inc:563
+#: plugins/admin/departments/class_departmentGeneric.inc:568
 msgid "Departments"
 msgstr ""
 
@@ -3136,64 +2819,93 @@ msgstr ""
 msgid "Show groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:253
+#: plugins/admin/ogroups/class_divListOGroup.inc:261
 #: plugins/admin/departments/class_divListDepartment.inc:166
-#: plugins/admin/groups/class_divListGroup.inc:263
+#: plugins/admin/groups/class_divListGroup.inc:272
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:261
+#: plugins/admin/ogroups/class_divListOGroup.inc:269
 #: plugins/admin/departments/class_divListDepartment.inc:171
-#: plugins/admin/groups/class_divListGroup.inc:272
+#: plugins/admin/groups/class_divListGroup.inc:281
 msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:264
+#: plugins/admin/ogroups/class_divListOGroup.inc:272
 msgid "You are not allowed to remove this entry."
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:310
+#: plugins/admin/ogroups/class_divListOGroup.inc:318
 msgid "Number of listed object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:71
-#: plugins/admin/ogroups/tabs_ogroups.inc:215
+#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/ogroups/tabs_ogroups.inc:228
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:95
+#: plugins/admin/ogroups/tabs_ogroups.inc:100
 msgid "System"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:108
+#: plugins/admin/ogroups/tabs_ogroups.inc:115
+#: plugins/admin/ogroups/tabs_ogroups.inc:208
+msgid "Devices"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:122
+msgid "Startup"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:126
+#: plugins/admin/acl/class_divListACL.inc:54
+msgid "Summary"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
 msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:178
-#: plugins/admin/groups/class_groupManagement.inc:298
+#: plugins/admin/departments/class_departmentManagement.inc:25
+msgid "Manage Departments"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:173
+#: plugins/admin/groups/class_groupManagement.inc:345
 #, php-format
 msgid "You're about to delete the following entry %s"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:180
-#: plugins/admin/groups/class_groupManagement.inc:300
+#: plugins/admin/departments/class_departmentManagement.inc:175
+#: plugins/admin/groups/class_groupManagement.inc:347
 #, php-format
 msgid "You're about to delete the following entries %s"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:206
-#: plugins/admin/departments/class_departmentManagement.inc:254
-#: plugins/admin/departments/class_departmentManagement.inc:273
-msgid "You have no permission to remove this department."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:248
+#: plugins/admin/departments/class_departmentManagement.inc:243
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:34
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
+#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStep_Migrate.inc:1056
+#: setup/class_setupStep_Migrate.inc:1104
+#: setup/class_setupStep_Migrate.inc:1152
+#: setup/class_setupStep_Migrate.inc:1916 setup/class_setupStep_Schema.inc:95
+#: include/class_MultiSelectWindow.inc:523 include/class_config.inc:226
+#: include/functions.inc:344 include/functions.inc:371
+#: include/functions.inc:380 include/functions.inc:409
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:1378
+#: include/functions.inc:2570 html/index.php:255 html/index.php:269
+#: html/index.php:282
+msgid "LDAP error"
+msgstr ""
+
+#: plugins/admin/departments/tabs_department.inc:34
+msgid "Moving LDAP tree failed: destination tree is a subtree of the source!"
 msgstr ""
 
 #: plugins/admin/departments/dep_move_confirm.tpl:2
@@ -3216,94 +2928,87 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:197
+#: plugins/admin/departments/class_departmentGeneric.inc:187
 #, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:258
-#: plugins/admin/departments/class_departmentGeneric.inc:260
-msgid "Department with that 'Name' already exists."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:265
+#: plugins/admin/departments/class_departmentGeneric.inc:253
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:268
+#: plugins/admin/departments/class_departmentGeneric.inc:257
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:272
-#, php-format
-msgid ""
-"The field 'Name' contains the reserved word '%s'. Please choose another name."
+#: plugins/admin/departments/class_departmentGeneric.inc:314 html/main.php:152
+msgid "Fatal error"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:326
-msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:376
+#: plugins/admin/departments/class_departmentGeneric.inc:360
 #, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:424
+#: plugins/admin/departments/class_departmentGeneric.inc:405
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:509
+#: plugins/admin/departments/class_departmentGeneric.inc:490
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:531
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:591
+#: plugins/admin/departments/class_departmentGeneric.inc:572
 msgid "Country"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:594
+#: plugins/admin/departments/class_departmentGeneric.inc:575
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:595
+#: plugins/admin/departments/class_departmentGeneric.inc:576
 #: plugins/admin/departments/class_divListDepartment.inc:48
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_departmentGeneric.inc:577
 #: plugins/admin/departments/generic.tpl:24
 msgid "Category"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:599
-#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:580
+#: plugins/admin/departments/generic.tpl:109
 msgid "Administrative settings"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:651
+#: plugins/admin/departments/class_departmentGeneric.inc:632
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:658
+#: plugins/admin/departments/class_departmentGeneric.inc:639
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:653
+#: plugins/admin/departments/class_departmentGeneric.inc:682
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:688
+#: plugins/admin/departments/class_departmentGeneric.inc:669
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -3382,7 +3087,7 @@ msgstr ""
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:119
+#: plugins/admin/departments/generic.tpl:111
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
@@ -3408,85 +3113,91 @@ msgstr ""
 msgid "Access control list templates"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:103 include/class_acl.inc:177
+#: plugins/admin/acl/class_aclRole.inc:7
+msgid "Edit ACL roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:103 include/class_acl.inc:197
 msgid "All categories"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:110 include/class_acl.inc:185
+#: plugins/admin/acl/class_aclRole.inc:110 include/class_acl.inc:205
 msgid "Reset ACLs"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:111 include/class_acl.inc:186
+#: plugins/admin/acl/class_aclRole.inc:111 include/class_acl.inc:206
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:112 include/class_acl.inc:187
-#: include/class_acl.inc:192
+#: plugins/admin/acl/class_aclRole.inc:112 include/class_acl.inc:207
+#: include/class_acl.inc:212
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:113 include/class_acl.inc:188
+#: plugins/admin/acl/class_aclRole.inc:113 include/class_acl.inc:208
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:114 include/class_acl.inc:189
+#: plugins/admin/acl/class_aclRole.inc:114 include/class_acl.inc:209
 msgid "Complete subtree (permanent)"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:338
-#: include/class_MultiSelectWindow.inc:227
-#: include/class_MultiSelectWindow.inc:229 include/class_acl.inc:407
+#: include/class_MultiSelectWindow.inc:247
+#: include/class_MultiSelectWindow.inc:249 include/class_acl.inc:427
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:339 include/class_acl.inc:408
+#: plugins/admin/acl/class_aclRole.inc:339 include/class_acl.inc:428
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:340 include/class_acl.inc:409
+#: plugins/admin/acl/class_aclRole.inc:340 include/class_acl.inc:429
 msgid "Edit ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:341 include/class_acl.inc:410
+#: plugins/admin/acl/class_aclRole.inc:341 include/class_acl.inc:430
 msgid "Delete ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:378 include/class_acl.inc:445
+#: plugins/admin/acl/class_aclRole.inc:378 include/class_acl.inc:465
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:380 include/class_acl.inc:447
+#: plugins/admin/acl/class_aclRole.inc:380 include/class_acl.inc:467
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:385 include/class_acl.inc:452
+#: plugins/admin/acl/class_aclRole.inc:385 include/class_acl.inc:472
 msgid "Edit categories ACLs"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:386 include/class_acl.inc:453
+#: plugins/admin/acl/class_aclRole.inc:386 include/class_acl.inc:473
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:402 include/class_acl.inc:498
+#: plugins/admin/acl/class_aclRole.inc:402 include/class_acl.inc:518
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:412 include/class_acl.inc:508
+#: plugins/admin/acl/class_aclRole.inc:412 include/class_acl.inc:528
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:564 include/class_acl.inc:1061
+#: plugins/admin/acl/class_aclRole.inc:564 include/class_acl.inc:1081
 #, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/acl/class_aclRole.inc:596
+msgid "Object in use"
+msgstr ""
+
 #: plugins/admin/acl/class_aclRole.inc:596
 #, php-format
-msgid ""
-"This role can't be removed while it is in use. Follwing objects are using "
-"this role %s"
+msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:602
@@ -3499,7 +3210,7 @@ msgstr ""
 msgid "Removing aclRole from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:669 include/class_acl.inc:1098
+#: plugins/admin/acl/class_aclRole.inc:669 include/class_acl.inc:1118
 msgid "ACL roles"
 msgstr ""
 
@@ -3561,28 +3272,22 @@ msgstr ""
 msgid "ACLs"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:160
-msgid "You are not allowed to create a new role."
+#: plugins/admin/acl/class_aclManagement.inc:25 include/class_acl.inc:27
+msgid "Manage access control lists"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:197
-msgid "You are not allowed to edit this acl."
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:242
-#: plugins/admin/acl/class_aclManagement.inc:306
-#, php-format
-msgid "You're about to delete the acl %s."
+#: plugins/admin/acl/class_aclManagement.inc:161
+msgid "You have no permission to create a new role!"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:250
-#: plugins/admin/acl/class_aclManagement.inc:313
-#: plugins/admin/acl/class_aclManagement.inc:337
-msgid "You are not allowed to delete this acl!"
+#: plugins/admin/acl/class_aclManagement.inc:198
+msgid "You have no permission to edit this ACL!"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:274
-msgid "You are not allowed to delete this acl role!"
+#: plugins/admin/acl/class_aclManagement.inc:243
+#: plugins/admin/acl/class_aclManagement.inc:307
+#, php-format
+msgid "You're about to delete the acl %s."
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:35
@@ -3641,7 +3346,7 @@ msgstr ""
 msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:329
+#: plugins/admin/groups/class_divListGroup.inc:338
 msgid "Number of listed groups"
 msgstr ""
 
@@ -3661,13 +3366,11 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:334
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:418
-msgid "You are not allowed to delete this group!"
+#: plugins/admin/groups/class_groupManagement.inc:25
+msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:380
+#: plugins/admin/groups/class_groupManagement.inc:427
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
@@ -3726,102 +3429,89 @@ msgstr ""
 msgid "Group administration"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:137
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/admin/groups/class_groupGeneric.inc:132
+msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:193
+#: plugins/admin/groups/class_groupGeneric.inc:188
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:329
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:329
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:334
+#: plugins/admin/groups/class_groupGeneric.inc:329
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:335
+#: plugins/admin/groups/class_groupGeneric.inc:330
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:340
+#: plugins/admin/groups/class_groupGeneric.inc:335
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:494
+#: plugins/admin/groups/class_groupGeneric.inc:489
 msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:532
+#: plugins/admin/groups/class_groupGeneric.inc:527
 #, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
+msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:561
-#: plugins/admin/groups/class_groupGeneric.inc:826
+#: plugins/admin/groups/class_groupGeneric.inc:556
+#: plugins/admin/groups/class_groupGeneric.inc:821
 #, php-format
 msgid "Removing of groups/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:711
+#: plugins/admin/groups/class_groupGeneric.inc:706
 #, php-format
-msgid "No configured SID found for '%s'."
+msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/groups/class_groupGeneric.inc:711
 #, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:858
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:869
-#: plugins/admin/groups/class_groupGeneric.inc:883
-#: plugins/admin/groups/class_groupGeneric.inc:890
-msgid "Value specified as 'Name' is already used."
+msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:944
-msgid "Too many users, can't allocate a free ID!"
+#: plugins/admin/groups/class_groupGeneric.inc:943
+msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:993
+#: plugins/admin/groups/class_groupGeneric.inc:992
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1005
+#: plugins/admin/groups/class_groupGeneric.inc:1004
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1006
+#: plugins/admin/groups/class_groupGeneric.inc:1005
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1009
+#: plugins/admin/groups/class_groupGeneric.inc:1008
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:1009
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1011
+#: plugins/admin/groups/class_groupGeneric.inc:1010
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1012 setup/setup_config2.tpl:15
+#: plugins/admin/groups/class_groupGeneric.inc:1011 setup/setup_config2.tpl:15
 msgid "Samba SID"
 msgstr ""
 
@@ -3900,17 +3590,17 @@ msgstr ""
 msgid "GOsa generic settings"
 msgstr ""
 
-#: setup/class_setupStep_Config1.inc:88 setup/class_setupStep_Config3.inc:89
+#: setup/class_setupStep_Config1.inc:88 setup/class_setupStep_Config3.inc:86
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Schema.inc:63
-#: setup/class_setupStep_Config2.inc:161
+#: setup/class_setupStep_Config2.inc:160
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config1.inc:88 setup/class_setupStep_Config3.inc:89
+#: setup/class_setupStep_Config1.inc:88 setup/class_setupStep_Config3.inc:86
 #: setup/setup_feedback.tpl:53 setup/setup_feedback.tpl:71
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Schema.inc:63
-#: setup/class_setupStep_Config2.inc:161
+#: setup/class_setupStep_Config2.inc:160
 msgid "Yes"
 msgstr ""
 
@@ -4049,7 +3739,7 @@ msgstr ""
 msgid "What will be done here"
 msgstr ""
 
-#: setup/setup_migrate.tpl:79 include/class_MultiSelectWindow.inc:114
+#: setup/setup_migrate.tpl:79 include/class_MultiSelectWindow.inc:134
 msgid "Close"
 msgstr ""
 
@@ -4067,7 +3757,7 @@ msgstr ""
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The GOsa setup can't migrate references, so you may want to cancel "
-"the migration in this case in this case."
+"the migration in this case."
 msgstr ""
 
 #: setup/setup_migrate.tpl:94
@@ -4129,8 +3819,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl:258
 msgid ""
-"The listed departments are currenlty invisble in the GOsa user interface. If "
-"you want to change this for a couple of entries, select them and use the "
+"The listed departments are currently invisible in the GOsa user interface. "
+"If you want to change this for a couple of entries, select them and use the "
 "migrate button below."
 msgstr ""
 
@@ -4155,19 +3845,19 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:80 setup/class_setupStep_Config3.inc:81
+#: setup/class_setupStep_Config3.inc:77 setup/class_setupStep_Config3.inc:78
 msgid "GOsa settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:82
+#: setup/class_setupStep_Config3.inc:79
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:205
+#: setup/class_setupStep_Config3.inc:193
 msgid "Session lifetime must be a numeric value."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:209
+#: setup/class_setupStep_Config3.inc:197
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr ""
 
@@ -4188,7 +3878,7 @@ msgid "Checking permissions on LDAP database"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:125
-msgid "Checking for invisible deparmtments"
+msgid "Checking for invisible departments"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:131
@@ -4333,21 +4023,6 @@ msgstr ""
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
-#: setup/class_setupStep_Migrate.inc:1056
-#: setup/class_setupStep_Migrate.inc:1104
-#: setup/class_setupStep_Migrate.inc:1152
-#: setup/class_setupStep_Migrate.inc:1916 setup/class_setupStep_Schema.inc:95
-#: include/class_MultiSelectWindow.inc:503 include/class_config.inc:224
-#: include/functions.inc:331 include/functions.inc:358
-#: include/functions.inc:367 include/functions.inc:396
-#: include/functions.inc:639 include/functions.inc:678
-#: include/functions.inc:723 include/functions.inc:1298
-#: include/functions.inc:2490 html/index.php:243 html/index.php:257
-#: html/index.php:270
-msgid "LDAP error"
-msgstr ""
-
 #: setup/class_setupStep_Migrate.inc:1056
 #: setup/class_setupStep_Migrate.inc:1104
 #: setup/class_setupStep_Migrate.inc:1152
@@ -4360,7 +4035,7 @@ msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:1066
 #: setup/class_setupStep_Migrate.inc:1115
-#: setup/class_setupStep_Migrate.inc:1162 include/class_plugin.inc:1604
+#: setup/class_setupStep_Migrate.inc:1162 include/class_plugin.inc:1585
 msgid "to"
 msgstr ""
 
@@ -4485,8 +4160,7 @@ msgstr ""
 
 #: setup/class_setupStep_Feedback.inc:183
 msgid ""
-"You should have enabled at least one option, to subscribe or send your "
-"feedback."
+"You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
 
 #: setup/class_setupStep_License.inc:56 setup/class_setupStep_License.inc:57
@@ -4522,7 +4196,7 @@ msgid "Timezone"
 msgstr ""
 
 #: setup/setup_config2.tpl:74
-msgid "Please your preferred timezone here"
+msgid "Please choose your preferred timezone here"
 msgstr ""
 
 #: setup/setup_config2.tpl:96
@@ -4565,23 +4239,27 @@ msgstr ""
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:198
-msgid "Vacation templates"
+#: setup/setup_config2.tpl:200
+msgid "Account identification attribute"
 msgstr ""
 
 #: setup/setup_config2.tpl:214
+msgid "Vacation templates"
+msgstr ""
+
+#: setup/setup_config2.tpl:230
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:224
+#: setup/setup_config2.tpl:240
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:233 setup/setup_config2.tpl:278
+#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:239 setup/setup_config2.tpl:284
+#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
 msgid "Snapshot base"
 msgstr ""
 
@@ -4596,7 +4274,7 @@ msgid ""
 "this by mail."
 msgstr ""
 
-#: setup/setup_feedback.tpl:30 html/getxls.php:225
+#: setup/setup_feedback.tpl:30 html/getxls.php:227
 msgid "Mail address"
 msgstr ""
 
@@ -4856,7 +4534,7 @@ msgid ""
 msgstr ""
 
 #: setup/setup_language.tpl:9
-msgid "Please your preferred language here"
+msgid "Please select your preferred language here"
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:38 setup/class_setupStep_Checks.inc:39
@@ -5201,75 +4879,71 @@ msgstr ""
 msgid "Enable system deployment"
 msgstr ""
 
-#: setup/setup_config3.tpl:116
-msgid "Network resolv hook"
-msgstr ""
-
-#: setup/setup_config3.tpl:135
+#: setup/setup_config3.tpl:115
 msgid "Mail queue script"
 msgstr ""
 
-#: setup/setup_config3.tpl:154
+#: setup/setup_config3.tpl:134
 msgid "Notification script"
 msgstr ""
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:153
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl:192
+#: setup/setup_config3.tpl:172
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:195
+#: setup/setup_config3.tpl:175
 msgid "Login attribute"
 msgstr ""
 
-#: setup/setup_config3.tpl:206
+#: setup/setup_config3.tpl:186
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:218
+#: setup/setup_config3.tpl:198
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: setup/setup_config3.tpl:230
+#: setup/setup_config3.tpl:210
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: setup/setup_config3.tpl:242
+#: setup/setup_config3.tpl:222
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: setup/setup_config3.tpl:254
+#: setup/setup_config3.tpl:234
 msgid "Session lifetime"
 msgstr ""
 
-#: setup/setup_config3.tpl:262
+#: setup/setup_config3.tpl:243
 msgid "Debugging"
 msgstr ""
 
-#: setup/setup_config3.tpl:266
+#: setup/setup_config3.tpl:247
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl:278
+#: setup/setup_config3.tpl:259
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: setup/setup_config3.tpl:296
+#: setup/setup_config3.tpl:277
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:308
+#: setup/setup_config3.tpl:289
 msgid "Debug level"
 msgstr ""
 
-#: setup/setup_config3.tpl:313 setup/setup_config3.tpl:316
+#: setup/setup_config3.tpl:294 setup/setup_config3.tpl:297
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl:314 setup/setup_config3.tpl:317
+#: setup/setup_config3.tpl:295 setup/setup_config3.tpl:298
 msgid "Enabled"
 msgstr ""
 
@@ -5293,7 +4967,7 @@ msgstr ""
 msgid "Perform test on your current LDAP schema"
 msgstr ""
 
-#: setup/class_setupStep_Schema.inc:95 html/index.php:257
+#: setup/class_setupStep_Schema.inc:95 html/index.php:269
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
@@ -5339,7 +5013,7 @@ msgstr ""
 
 #: setup/class_setupStep_Finish.inc:100
 msgid ""
-"Your configuration file is currently world readable. Please updated the file "
+"Your configuration file is currently world readable. Please update the file "
 "permissions!"
 msgstr ""
 
@@ -5356,1213 +5030,1271 @@ msgid ""
 "requirement:"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:87 setup/class_setupStep_Config2.inc:88
+#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
 msgid "GOsa settings 2/3"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:89
+#: setup/class_setupStep_Config2.inc:87
 msgid "Customize special parameters"
 msgstr ""
 
-#: include/functions_helpviewer.inc:43
+#: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
 msgstr ""
 
-#: include/functions_helpviewer.inc:86
+#: include/functions_helpviewer.inc:88
 msgid "No help available for this plugin."
 msgstr ""
 
-#: include/functions_helpviewer.inc:95 html/helpviewer.php:196
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:198
 msgid "previous"
 msgstr ""
 
-#: include/functions_helpviewer.inc:99 html/helpviewer.php:200
+#: include/functions_helpviewer.inc:101 html/helpviewer.php:202
 msgid "next"
 msgstr ""
 
-#: include/functions_helpviewer.inc:387
+#: include/functions_helpviewer.inc:389
 #, php-format
 msgid "%s results for your search with the keyword %s"
 msgstr ""
 
-#: include/functions_helpviewer.inc:461
+#: include/functions_helpviewer.inc:463
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_tabs.inc:214
+#: include/class_tabs.inc:216
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:341 include/class_acl.inc:1092
-#: include/class_acl.inc:1093 include/class_acl.inc:1098
+#: include/class_tabs.inc:343 include/class_acl.inc:1112
+#: include/class_acl.inc:1113 include/class_acl.inc:1118
 msgid "ACL"
 msgstr ""
 
-#: include/class_tabs.inc:344
+#: include/class_tabs.inc:346
 msgid "References"
 msgstr ""
 
-#: include/class_plugin.inc:436
-#, php-format
-msgid ""
-"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
-msgstr ""
-
-#: include/class_plugin.inc:490
-msgid ""
-"The object has changed since opened in GOsa. Please ensure that nobody has "
-"done serious changes that may get lost   if you save this entry."
-msgstr ""
-
-#: include/class_plugin.inc:623
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-
-#: include/class_plugin.inc:655 include/functions.inc:2508
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-
-#: include/class_plugin.inc:691
-#, php-format
+#: include/class_plugin.inc:489
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"The object has changed since opened in GOsa. All changes that may be done by "
+"others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1080 include/class_plugin.inc:1127
-#: include/class_plugin.inc:1128
+#: include/class_plugin.inc:1064 include/class_plugin.inc:1111
+#: include/class_plugin.inc:1112
 #, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1154 include/class_plugin.inc:1166
+#: include/class_plugin.inc:1138 include/class_plugin.inc:1150
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_plugin.inc:1202
+#: include/class_plugin.inc:1186
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1258
+#: include/class_plugin.inc:1242
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1322 include/class_plugin.inc:1336
+#: include/class_plugin.inc:1306 include/class_plugin.inc:1320
 #, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1602
+#: include/class_plugin.inc:1584
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1602
+#: include/class_plugin.inc:1584
 msgid "from"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:219
+#: include/class_MultiSelectWindow.inc:239
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:219
-#: include/class_MultiSelectWindow.inc:221
+#: include/class_MultiSelectWindow.inc:239
+#: include/class_MultiSelectWindow.inc:241
 msgid "Root"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:227
+#: include/class_MultiSelectWindow.inc:247
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:235
+#: include/class_MultiSelectWindow.inc:255
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:235
-#: include/class_MultiSelectWindow.inc:237
+#: include/class_MultiSelectWindow.inc:255
+#: include/class_MultiSelectWindow.inc:257
 msgid "Home"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:242
+#: include/class_MultiSelectWindow.inc:262
 msgid "Reload list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:503
+#: include/class_MultiSelectWindow.inc:523
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:622
-#: include/class_MultiSelectWindow.inc:626
-#: include/class_MultiSelectWindow.inc:630
+#: include/class_MultiSelectWindow.inc:642
+#: include/class_MultiSelectWindow.inc:646
+#: include/class_MultiSelectWindow.inc:650
 msgid "Restore"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:625
+#: include/class_MultiSelectWindow.inc:645
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_SnapShotDialog.inc:113
+#: include/class_MultiSelectWindow.inc:668
+#: include/class_SnapShotDialog.inc:133
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:654
+#: include/class_MultiSelectWindow.inc:674
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:654
+#: include/class_MultiSelectWindow.inc:674
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_pluglist.inc:55
+#: include/class_pluglist.inc:56
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:152
+#: include/class_pluglist.inc:150
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
-#: include/class_certificate.inc:35
+#: include/class_pluglist.inc:167 include/class_pluglist.inc:168
+#: include/class_pluglist.inc:282
+msgid "Unknown"
+msgstr ""
+
+#: include/class_certificate.inc:55
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
 
-#: include/class_certificate.inc:53
+#: include/class_certificate.inc:73
 msgid "Can't read specified certificate / or empty string given"
 msgstr ""
 
-#: include/class_certificate.inc:80
+#: include/class_certificate.inc:100
 msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
 msgstr ""
 
-#: include/class_certificate.inc:95
+#: include/class_certificate.inc:115
 msgid "The Format must be PEM, to output certificate informations"
 msgstr ""
 
-#: include/class_certificate.inc:192
+#: include/class_certificate.inc:212
 msgid "Can't create/open File"
 msgstr ""
 
-#: include/class_certificate.inc:199
+#: include/class_certificate.inc:219
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/class_socketClient.inc:37
+#: include/class_socketClient.inc:58
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:63
+#: include/class_SnapShotDialog.inc:83
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:115
+#: include/class_SnapShotDialog.inc:135
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
+#: include/class_SnapShotDialog.inc:137 include/class_SnapShotDialog.inc:157
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:149
-msgid "Please specify a valid description for this snapshot."
-msgstr ""
-
-#: include/class_config.inc:104
+#: include/class_config.inc:106
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:107
+#: include/class_config.inc:109
 msgid "Config file parsing"
 msgstr ""
 
-#: include/class_config.inc:224 html/index.php:243
-msgid "Can't bind to LDAP. Please contact the system administrator."
+#: include/class_config.inc:226
+msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:554
+#: include/class_config.inc:558
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr ""
 
-#: include/class_log.inc:87 include/class_acl.inc:806
-#: include/functions.inc:437 include/functions.inc:582
-#: include/functions.inc:607 include/functions.inc:668
-#: include/functions.inc:981 include/functions.inc:1862
-#: include/functions.inc:1896 include/functions.inc:1916
-#: include/class_ldap.inc:561 include/class_ldap.inc:609
-#: include/class_CopyPasteHandler.inc:131
-#: include/class_CopyPasteHandler.inc:250 html/getvcard.php:36
+#: include/class_log.inc:88 include/class_acl.inc:826
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:620 include/functions.inc:681
+#: include/functions.inc:1068 include/functions.inc:1942
+#: include/functions.inc:1976 include/functions.inc:1996
+#: include/class_ldap.inc:575 include/class_ldap.inc:623
+#: include/class_CopyPasteHandler.inc:159
+#: include/class_CopyPasteHandler.inc:269 html/getvcard.php:39
 msgid "Internal error"
 msgstr ""
 
-#: include/class_log.inc:87
+#: include/class_log.inc:88
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_log.inc:106
+#: include/class_log.inc:107
 msgid "Logging to MySQL disabled"
 msgstr ""
 
-#: include/class_log.inc:106
+#: include/class_log.inc:107
 msgid ""
 "The logging to a MySQL database is now disabled for this session of GOsa, "
 "due to communication errors with the specified logging database."
 msgstr ""
 
-#: include/class_log.inc:119
+#: include/class_log.inc:120
 #, php-format
 msgid "Invalid option '%s' specified."
 msgstr ""
 
-#: include/class_log.inc:123
+#: include/class_log.inc:124
 msgid "Specified objectType is empty or invalid"
 msgstr ""
 
-#: include/class_log.inc:144
+#: include/class_log.inc:145
 msgid ""
-"You have enabled the logging into mysql databse, but there are no logging "
+"You have enabled the logging into mysql database, but there are no logging "
 "servers available."
 msgstr ""
 
-#: include/class_log.inc:152
+#: include/class_log.inc:157
 #, php-format
 msgid "Cannot connect to logging server '%s'."
 msgstr ""
 
-#: include/class_log.inc:157
+#: include/class_log.inc:165
 #, php-format
 msgid "Cannot select database '%s' on server '%s': %s"
 msgstr ""
 
-#: include/class_log.inc:177
+#: include/class_log.inc:181
+#, php-format
+msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
+msgstr ""
+
+#: include/class_log.inc:218
+#, php-format
+msgid "Couldn't add your location to the logging database, the error was: %s."
+msgstr ""
+
+#: include/class_log.inc:241
 #, php-format
 msgid "Cannot query database '%s' on server '%s': %s"
 msgstr ""
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr ""
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr ""
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr ""
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr ""
 
-#: include/class_acl.inc:6
+#: include/class_acl.inc:26
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:190 include/class_acl.inc:193
+#: include/class_acl.inc:210 include/class_acl.inc:213
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:645 include/class_acl.inc:652
+#: include/class_acl.inc:665 include/class_acl.inc:672
 msgid "Show/Hide Advanced Settings"
 msgstr ""
 
-#: include/class_acl.inc:670
+#: include/class_acl.inc:690
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:671
+#: include/class_acl.inc:691
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:672
+#: include/class_acl.inc:692
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:674 include/class_acl.inc:680
+#: include/class_acl.inc:694 include/class_acl.inc:700
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:677
+#: include/class_acl.inc:697
 msgid "Move object"
 msgstr ""
 
-#: include/class_acl.inc:678
+#: include/class_acl.inc:698
 msgid "Remove object"
 msgstr ""
 
-#: include/class_acl.inc:685 include/class_acl.inc:776
+#: include/class_acl.inc:705 include/class_acl.inc:796
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:686 include/class_acl.inc:778
+#: include/class_acl.inc:706 include/class_acl.inc:798
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:710
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:806
+#: include/class_acl.inc:826
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:849
+#: include/class_acl.inc:869
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:909 include/class_acl.inc:911
+#: include/class_acl.inc:929 include/class_acl.inc:931
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:911
+#: include/class_acl.inc:931
 msgid "Unknown role, possibly removed"
 msgstr ""
 
-#: include/class_acl.inc:919
+#: include/class_acl.inc:939
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:928
+#: include/class_acl.inc:948
 msgid "Members:"
 msgstr ""
 
-#: include/class_acl.inc:934
+#: include/class_acl.inc:954
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:1093
+#: include/class_acl.inc:1113
 msgid "Access control list"
 msgstr ""
 
-#: include/class_acl.inc:1101
+#: include/class_acl.inc:1121
 msgid "Role name"
 msgstr ""
 
-#: include/class_acl.inc:1102
+#: include/class_acl.inc:1122
 msgid "Role description"
 msgstr ""
 
-#: include/class_msg_dialog.inc:91
+#: include/class_msg_dialog.inc:111
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:68 include/class_hostActionQueue.inc:193
+#: include/class_hostActionQueue.inc:69 include/class_hostActionQueue.inc:194
 #, php-format
 msgid "Can't locate gotomasses queue file '%s'."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:72
+#: include/class_hostActionQueue.inc:73
 #, php-format
 msgid "Can't read gotomasses queue file '%s'."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:79
+#: include/class_hostActionQueue.inc:80
 #, php-format
 msgid "Can't read gotomasses storage file '%s'."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:142
-msgid "Entry broken, skipped."
+#: include/class_hostActionQueue.inc:143
+msgid "GOsa infrastructure"
+msgstr ""
+
+#: include/class_hostActionQueue.inc:143
+msgid "Cannot read broken entry - skipped!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:197 include/class_hostActionQueue.inc:206
+#: include/class_hostActionQueue.inc:198 include/class_hostActionQueue.inc:207
 #, php-format
 msgid "Can't write gotomasses queue file '%s'."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:201
+#: include/class_hostActionQueue.inc:202
 msgid "The queue file was modified since last reload. Can't save changes."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:276
+#: include/class_hostActionQueue.inc:277
 #, php-format
 msgid "Entry with id '%s' not found."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:286
+#: include/class_hostActionQueue.inc:287
 #, php-format
 msgid "Could not update entry, entry with id '%s' not found."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:297
+#: include/class_hostActionQueue.inc:298
 #, php-format
 msgid "Could not remove entry, entry with id '%s' not found."
 msgstr ""
 
-#: include/class_hostActionQueue.inc:371 include/class_hostActionQueue.inc:389
-#: include/class_hostActionQueue.inc:420 include/class_hostActionQueue.inc:455
+#: include/class_hostActionQueue.inc:372 include/class_hostActionQueue.inc:390
+#: include/class_hostActionQueue.inc:421 include/class_hostActionQueue.inc:456
 #, php-format
 msgid "Can't set priority for ID '%s'. ID does not exist."
 msgstr ""
 
-#: include/functions.inc:98
+#: include/class_gosaSupportDaemon.inc:470
+msgid "Could not parse XML."
+msgstr ""
+
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:105
+#: include/functions.inc:108
 #, php-format
-msgid "Fatal error: cannot instantiate class '%s' - execution aborted"
+msgid ""
+"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:305
+#: include/functions.inc:318
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:331 include/functions.inc:358
-#: include/functions.inc:396
+#: include/functions.inc:344 include/functions.inc:371
+#: include/functions.inc:409
 #, php-format
 msgid "User login failed."
 msgstr ""
 
-#: include/functions.inc:331 include/functions.inc:358
-#: include/functions.inc:396 include/functions.inc:592
-#: include/functions.inc:607 include/functions.inc:639
-#: include/functions.inc:678 include/functions.inc:723
-#: include/functions.inc:2490
+#: include/functions.inc:344 include/functions.inc:371
+#: include/functions.inc:409 include/functions.inc:605
+#: include/functions.inc:620 include/functions.inc:652
+#: include/functions.inc:691 include/functions.inc:736
+#: include/functions.inc:2570
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:367 include/functions.inc:437
+#: include/functions.inc:380 include/functions.inc:450
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:582 include/functions.inc:668
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:592
+#: include/functions.inc:605
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:607
+#: include/functions.inc:620
 #, php-format
 msgid "Adding a lock failed."
 msgstr ""
 
-#: include/functions.inc:639
+#: include/functions.inc:652
 #, php-format
 msgid "Removing a lock failed."
 msgstr ""
 
-#: include/functions.inc:678 include/functions.inc:723
+#: include/functions.inc:691 include/functions.inc:736
 #, php-format
 msgid "Cannot get locking information from LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:686
+#: include/functions.inc:699
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:909
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:911
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:928
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1164 include/functions.inc:1295
+#: include/functions.inc:1251 include/functions.inc:1375
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1165
+#: include/functions.inc:1252
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1171
+#: include/functions.inc:1258
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1236
+#: include/functions.inc:1323
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1238
+#: include/functions.inc:1325
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1240
+#: include/functions.inc:1327
 #, php-format
 msgid "You're going to edit the LDAP entry/entries '%s'"
 msgstr ""
 
-#: include/functions.inc:1298
+#: include/functions.inc:1378
 #, php-format
 msgid "Plugin '%s':%s"
 msgstr ""
 
-#: include/functions.inc:1459
+#: include/functions.inc:1539
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1487
+#: include/functions.inc:1567
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1739
+#: include/functions.inc:1819
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1783
+#: include/functions.inc:1863
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1862
+#: include/functions.inc:1942
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1896 include/functions.inc:1916
+#: include/functions.inc:1976 include/functions.inc:1996
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2158 include/functions.inc:2162
-#: include/functions.inc:2168
+#: include/functions.inc:2238 include/functions.inc:2242
+#: include/functions.inc:2248
 msgid "'base_hook' is not available. Using default base."
 msgstr ""
 
-#: include/functions.inc:2190
+#: include/functions.inc:2270
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2190
+#: include/functions.inc:2270
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2216
+#: include/functions.inc:2296
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2223
+#: include/functions.inc:2303
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2266
+#: include/functions.inc:2346
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2268
+#: include/functions.inc:2348
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2274
+#: include/functions.inc:2354
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2276
+#: include/functions.inc:2356
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2280
+#: include/functions.inc:2360
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2302
+#: include/functions.inc:2382
 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:2303
+#: include/functions.inc:2383
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2307
+#: include/functions.inc:2387
 msgid ""
-"You have disabled the rfc2307bis option on the 'ldap setup' step, but your "
-"schema   configuration do not support this option."
+"Your schema is configured to support the rfc2307bis group, but you have "
+"disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2308
+#: include/functions.inc:2388
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2331
+#: include/functions.inc:2411
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2412
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2333
+#: include/functions.inc:2413
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2334
+#: include/functions.inc:2414
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2335
+#: include/functions.inc:2415
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2416
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2417
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2338
+#: include/functions.inc:2418
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2339
+#: include/functions.inc:2419
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2340
+#: include/functions.inc:2420
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:2490
+#: include/functions.inc:2570
 #, php-format
 msgid "Setting the password failed!"
 msgstr ""
 
-#: include/functions.inc:2528
+#: include/functions.inc:2588
+#, php-format
 msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Cannot change Samba password."
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/functions.inc:2616
+msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/class_ldap.inc:204 include/class_ldap.inc:236
+#: include/class_ldap.inc:218 include/class_ldap.inc:250
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:204 include/class_ldap.inc:236
+#: include/class_ldap.inc:218 include/class_ldap.inc:250
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:561
+#: include/class_ldap.inc:575
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found"
 msgstr ""
 
-#: include/class_ldap.inc:609
+#: include/class_ldap.inc:623
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:617
+#: include/class_ldap.inc:631
 #, php-format
 msgid "Creating subtree '%s' failed."
 msgstr ""
 
-#: include/class_ldap.inc:686
+#: include/class_ldap.inc:700
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:688
+#: include/class_ldap.inc:702
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:910
+#: include/class_ldap.inc:924
 #, 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:939
+#: include/class_ldap.inc:953
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_ldap.inc:1075
+#: include/class_ldap.inc:1089
 #, php-format
 msgid "Ldap import with dn '%s' failed."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:90
+#: include/class_CopyPasteHandler.inc:118
 #, php-format
 msgid "Cannot cleanup copy & paste queue: setting permissions for '%s' failed!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:98
+#: include/class_CopyPasteHandler.inc:126
 #, php-format
 msgid "Cannot cleanup copy & paste queue: no write permission inside '%s'!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:130
+#: include/class_CopyPasteHandler.inc:158
 #, php-format
 msgid "Copy and paste failed: object '%s' is not a valid ldap object!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:147
+#: include/class_CopyPasteHandler.inc:175
 #, php-format
 msgid "Cannot save LDAP dump: no write permission inside '%s'!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:155
+#: include/class_CopyPasteHandler.inc:183
 #, php-format
 msgid "Cannot save LDAP dump: setting permissions for '%s' failed!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:164
+#: include/class_CopyPasteHandler.inc:192
 #, php-format
 msgid "Cannot save LDAP dump: no write permission to '%s/%s'!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:249
+#: include/class_CopyPasteHandler.inc:268
 #, php-format
 msgid "Cannot load dumped file '%s'!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:274
+#: include/class_CopyPasteHandler.inc:368
 #, php-format
-msgid "You have no permission to save object '%s'."
+msgid "You are going to paste the following entries '%s'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:302
+#: include/class_CopyPasteHandler.inc:391
 #, php-format
-msgid "You are going to paste the cutted entry '%s'."
+msgid "You are going to paste the following entry '%s'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:315
+#: include/class_CopyPasteHandler.inc:485
+msgid "Can't paste"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:8
 #, php-format
-msgid "You have no permission to copy and paste object '%s'!"
+msgid "The field '%s' contains a reserved keyword!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:336
+#: include/utils/class_msgPool.inc:14
 #, php-format
-msgid "You are going to paste the copied entry '%s'."
+msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:437
-msgid "Can't paste"
+#: include/utils/class_msgPool.inc:21
+#, php-format
+msgid "Value for '%s' is too big!"
 msgstr ""
 
-#: include/password-methods/class_password-methods-sha.inc:46
-#: include/password-methods/class_password-methods-ssha.inc:51
+#: include/utils/class_msgPool.inc:23
+#, php-format
+msgid "'%s' must be smaller than %d!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:31
+#, php-format
+msgid "Value for '%s' is too small!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:33
+#, php-format
+msgid "'%s' must be %d or above!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:40
+#, php-format
+msgid "'%s' should be bigger than '%s'!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:46
+#, php-format
+msgid "'%s' should be smaller than '%s'!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:52
+#, php-format
+msgid "'%s' depends on '%s' - please provide both values!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:58
+#, php-format
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:64
+#, php-format
+msgid "The required field '%s' is empty!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:72
+msgid "Example:"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:89 include/utils/class_msgPool.inc:93
 #, php-format
-msgid "Cannot use %s encryption: no PHP functions for sha1/mhash available"
+msgid "The Field '%s' contains invalid characters"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:90
+#, php-format
+msgid "'%s' is not allowed:"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:90
+#, php-format
+msgid "'%s' are not allowed."
+msgstr ""
+
+#: include/utils/class_msgPool.inc:100
+#, php-format
+msgid "Missing %s PHP extension!"
 msgstr ""
 
 #: include/utils/class_timezone.inc:51
 #, php-format
 msgid ""
 "The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
-"correct timezone offest."
+"correct timezone offset."
 msgstr ""
 
-#: include/class_multi_plug.inc:360
+#: include/class_multi_plug.inc:362
 msgid "You are currently editing mutliple entries."
 msgstr ""
 
-#: include/class_multi_plug.inc:389
+#: include/class_multi_plug.inc:391
 msgid "Password reset"
 msgstr ""
 
-#: include/class_multi_plug.inc:389
+#: include/class_multi_plug.inc:391
 msgid "The user password was resetted, please set a new password value!"
 msgstr ""
 
-#: html/getvcard.php:36
+#: html/getvcard.php:39
 msgid "Missing parameters!"
 msgstr ""
 
-#: html/getldif.php:79
+#: html/getldif.php:82 html/getxls.php:493
 msgid "Permission denied!"
 msgstr ""
 
-#: html/getldif.php:104
+#: html/getldif.php:82
+msgid "You are not allowed to create ldap dumps."
+msgstr ""
+
+#: html/getldif.php:107
 msgid "Error in ivbb parameter!"
 msgstr ""
 
-#: html/password.php:56 html/index.php:129
+#: html/password.php:58 html/index.php:141
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/password.php:76 html/setup.php:77 html/index.php:154
+#: html/password.php:78
+msgid "Accessibility"
+msgstr ""
+
+#: html/password.php:78 html/setup.php:77 html/index.php:166
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:161
+#: html/password.php:163
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:217 html/index.php:291
-msgid "Please specify a valid username!"
-msgstr ""
-
-#: html/password.php:219 html/index.php:294
-msgid "Please specify your password!"
-msgstr ""
-
-#: html/password.php:226 html/index.php:313
+#: html/password.php:228 html/index.php:325
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/password.php:230
+#: html/password.php:232
 msgid "You have no permissions to change your password."
 msgstr ""
 
-#: html/password.php:251
+#: html/password.php:253
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/password.php:282 html/index.php:407
+#: html/password.php:284 html/index.php:419
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/password.php:282 html/index.php:407
+#: html/password.php:284 html/index.php:419
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/setup.php:77 html/index.php:154
+#: html/setup.php:77 html/index.php:166
 msgid "Smarty"
 msgstr ""
 
-#: html/index.php:50
+#: html/index.php:57
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:57
+#: html/index.php:64
 msgid ""
 "The session lifetime configured in your gosa.conf will be overridden by php."
 "ini settings."
 msgstr ""
 
-#: html/index.php:129
+#: html/index.php:141
 msgid "Configuration accessibility"
 msgstr ""
 
-#: html/index.php:205
+#: html/index.php:217
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:213
+#: html/index.php:225
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:217
-msgid "User information is not uniq accross the configured LDAP trees!"
+#: html/index.php:229
+msgid "User information is not unique accross the configured LDAP trees!"
+msgstr ""
+
+#: html/index.php:255
+msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: html/index.php:270
+#: html/index.php:282
 msgid "Your ldap setup contains old schema definitions:"
 msgstr ""
 
+#: html/index.php:303
+msgid "Please specify a valid username!"
+msgstr ""
+
 #: html/index.php:306
+msgid "Please specify your password!"
+msgstr ""
+
+#: html/index.php:318
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:306
+#: html/index.php:318
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:362
+#: html/index.php:374
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:413
+#: html/index.php:425
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:148
+#: html/main.php:153
 #, php-format
-msgid "Fatal error: cannot locate file '%s' - please run '%s' to fix this"
+msgid "Cannot locate file '%s' - please run '%s' to fix this"
+msgstr ""
+
+#: html/main.php:171
+msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:165
+#: html/main.php:172
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:208
+#: html/main.php:217
 msgid "Configuration warning"
 msgstr ""
 
-#: html/main.php:208
+#: html/main.php:217
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:347
+#: html/main.php:356
 msgid "Password reminder"
 msgstr ""
 
-#: html/main.php:347
+#: html/main.php:356
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:355
+#: html/main.php:365
+msgid "Plugin"
+msgstr ""
+
+#: html/main.php:366
 #, php-format
 msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/getxls.php:86
+#: html/getxls.php:88
 msgid "Birthday"
 msgstr ""
 
-#: html/getxls.php:86 html/getxls.php:227 html/getxls.php:281
-#: html/getxls.php:297
+#: html/getxls.php:88 html/getxls.php:229 html/getxls.php:283
+#: html/getxls.php:299
 msgid "Surname"
 msgstr ""
 
-#: html/getxls.php:86 html/getxls.php:281
+#: html/getxls.php:88 html/getxls.php:283
 msgid "Language"
 msgstr ""
 
-#: html/getxls.php:94
+#: html/getxls.php:96
 #, php-format
 msgid "User list of %s on %s"
 msgstr ""
 
-#: html/getxls.php:131 html/getxls.php:360
+#: html/getxls.php:133 html/getxls.php:362
 #, php-format
 msgid "Groups of %s on %s"
 msgstr ""
 
-#: html/getxls.php:155 html/getxls.php:188 html/getxls.php:190
-#: html/getxls.php:197 html/getxls.php:233 html/getxls.php:310
-#: html/getxls.php:381
+#: html/getxls.php:157 html/getxls.php:190 html/getxls.php:192
+#: html/getxls.php:199 html/getxls.php:235 html/getxls.php:312
+#: html/getxls.php:383
 msgid "Servers"
 msgstr ""
 
-#: html/getxls.php:159 html/getxls.php:311
+#: html/getxls.php:161 html/getxls.php:313
 msgid "Computers"
 msgstr ""
 
-#: html/getxls.php:169 html/getxls.php:222 html/getxls.php:401
-#: html/getxls.php:421
+#: html/getxls.php:171 html/getxls.php:224 html/getxls.php:403
+#: html/getxls.php:423
 msgid "Common name"
 msgstr ""
 
-#: html/getxls.php:185
+#: html/getxls.php:187
 msgid "Server name"
 msgstr ""
 
-#: html/getxls.php:195 html/getxls.php:379
+#: html/getxls.php:197 html/getxls.php:381
 #, php-format
 msgid "Servers of %s on %s"
 msgstr ""
 
-#: html/getxls.php:222 html/getxls.php:297
+#: html/getxls.php:224 html/getxls.php:299
 msgid "Display name"
 msgstr ""
 
-#: html/getxls.php:223
+#: html/getxls.php:225
 msgid "Home phone"
 msgstr ""
 
-#: html/getxls.php:224 html/getxls.php:298
+#: html/getxls.php:226 html/getxls.php:300
 msgid "Initials"
 msgstr ""
 
-#: html/getxls.php:225
+#: html/getxls.php:227
 msgid "Mobile phone"
 msgstr ""
 
-#: html/getxls.php:225 html/getxls.php:298
+#: html/getxls.php:227 html/getxls.php:300
 msgid "City"
 msgstr ""
 
-#: html/getxls.php:226 html/getxls.php:298 html/getxls.php:300
+#: html/getxls.php:228 html/getxls.php:300 html/getxls.php:302
 msgid "Phone number"
 msgstr ""
 
-#: html/getxls.php:228
+#: html/getxls.php:230
 msgid "Function"
 msgstr ""
 
-#: html/getxls.php:231 html/getxls.php:312
+#: html/getxls.php:233 html/getxls.php:314
 msgid "Adressbook"
 msgstr ""
 
-#: html/getxls.php:238 html/getxls.php:414
+#: html/getxls.php:240 html/getxls.php:416
 #, php-format
 msgid "Adressbook of %s on %s"
 msgstr ""
 
-#: html/getxls.php:244
+#: html/getxls.php:246
 msgid "Common Name"
 msgstr ""
 
-#: html/getxls.php:281
+#: html/getxls.php:283
 msgid "Day of birth"
 msgstr ""
 
-#: html/getxls.php:299
+#: html/getxls.php:301
 msgid "Email address"
 msgstr ""
 
-#: html/getxls.php:299
+#: html/getxls.php:301
 msgid "Organizational unit"
 msgstr ""
 
-#: html/getxls.php:300
+#: html/getxls.php:302
 msgid "Postal Code"
 msgstr ""
 
-#: html/getxls.php:301
+#: html/getxls.php:303
 msgid "Title"
 msgstr ""
 
-#: html/getxls.php:304
+#: html/getxls.php:306
 msgid "Full"
 msgstr ""
 
-#: html/getxls.php:341
+#: html/getxls.php:343
 #, php-format
 msgid "User List of %s on %s"
 msgstr ""
 
-#: html/getxls.php:395
+#: html/getxls.php:397
 #, php-format
 msgid "Computers of %s on %s"
 msgstr ""
 
-#: html/getfax.php:53
+#: html/getxls.php:493
+msgid "You are not allowed to perform this action."
+msgstr ""
+
+#: html/getfax.php:56
 msgid "Could not connect to database server!"
 msgstr ""
 
-#: html/getfax.php:55
+#: html/getfax.php:58
 msgid "Could not select database!"
 msgstr ""
 
-#: html/getfax.php:60 html/getfax.php:68
+#: html/getfax.php:63 html/getfax.php:71
 msgid "Database query failed!"
 msgstr ""
 
-#: html/get_attachment.php:47
-msgid ""
-"Can't connect to glpi database, there is no mysl extension available in your "
-"php setup."
-msgstr ""
-
-#: html/get_attachment.php:55
-msgid ""
-"Can't connect to specified database, please check your glpi configuration."
-msgstr ""
-
-#: html/get_attachment.php:64
-msgid "Can't get specified attachment file, there is no entry with this id."
-msgstr ""
-
-#: html/get_attachment.php:69
-#, php-format
-msgid "Can't open file '%s'."
-msgstr ""
-
-#: html/helpviewer.php:68
+#: html/helpviewer.php:70
 msgid "Help browser"
 msgstr ""
 
-#: html/helpviewer.php:122
+#: html/helpviewer.php:124
 msgid "There is no helpfile specified for this class"
 msgstr ""
 
-#: html/helpviewer.php:271
+#: html/helpviewer.php:273
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
-
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr ""
-
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr ""