Code

Closed #56 fixed
[gosa.git] / locale / messages.po
index bc8e5e88ddb6b62e9b739febaf3207dc1989d977..a79dbce42e932f51f2e2c97249e1630421cbb504 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2007-06-18 15:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,19 +20,19 @@ msgstr ""
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:30
+#: contrib/gosa.conf:34
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:59
+#: contrib/gosa.conf:62
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
-#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:151
-#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
-#: contrib/gosa.conf:171 contrib/gosa.conf:176
+#: contrib/gosa.conf:87 contrib/gosa.conf:102 contrib/gosa.conf:106
+#: contrib/gosa.conf:115 contrib/gosa.conf:121 contrib/gosa.conf:126
+#: contrib/gosa.conf:132 contrib/gosa.conf:141 contrib/gosa.conf:155
+#: contrib/gosa.conf:165 contrib/gosa.conf:170 contrib/gosa.conf:192
+#: contrib/gosa.conf:197 contrib/gosa.conf:202 contrib/gosa.conf:206
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -55,63 +55,64 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/generic/references/class_reference.inc:20
+#: setup/setup_feedback.tpl:48
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:88
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:78 contrib/gosa.conf:91
-#: plugins/personal/environment/class_environment.inc:12
+#: contrib/gosa.conf:89 contrib/gosa.conf:107
+#: plugins/personal/environment/class_environment.inc:7
 #: plugins/admin/groups/class_divListGroup.inc:131
-#: plugins/admin/users/class_divListUsers.inc:156
+#: plugins/admin/users/class_divListUsers.inc:141
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:93
+#: contrib/gosa.conf:90 contrib/gosa.conf:109
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:158
-#: plugins/admin/ogroups/tabs_ogroups.inc:75
-#: plugins/admin/ogroups/tabs_ogroups.inc:175
-#: plugins/admin/ogroups/class_divListOGroup.inc:137
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/ogroups/tabs_ogroups.inc:77
+#: plugins/admin/ogroups/tabs_ogroups.inc:178
 #: plugins/admin/ogroups/paste_mail.tpl:4
+#: plugins/admin/ogroups/class_divListOGroup.inc:124
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:91 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_divListGroup.inc:125
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:149
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
-#: plugins/admin/users/class_divListUsers.inc:166
+#: contrib/gosa.conf:92 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_divListUsers.inc:151
 msgid "Netatalk"
 msgstr ""
 
-#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:140
+#: contrib/gosa.conf:93 plugins/personal/connectivity/main.inc:143
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:271
+#: contrib/gosa.conf:94 plugins/personal/generic/generic.tpl:271
 #: plugins/personal/generic/generic.tpl:402
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/users/class_divListUsers.inc:147
 #: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:254
+#: contrib/gosa.conf:95 plugins/personal/generic/generic.tpl:254
 #: plugins/personal/generic/generic.tpl:392
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
@@ -119,68 +120,67 @@ msgstr ""
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_divListGroup.inc:129
-#: plugins/admin/users/class_divListUsers.inc:160
+#: plugins/admin/users/class_divListUsers.inc:145
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/class_systemManagement.inc:869
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:344
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:97 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
-#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
-#: contrib/gosa.conf:137 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:157 contrib/gosa.conf:162 contrib/gosa.conf:167
-#: contrib/gosa.conf:172 contrib/gosa.conf:177
-msgid "References"
-msgstr ""
-
-#: contrib/gosa.conf:92
+#: contrib/gosa.conf:108
 #: plugins/admin/applications/class_applicationManagement.inc:25
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:94
+#: contrib/gosa.conf:110
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:73
-#: plugins/admin/systems/class_servRepository.inc:279
+#: contrib/gosa.conf:111 contrib/gosa.conf:117 contrib/gosa.conf:122
+#: contrib/gosa.conf:128 contrib/gosa.conf:137 contrib/gosa.conf:151
+#: contrib/gosa.conf:161 contrib/gosa.conf:166 contrib/gosa.conf:171
+#: contrib/gosa.conf:193 contrib/gosa.conf:198
+msgid "References"
+msgstr ""
+
+#: contrib/gosa.conf:116 plugins/admin/applications/generic.tpl:73
+#: plugins/admin/systems/class_servRepository.inc:282
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:92
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/gofon/conference/generic.tpl:100
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:658
+#: contrib/gosa.conf:127 plugins/gofon/phoneaccount/class_phoneAccount.inc:870
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:142
-#: plugins/admin/ogroups/tabs_ogroups.inc:98
+#: contrib/gosa.conf:133 contrib/gosa.conf:142 contrib/gosa.conf:156
+#: plugins/admin/ogroups/tabs_ogroups.inc:100
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:143
-#: plugins/admin/ogroups/tabs_ogroups.inc:102
+#: contrib/gosa.conf:134 contrib/gosa.conf:157
+#: plugins/admin/ogroups/tabs_ogroups.inc:104
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:144
+#: contrib/gosa.conf:135 contrib/gosa.conf:158
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
-#: plugins/admin/ogroups/class_ogroupManagement.inc:347
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
+#: contrib/gosa.conf:136 contrib/gosa.conf:150 contrib/gosa.conf:159
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/addons/godfs/contents.tpl:22
@@ -196,127 +196,131 @@ msgstr ""
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
 #: ihtml/themes/default/MultiSelectWindow.tpl:27
-#: ihtml/themes/default/MultiSelectWindow.tpl:66
+#: ihtml/themes/default/MultiSelectWindow.tpl:66 setup/setup_ldap.tpl:120
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:127
+#: contrib/gosa.conf:143
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:33
+#: contrib/gosa.conf:144 plugins/admin/systems/servkolab.tpl:33
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:132 contrib/gosa.conf:134
-#: plugins/admin/fai/faiPackage.tpl:29
+#: contrib/gosa.conf:146
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr ""
+
+#: contrib/gosa.conf:148 plugins/admin/fai/faiPackage.tpl:29
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:135 contrib/gosa.conf:146
+#: contrib/gosa.conf:149 contrib/gosa.conf:160
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:219
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:199 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:231 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
+#: include/sieve/templates/edit_frame_base.tpl:6
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:232
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:201 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:233 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/admin/applications/generic.tpl:101
+#: include/sieve/templates/edit_frame_base.tpl:7
+#: include/sieve/templates/import_script.tpl:12
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:234
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:206
+#: contrib/gosa.conf:238
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:210 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:242 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #: plugins/admin/applications/generic.tpl:99
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiSummaryTab.inc:40
+#: contrib/gosa.conf:246 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:41
+#: contrib/gosa.conf:250 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:254 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:226 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:258 plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:227 plugins/admin/ogroups/tabs_ogroups.inc:107
+#: contrib/gosa.conf:259 plugins/admin/ogroups/tabs_ogroups.inc:109
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:231
+#: contrib/gosa.conf:263
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:254
-msgid "{LOCATIONNAME}"
-msgstr ""
-
-#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:424 plugins/admin/ogroups/class_phonequeue.inc:262
+#: setup/class_setupStep_Language.inc:48
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:425 setup/class_setupStep_Language.inc:52
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:426
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:427 setup/class_setupStep_Language.inc:49
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:428
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:429 setup/class_setupStep_Language.inc:50
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:430
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:431
 msgid "Polish"
 msgstr ""
 
@@ -331,12 +335,12 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/class_faiManagement.inc:577
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:630
+#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:360
-#: plugins/admin/departments/class_departmentManagement.inc:302
+#: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/goSpamServer.tpl:101
@@ -348,9 +352,11 @@ msgstr ""
 #: plugins/admin/systems/class_systemManagement.inc:597
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:233
+#: include/sieve/templates/edit_frame_base.tpl:39
+#: include/sieve/templates/management.tpl:24
 #: include/class_MultiSelectWindow.inc:78
 #: ihtml/themes/default/copyPasteDialog.tpl:15
 msgid "Save"
@@ -361,6 +367,7 @@ msgstr ""
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
+#: plugins/personal/samba/sambaLogonHours.tpl:92
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/environment/main.inc:107
@@ -381,13 +388,12 @@ msgstr ""
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/addons/godfs/class_dfsManagment.inc:249
-#: plugins/admin/fai/class_faiManagement.inc:579
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:587
+#: plugins/admin/fai/class_faiManagement.inc:592
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiPackageNew.tpl:51
 #: plugins/admin/fai/faiNewBranch.tpl:22
 #: plugins/admin/fai/faiVariableEntry.tpl:49
 #: plugins/admin/fai/faiPackageEntry.tpl:57
@@ -395,22 +401,23 @@ msgstr ""
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/groups/class_groupManagement.inc:345
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/admin/departments/class_departmentManagement.inc:299
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
 #: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/remove_ppd.tpl:14
 #: plugins/admin/systems/SelectDeviceType.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/systems/goSpamServer.tpl:103
@@ -422,27 +429,36 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_os.tpl:29
 #: plugins/admin/systems/goSpamServerRule.tpl:24
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
 #: plugins/admin/systems/class_systemManagement.inc:599
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/password.tpl:30 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/remove_ppd.tpl:14
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/gencd.tpl:11
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:309
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:68
 #: plugins/admin/ogroups/remove.tpl:16
+#: plugins/admin/ogroups/ogroup_objects.tpl:56
+#: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:235
 #: plugins/gofon/conference/remove.tpl:16
+#: include/sieve/templates/remove_script.tpl:16
+#: include/sieve/templates/create_script.tpl:15
+#: include/sieve/templates/edit_frame_base.tpl:41
+#: include/sieve/templates/import_script.tpl:14
+#: include/sieve/templates/element_comment.tpl:10
+#: include/sieve/templates/management.tpl:26
+#: include/sieve/templates/select_test_type.tpl:13
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/copyPasteDialog.tpl:16
+#: ihtml/themes/default/copyPasteDialog.tpl:16 setup/setup_ldap.tpl:17
+#: setup/setup_migrate.tpl:133 setup/setup_migrate.tpl:184
+#: setup/setup_migrate.tpl:248 setup/setup_migrate.tpl:308
+#: setup/setup_migrate.tpl:361
 msgid "Cancel"
 msgstr ""
 
@@ -460,8 +476,8 @@ msgstr ""
 #: plugins/personal/nagios/main.inc:116 plugins/personal/mail/main.inc:116
 #: plugins/personal/posix/main.inc:123 plugins/personal/netatalk/main.inc:112
 #: plugins/personal/samba/main.inc:116
-#: plugins/personal/environment/environment.tpl:138
 #: plugins/personal/environment/main.inc:116
+#: plugins/personal/environment/environment.tpl:138
 #: plugins/personal/generic/main.inc:173
 #: plugins/personal/connectivity/main.inc:130
 #: plugins/gofax/faxaccount/generic.tpl:86
@@ -473,13 +489,14 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinter.tpl:82 plugins/admin/systems/glpi.tpl:48
 #: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:186
 #: plugins/admin/systems/printer.tpl:52
 #: plugins/gofon/phoneaccount/main.inc:113
+#: include/sieve/templates/element_comment.tpl:8
 msgid "Edit"
 msgstr ""
 
@@ -492,7 +509,7 @@ msgstr ""
 #: plugins/personal/password/class_password.inc:6
 #: plugins/personal/posix/class_posixAccount.inc:17
 #: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/environment/class_environment.inc:8
 #: plugins/personal/generic/class_user.inc:17
 #: plugins/personal/connectivity/class_webdavAccount.inc:7
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
@@ -529,48 +546,48 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:99
+#: plugins/personal/nagios/class_nagiosAccount.inc:100
 msgid "This account has no nagios extensions."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:108
+#: plugins/personal/nagios/class_nagiosAccount.inc:109
 msgid "Remove nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:109
+#: plugins/personal/nagios/class_nagiosAccount.inc:110
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:111
+#: plugins/personal/nagios/class_nagiosAccount.inc:112
 msgid "Create nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:111
+#: plugins/personal/nagios/class_nagiosAccount.inc:112
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:154
+#: plugins/personal/nagios/class_nagiosAccount.inc:155
 msgid "Saving nagios account failed"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:175
 msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:177
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
 msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:181
-#: plugins/personal/nagios/class_nagiosAccount.inc:185
+#: plugins/personal/nagios/class_nagiosAccount.inc:182
+#: plugins/personal/nagios/class_nagiosAccount.inc:186
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:233
+#: plugins/personal/nagios/class_nagiosAccount.inc:234
 msgid "Removing nagios account failed"
 msgstr ""
 
@@ -584,6 +601,7 @@ msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:12
 #: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: setup/setup_feedback.tpl:32
 msgid "Mail address"
 msgstr ""
 
@@ -697,7 +715,7 @@ msgstr ""
 #: plugins/addons/addressbook/contents.tpl:80
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/groups/mail_locals.tpl:33
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:41
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Choose the department the search will be based on"
 msgstr ""
@@ -720,7 +738,7 @@ msgid "User name of which addresses are shown"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:75
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:208
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
 #: plugins/personal/posix/generic.tpl:73
@@ -728,16 +746,16 @@ msgstr ""
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/environment/hotplugDialog.tpl:63
+#: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:180
-#: plugins/personal/environment/hotplugDialog.tpl:63
-#: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:235
+#: plugins/personal/connectivity/class_kolabAccount.inc:237
 #: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
@@ -747,7 +765,7 @@ msgstr ""
 #: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/application.tpl:27
 #: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:565
+#: plugins/admin/groups/class_groupMail.inc:568
 #: plugins/admin/groups/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/groups/group_objects.tpl:55
@@ -760,13 +778,13 @@ msgstr ""
 #: plugins/admin/systems/workstation.tpl:78
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/workstationStartup.tpl:105
-#: plugins/admin/systems/workstationStartup.tpl:127
-#: plugins/admin/systems/workstationStartup.tpl:146
+#: plugins/admin/systems/workstationStartup.tpl:128
+#: plugins/admin/systems/workstationStartup.tpl:147
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:454
-#: plugins/admin/systems/class_termDNS.inc:474
+#: plugins/admin/systems/class_termDNS.inc:479
+#: plugins/admin/systems/class_termDNS.inc:499
 #: plugins/admin/systems/goSpamServer.tpl:36
 #: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/systems/servdnseditzone.tpl:106
@@ -774,16 +792,16 @@ msgstr ""
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:394
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:486
+#: plugins/admin/systems/class_servDNSeditZone.inc:493
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:67
 #: plugins/admin/ogroups/termgroup.tpl:23
-#: plugins/admin/ogroups/phonequeue.tpl:24
-#: plugins/admin/ogroups/generic.tpl:43
+#: plugins/admin/ogroups/phonequeue.tpl:28
 #: plugins/admin/ogroups/ogroup_objects.tpl:54
+#: plugins/admin/ogroups/generic.tpl:43
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
@@ -798,8 +816,8 @@ msgstr ""
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
 #: plugins/admin/systems/class_systemManagement.inc:870
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:343
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr ""
@@ -813,8 +831,8 @@ msgid "Quota usage"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:496
+#: plugins/admin/systems/class_terminalInfo.inc:164
+#: plugins/admin/systems/class_printGeneric.inc:502
 msgid "not defined"
 msgstr ""
 
@@ -834,17 +852,17 @@ msgstr ""
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:212
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:336
+#: plugins/personal/environment/class_environment.inc:648
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
-#: plugins/personal/environment/class_environment.inc:644
 #: plugins/personal/connectivity/kolab.tpl:35
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
@@ -864,118 +882,136 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstation.tpl:80
 #: plugins/admin/systems/workstationStartup.tpl:106
-#: plugins/admin/systems/workstationStartup.tpl:128
+#: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:468
+#: plugins/admin/systems/remove_ppd.tpl:12
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_termDNS.inc:493
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
 #: plugins/admin/systems/glpi_edit_os.tpl:10
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#: plugins/admin/systems/printer.tpl:78 plugins/admin/systems/printer.tpl:96
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:292
-#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/class_servDNSeditZone.inc:293
+#: plugins/admin/systems/class_servDNSeditZone.inc:487
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove_ppd.tpl:12
 #: plugins/admin/ogroups/termgroup.tpl:25
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/ogroups/generic.tpl:44 plugins/admin/ogroups/remove.tpl:14
-#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:29 plugins/admin/ogroups/remove.tpl:14
+#: plugins/admin/ogroups/generic.tpl:44 plugins/gofon/macro/remove.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/conference/remove.tpl:14
+#: include/sieve/templates/remove_script.tpl:14
 msgid "Delete"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:67
+#: plugins/personal/mail/generic.tpl:67 plugins/personal/mail/generic.tpl:107
 msgid "Mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:94
+msgid "Use custom sieve script"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:94
+msgid "disables all Mail options!"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:99
+msgid "Sieve Management"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:112
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:112
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:115
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:115
 msgid "Activate vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:121
+msgid "from"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:138
+msgid "till"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:162
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:162
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:84
+#: plugins/personal/mail/generic.tpl:164
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:87
+#: plugins/personal/mail/generic.tpl:167
 msgid "to folder"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:174
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:96
+#: plugins/personal/mail/generic.tpl:176
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:87
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#: plugins/personal/connectivity/class_proxyAccount.inc:90
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:222
 msgid "MB"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:102
+#: plugins/personal/mail/generic.tpl:182
+#: include/sieve/templates/object_container.tpl:31
+#: include/sieve/templates/element_vacation.tpl:44
+#: include/sieve/class_sieveManagement.inc:515
+#: include/sieve/class_sieveManagement.inc:735
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:199
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/generic.tpl:210
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:139
+#: plugins/personal/mail/generic.tpl:220
 msgid "Advanced mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:225
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:226
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:152
-msgid "Use custom sieve script"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:152
-msgid "disables all Mail options!"
-msgstr ""
-
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+#: setup/setup_config2.tpl:95
 msgid "Mail settings"
 msgstr ""
 
@@ -983,175 +1019,260 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:90
-#: plugins/admin/groups/class_groupMail.inc:83
+#: plugins/personal/mail/class_mailAccount.inc:88
+#: plugins/admin/groups/class_groupMail.inc:78
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/personal/mail/class_mailAccount.inc:214
 msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:251
+#: plugins/personal/mail/class_mailAccount.inc:286
 msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:261
-#: plugins/personal/mail/class_mailAccount.inc:264
-#: plugins/admin/groups/class_groupMail.inc:330
-#: plugins/admin/ogroups/class_mailogroup.inc:40
+#: plugins/personal/mail/class_mailAccount.inc:296
+#: plugins/personal/mail/class_mailAccount.inc:299
+#: plugins/admin/groups/class_groupMail.inc:333
+#: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:262
+#: plugins/personal/mail/class_mailAccount.inc:297
 msgid ""
 "This account can't be removed while there are delegations configured. Remove "
 "those delegations first."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:331
+#: plugins/personal/mail/class_mailAccount.inc:300
+#: plugins/admin/groups/class_groupMail.inc:334
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:268
-#: plugins/admin/groups/class_groupMail.inc:333
-#: plugins/admin/ogroups/class_mailogroup.inc:43
+#: plugins/personal/mail/class_mailAccount.inc:303
+#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/ogroups/class_mailogroup.inc:50
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:268
-#: plugins/admin/groups/class_groupMail.inc:334
+#: plugins/personal/mail/class_mailAccount.inc:303
+#: plugins/admin/groups/class_groupMail.inc:337
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:318
+#: plugins/personal/mail/class_mailAccount.inc:353
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:324
-#: plugins/admin/groups/class_groupMail.inc:408
+#: plugins/personal/mail/class_mailAccount.inc:359
+#: plugins/admin/groups/class_groupMail.inc:411
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:362
-#: plugins/personal/mail/class_mailAccount.inc:367
-#: plugins/admin/groups/class_groupMail.inc:436
+#: plugins/personal/mail/class_mailAccount.inc:397
+#: plugins/personal/mail/class_mailAccount.inc:402
+#: plugins/admin/groups/class_groupMail.inc:439
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:377
-#: plugins/admin/groups/class_groupMail.inc:441
+#: plugins/personal/mail/class_mailAccount.inc:412
+#: plugins/admin/groups/class_groupMail.inc:444
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:659
+#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/posix/class_posixAccount.inc:476
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/samba/class_sambaAccount.inc:429
+#: plugins/personal/samba/class_sambaAccount.inc:447
+#: plugins/personal/generic/class_user.inc:249
+msgid "January"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/posix/class_posixAccount.inc:476
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/samba/class_sambaAccount.inc:429
+#: plugins/personal/samba/class_sambaAccount.inc:447
+#: plugins/personal/generic/class_user.inc:249
+msgid "February"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/posix/class_posixAccount.inc:476
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/samba/class_sambaAccount.inc:429
+#: plugins/personal/samba/class_sambaAccount.inc:447
+#: plugins/personal/generic/class_user.inc:249
+msgid "March"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:559
+#: plugins/personal/posix/class_posixAccount.inc:476
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/samba/class_sambaAccount.inc:429
+#: plugins/personal/samba/class_sambaAccount.inc:447
+#: plugins/personal/generic/class_user.inc:249
+msgid "April"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/samba/class_sambaAccount.inc:430
+#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/generic/class_user.inc:250
+msgid "May"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/samba/class_sambaAccount.inc:430
+#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/generic/class_user.inc:250
+msgid "June"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/samba/class_sambaAccount.inc:430
+#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/generic/class_user.inc:250
+msgid "July"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/samba/class_sambaAccount.inc:430
+#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/generic/class_user.inc:250
+msgid "August"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:560
+#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/samba/class_sambaAccount.inc:430
+#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/generic/class_user.inc:250
+msgid "September"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:561
+#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/samba/class_sambaAccount.inc:431
+#: plugins/personal/samba/class_sambaAccount.inc:449
+#: plugins/personal/generic/class_user.inc:251
+msgid "October"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:561
+#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/samba/class_sambaAccount.inc:431
+#: plugins/personal/samba/class_sambaAccount.inc:449
+#: plugins/personal/generic/class_user.inc:251
+msgid "November"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:561
+#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/samba/class_sambaAccount.inc:431
+#: plugins/personal/samba/class_sambaAccount.inc:449
+#: plugins/personal/generic/class_user.inc:251
+msgid "December"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:750
 msgid "Removing mail account failed"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:886
 msgid "Saving mail account failed"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:840
+#: plugins/personal/mail/class_mailAccount.inc:940
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:845
-#: plugins/admin/groups/class_groupMail.inc:839
+#: plugins/personal/mail/class_mailAccount.inc:945
+#: plugins/admin/groups/class_groupMail.inc:856
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:849
-#: plugins/personal/mail/class_mailAccount.inc:853
+#: plugins/personal/mail/class_mailAccount.inc:949
+#: plugins/personal/mail/class_mailAccount.inc:953
 #: plugins/addons/addressbook/class_addressbook.inc:598
-#: plugins/admin/ogroups/class_mailogroup.inc:71
+#: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:859
-#: plugins/admin/groups/class_groupMail.inc:848
-#: plugins/admin/ogroups/class_mailogroup.inc:78
+#: plugins/personal/mail/class_mailAccount.inc:959
+#: plugins/admin/groups/class_groupMail.inc:865
+#: plugins/admin/ogroups/class_mailogroup.inc:85
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:865
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/personal/mail/class_mailAccount.inc:965
+#: plugins/admin/groups/class_groupMail.inc:871
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:874
-#: plugins/admin/groups/class_groupMail.inc:863
+#: plugins/personal/mail/class_mailAccount.inc:974
+#: plugins/admin/groups/class_groupMail.inc:880
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:884
-#: plugins/admin/groups/class_groupMail.inc:871
+#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/admin/groups/class_groupMail.inc:888
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:888
+#: plugins/personal/mail/class_mailAccount.inc:988
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1042
+#: plugins/personal/mail/class_mailAccount.inc:992
+msgid "Time interval to show vacation message is not valid."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1146
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1044
+#: plugins/personal/mail/class_mailAccount.inc:1148
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/password/password.tpl:2
-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
-msgid ""
-"Changing the password affects your authentification on mail, proxy, samba "
-"and unix services."
-msgstr ""
-
-#: plugins/personal/password/password.tpl:11
-msgid "Current password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:16
-#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:14
-msgid "New password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:21
-#: plugins/personal/generic/password.tpl:11
-#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
-msgid "Repeat new password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:30
-#: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
-msgid "Set password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:32
-msgid "Clear fields"
-msgstr ""
-
 #: plugins/personal/password/changed.tpl:3
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
@@ -1169,7 +1290,7 @@ msgstr ""
 #: plugins/admin/fai/faiNewBranch.tpl:52
 #: plugins/admin/departments/dep_iframe.tpl:19
 #: plugins/admin/systems/class_systemManagement.inc:243
-#: include/functions.inc:1528 ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: include/functions.inc:1535 ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
@@ -1178,20 +1299,21 @@ msgstr ""
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:114
+#: ihtml/themes/default/setup_step4.tpl:114 setup/class_setup.inc:275
+#: setup/class_setup.inc:277
 msgid "Back"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/generic/paste_generic.tpl:20
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:178
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
 #: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30 setup/setup_migrate.tpl:223
 msgid "Password"
 msgstr ""
 
@@ -1203,53 +1325,92 @@ msgstr ""
 msgid "You are not allowed to change your password at this time"
 msgstr ""
 
-#: plugins/personal/password/main.inc:38
+#: plugins/personal/password/password.tpl:2
+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
+msgid ""
+"Changing the password affects your authentification on mail, proxy, samba "
+"and unix services."
+msgstr ""
+
+#: plugins/personal/password/password.tpl:11
+msgid "Current password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:16
+#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
+#: plugins/admin/systems/password.tpl:14
+msgid "New password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:21
+#: plugins/personal/generic/password.tpl:11
+#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
+msgid "Repeat new password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:30
+#: plugins/personal/generic/password.tpl:17
+#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
+msgid "Set password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl:32
+msgid "Clear fields"
+msgstr ""
+
+#: plugins/personal/password/main.inc:37
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/main.inc:41
+#: plugins/personal/password/main.inc:40
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/password/main.inc:46 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:226
+#: plugins/personal/password/main.inc:45 plugins/personal/generic/main.inc:84
+#: plugins/admin/users/class_userManagement.inc:243
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: plugins/personal/password/main.inc:49 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:231
+#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:89
+#: plugins/admin/users/class_userManagement.inc:248
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
-#: plugins/personal/password/main.inc:57
+#: plugins/personal/password/main.inc:56
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/password/main.inc:62
+#: plugins/personal/password/main.inc:61
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/password/main.inc:69
+#: plugins/personal/password/main.inc:68
 msgid "You have no permissions to change your password."
 msgstr ""
 
-#: plugins/personal/password/main.inc:87
+#: plugins/personal/password/main.inc:86
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/password/main.inc:118
-#: plugins/admin/users/class_divListUsers.inc:138
+#: plugins/personal/password/main.inc:117
+#: plugins/admin/users/class_divListUsers.inc:190
 msgid "Change password"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:698
 msgid "Home directory"
 msgstr ""
 
@@ -1321,6 +1482,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:48
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:69
 #: plugins/gofon/macro/class_divListMacros.inc:51
@@ -1353,7 +1515,7 @@ msgid "User must change password on first login"
 msgstr ""
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:269
 msgid "Password expires on"
 msgstr ""
 
@@ -1383,310 +1545,193 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:130
+#: plugins/personal/posix/class_posixAccount.inc:125
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:127
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:135
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "active, password not changable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:137
+#: plugins/personal/posix/class_posixAccount.inc:132
 msgid "active, password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:139
+#: plugins/personal/posix/class_posixAccount.inc:134
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:150
-#: plugins/personal/posix/class_posixAccount.inc:990
+#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:993
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:185
+#: plugins/personal/posix/class_posixAccount.inc:180
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:205
-#: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:830
-#: plugins/admin/systems/class_terminalService.inc:195
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:216
+#: plugins/personal/posix/class_posixAccount.inc:200
+#: plugins/admin/systems/class_workstationService.inc:177
+#: plugins/admin/systems/class_workstationStartup.inc:829
+#: plugins/admin/systems/class_terminalService.inc:190
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:248
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:264
 #: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:265
+#: plugins/personal/posix/class_posixAccount.inc:268
 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:268
+#: plugins/personal/posix/class_posixAccount.inc:271
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:271
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:272
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:438
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:440
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:442
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:441
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
-msgid "January"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
-msgid "February"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
-msgid "March"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
-#: plugins/personal/generic/class_user.inc:245
-msgid "April"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
-msgid "May"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
-msgid "June"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
-msgid "July"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
-msgid "August"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
-msgid "September"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
-msgid "October"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
-msgid "November"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
-msgid "December"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
-#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: plugins/personal/posix/class_posixAccount.inc:559
+#: plugins/personal/samba/class_sambaAccount.inc:491
+#: plugins/admin/systems/class_terminalGeneric.inc:99
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 setup/setup_config2.tpl:103
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:556
+#: plugins/personal/posix/class_posixAccount.inc:559
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:557
+#: plugins/personal/posix/class_posixAccount.inc:560
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:603
+#: plugins/personal/posix/class_posixAccount.inc:606
 msgid "Removing UNIX account failed"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:752
+#: plugins/personal/posix/class_posixAccount.inc:755
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:841
+#: plugins/personal/posix/class_posixAccount.inc:844
 msgid "Saving UNIX account failed"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:904
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:915
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:921
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/admin/groups/class_groupGeneric.inc:787
+#: plugins/personal/posix/class_posixAccount.inc:925
+#: plugins/admin/groups/class_groupGeneric.inc:807
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:925
-#: plugins/admin/groups/class_groupGeneric.inc:790
+#: plugins/personal/posix/class_posixAccount.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:810
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:933
+#: plugins/personal/posix/class_posixAccount.inc:936
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:941
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:943
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:946
+#: plugins/personal/posix/class_posixAccount.inc:949
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:952
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:952
+#: plugins/personal/posix/class_posixAccount.inc:955
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:957
+#: plugins/personal/posix/class_posixAccount.inc:960
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: plugins/personal/posix/class_posixAccount.inc:963
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:965
+#: plugins/personal/posix/class_posixAccount.inc:968
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/admin/groups/class_groupGeneric.inc:826
+#: plugins/personal/posix/class_posixAccount.inc:1116
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/netatalk/netatalk.tpl:4
-msgid "Share"
-msgstr ""
-
-#: plugins/personal/netatalk/netatalk.tpl:14
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr ""
-
-#: plugins/personal/netatalk/main.inc:104
-#: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:24
-msgid "Finish"
+#: plugins/personal/netatalk/main.inc:104
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: ihtml/themes/default/copyPasteDialog.tpl:24
+#: setup/class_setupStep_Finish.inc:37
+msgid "Finish"
 msgstr ""
 
 #: plugins/personal/netatalk/main.inc:121
@@ -1697,43 +1742,52 @@ msgstr ""
 msgid "Manage netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:167
+#: plugins/personal/netatalk/class_netatalk.inc:173
 msgid "This account has no netatalk extensions."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:176
+#: plugins/personal/netatalk/class_netatalk.inc:182
 msgid "Remove netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:177
+#: plugins/personal/netatalk/class_netatalk.inc:183
 msgid ""
 "This account has netatalk features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:188
-#: plugins/personal/netatalk/class_netatalk.inc:191
+#: plugins/personal/netatalk/class_netatalk.inc:194
+#: plugins/personal/netatalk/class_netatalk.inc:197
 msgid "Create netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:189
+#: plugins/personal/netatalk/class_netatalk.inc:195
 msgid ""
 "This account has netatalk features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:221
+#: plugins/personal/netatalk/class_netatalk.inc:227
 msgid "You must select a share to use."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:280
+#: plugins/personal/netatalk/class_netatalk.inc:286
 msgid "Saving Netatalk account failed"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:340
+#: plugins/personal/netatalk/class_netatalk.inc:346
 msgid "Removing Netatalk account failed"
 msgstr ""
 
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:14
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr ""
@@ -1744,19 +1798,19 @@ msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/class_sambaAccount.inc:699
 msgid "Profile path"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:254
 msgid "Access options"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:260
 msgid "Allow user to change password from client"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
+#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:263
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -1764,6 +1818,65 @@ msgstr ""
 msgid "Temporary disable samba account"
 msgstr ""
 
+#: plugins/personal/samba/class_sambaLogonHours.inc:62
+msgid "Sunday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:63
+msgid "Monday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:64
+msgid "Tuesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:65
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:66
+msgid "Thursday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:67
+msgid "Friday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:68
+msgid "Saturday"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+msgid "Specify the hours this user is allowed to log in"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+msgid "Hour"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:90
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+#: include/sieve/templates/create_script.tpl:13 setup/setup_ldap.tpl:16
+#: setup/setup_migrate.tpl:131 setup/setup_migrate.tpl:182
+#: setup/setup_migrate.tpl:247 setup/setup_migrate.tpl:306
+#: setup/setup_migrate.tpl:359
+msgid "Apply"
+msgstr ""
+
 #: plugins/personal/samba/samba3.tpl:23
 msgid "Domain"
 msgstr ""
@@ -1784,83 +1897,91 @@ msgstr ""
 msgid "Initial program"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:132
 msgid "Working directory"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:153
+#: plugins/personal/samba/samba3.tpl:155
 msgid "Timeout settings (in minutes)"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/samba3.tpl:160
+#: plugins/personal/samba/class_sambaAccount.inc:706
 msgid "Connection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/samba3.tpl:169
+#: plugins/personal/samba/class_sambaAccount.inc:707
 msgid "Disconnection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/samba3.tpl:178
+#: plugins/personal/samba/class_sambaAccount.inc:708
 msgid "IDLE"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/samba3.tpl:191
 msgid "Client devices"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:194
+#: plugins/personal/samba/samba3.tpl:196
 msgid "Connect client drives at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:200
+#: plugins/personal/samba/samba3.tpl:202
 msgid "Connect client printers at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:206
+#: plugins/personal/samba/samba3.tpl:208
 msgid "Default to main client printer"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:216
+#: plugins/personal/samba/samba3.tpl:218
 #: plugins/personal/connectivity/pureftpd.tpl:68
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:220
+#: plugins/personal/samba/samba3.tpl:222
 msgid "Shadowing"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:229
+#: plugins/personal/samba/samba3.tpl:231
 msgid "On broken or timed out"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:237
+#: plugins/personal/samba/samba3.tpl:239
 msgid "Reconnect if disconnected"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:264
+#: plugins/personal/samba/samba3.tpl:266
 msgid "Lock samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:279
+#: plugins/personal/samba/samba3.tpl:281
 msgid "Limit Logon Time"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:291
+#: plugins/personal/samba/samba3.tpl:293
 msgid "Limit Logoff Time"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:304
+#: plugins/personal/samba/samba3.tpl:306
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:322
+msgid "Samba logon times"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:322
+msgid "Edit settings..."
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:328
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:124
+#: plugins/personal/samba/main.inc:124 setup/setup_config2.tpl:2
 msgid "Samba settings"
 msgstr ""
 
@@ -1872,277 +1993,139 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaAccount.inc:209
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:218
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:232
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:233
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:493
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:682
 msgid "Removing Samba account failed"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:701
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:711
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:717
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:924
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:948
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1052
 msgid "Saving Samba account failed"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:3
-msgid "The environment extension is currently disabled."
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/environment.tpl:148
-msgid "Environment managment settings"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:11
-msgid "Profile managment"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:18
-msgid "Use profile managment"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:25
-msgid "Profile server managment"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:28
-msgid "Profil path"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:40
-msgid "Profil quota"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:54
-msgid "Cache profile localy"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:63
-msgid "Kiosk profile settings"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:66
-msgid "Kiosk profile"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:72
-msgid "Manage"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:82
-msgid "Resolution changeable during session"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:87
-#: plugins/admin/systems/workstationService.tpl:94
-#: plugins/admin/systems/terminalService.tpl:94
-msgid "Resolution"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:106
-#: plugins/admin/systems/workstationStartup.tpl:132
-#: plugins/admin/systems/terminalStartup.tpl:66
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Shares"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:111
-msgid "User used to connect to the share"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:112
-msgid "Select a share"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:118
-msgid "Mount path"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:120
-#: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/personal/generic/generic_certs.tpl:17
-#: plugins/personal/generic/generic_certs.tpl:37
-#: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:238
-#: plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
-#: plugins/admin/groups/class_groupMail.inc:569
-#: plugins/admin/applications/class_applicationParameters.inc:108
-#: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:147
-#: plugins/admin/systems/terminalStartup.tpl:81
-#: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/goSpamServer.tpl:37
-#: plugins/admin/systems/printer.tpl:53
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
-#: ihtml/themes/altlinux/islocked.tpl:13
-msgid "Remove"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:126
-msgid "Logon scripts"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:127
-#: plugins/personal/environment/logonManagement.tpl:1
-#: plugins/personal/environment/logonManagement.tpl:5
-msgid "Logon script management"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:151
-msgid "Hotplug devices"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:152
-msgid "Hotplug device settings"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/gofon/macro/class_divListMacros.inc:74
-msgid "New"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:164
-msgid "Existing"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:172
-msgid "Printer settings"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:182
-msgid "Toggle admin"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:184
-#: plugins/personal/environment/environment.tpl:186
-msgid "Toggle default"
-msgstr ""
-
 #: plugins/personal/environment/main.inc:125
 msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:127
+#: plugins/personal/environment/class_hotplugDialog.inc:122
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:125
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:134
-msgid "Please specify a valid id."
+#: plugins/personal/environment/class_hotplugDialog.inc:131
+msgid "Please specify a valid iSerial."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:137
-msgid "Please specify a valid vendor id. (2 byte hex like '0xFFFF')"
+#: plugins/personal/environment/class_hotplugDialog.inc:135
+msgid "Please specify a valid vendor ID. (2 byte hex like '0xFFFF')"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:140
-msgid "Please specify a valid product id. (2 byte hex like '0xFFFF')"
+#: plugins/personal/environment/class_hotplugDialog.inc:138
+msgid "Please specify a valid product ID. (2 byte hex like '0xFFFF')"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:145
+#: plugins/personal/environment/class_hotplugDialog.inc:143
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:150
+#: plugins/personal/environment/class_hotplugDialog.inc:148
 msgid "Please select an entry or press cancel."
 msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/personal/environment/class_selectPrinterDialog.inc:64
 #: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
 msgid "Please select a printer or press cancel."
 msgstr ""
@@ -2177,114 +2160,114 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:187
+#: plugins/personal/environment/class_environment.inc:182
 msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:209
-#: plugins/admin/systems/class_workstationService.inc:88
-#: plugins/admin/systems/class_terminalService.inc:96
+#: plugins/personal/environment/class_environment.inc:204
+#: plugins/admin/systems/class_workstationService.inc:83
+#: plugins/admin/systems/class_terminalService.inc:91
 #, php-format
 msgid ""
 "You have specified an external resolution hook which can't be read, please "
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:301
-#: plugins/personal/environment/class_environment.inc:337
+#: plugins/personal/environment/class_environment.inc:300
+#: plugins/personal/environment/class_environment.inc:344
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:302
-#: plugins/personal/environment/class_environment.inc:338
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:345
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:311
-#: plugins/personal/environment/class_environment.inc:316
-#: plugins/personal/environment/class_environment.inc:343
-#: plugins/personal/environment/class_environment.inc:348
+#: plugins/personal/environment/class_environment.inc:310
+#: plugins/personal/environment/class_environment.inc:315
+#: plugins/personal/environment/class_environment.inc:350
+#: plugins/personal/environment/class_environment.inc:355
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:312
-#: plugins/personal/environment/class_environment.inc:344
+#: plugins/personal/environment/class_environment.inc:311
+#: plugins/personal/environment/class_environment.inc:351
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:317
-#: plugins/personal/environment/class_environment.inc:349
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:356
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:464
-#: plugins/personal/environment/class_environment.inc:794
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+#: plugins/personal/environment/class_environment.inc:467
+#: plugins/personal/environment/class_environment.inc:800
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:401
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:547
-#: plugins/personal/environment/class_environment.inc:560
-#: plugins/admin/systems/class_workstationStartup.inc:645
-#: plugins/admin/systems/class_terminalStartup.inc:201
+#: plugins/personal/environment/class_environment.inc:551
+#: plugins/personal/environment/class_environment.inc:564
+#: plugins/admin/systems/class_workstationStartup.inc:642
+#: plugins/admin/systems/class_terminalStartup.inc:204
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:549
+#: plugins/personal/environment/class_environment.inc:553
 msgid "Spaces are not allowed in the mount path!"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:630
-#: plugins/personal/environment/class_environment.inc:631
-#: plugins/personal/environment/class_environment.inc:639
-#: plugins/personal/environment/class_environment.inc:640
+#: plugins/personal/environment/class_environment.inc:634
+#: plugins/personal/environment/class_environment.inc:635
+#: plugins/personal/environment/class_environment.inc:643
+#: plugins/personal/environment/class_environment.inc:644
 msgid "Reset password hash"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:645
+#: plugins/personal/environment/class_environment.inc:649
 msgid "Delete share entry"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:797
+#: plugins/personal/environment/class_environment.inc:803
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:850
+#: plugins/personal/environment/class_environment.inc:849
 msgid "Removing environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:904
+#: plugins/personal/environment/class_environment.inc:901
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:911
+#: plugins/personal/environment/class_environment.inc:908
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:949
+#: plugins/personal/environment/class_environment.inc:946
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1098
+#: plugins/personal/environment/class_environment.inc:1099
 msgid "Adding environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1111
+#: plugins/personal/environment/class_environment.inc:1112
 msgid "group share"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1143
+#: plugins/personal/environment/class_environment.inc:1144
 msgid "Administrator"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1148
+#: plugins/personal/environment/class_environment.inc:1149
 msgid "Default printer"
 msgstr ""
 
@@ -2306,60 +2289,199 @@ msgstr ""
 msgid "Regular expression for matching printer names"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-msgid "Specified name should only consist of uper-/lowercase characters."
+#: plugins/personal/environment/environment.tpl:3
+msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:104
-msgid "Please specify a valid script name."
+#: plugins/personal/environment/environment.tpl:8
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/environment.tpl:148
+msgid "Environment managment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:108
-msgid "Specified description contains invalid characters."
+#: plugins/personal/environment/environment.tpl:11
+msgid "Profile managment"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:8
-msgid "Logon script settings"
+#: plugins/personal/environment/environment.tpl:18
+msgid "Use profile managment"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:10
-msgid "Skript name"
+#: plugins/personal/environment/environment.tpl:25
+msgid "Profile server managment"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:17
-#: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
-#: plugins/admin/fai/faiScript.tpl:19
-#: plugins/admin/fai/faiVariableEntry.tpl:17
-#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
-#: plugins/admin/fai/faiHookEntry.tpl:17
-#: plugins/admin/fai/faiTemplateEntry.tpl:11
-#: plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:23
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/phone.tpl:30
-#: plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
-#: plugins/gofon/conference/generic.tpl:56
-#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
-#: html/getxls.php:230
-msgid "Description"
+#: plugins/personal/environment/environment.tpl:28
+msgid "Profil path"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:24
-#: plugins/admin/fai/faiScriptEntry.tpl:34
-msgid "Priority"
+#: plugins/personal/environment/environment.tpl:40
+msgid "Profil quota"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:34
-msgid "Logon script flags"
+#: plugins/personal/environment/environment.tpl:54
+msgid "Cache profile localy"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:63
+msgid "Kiosk profile settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:66
+msgid "Kiosk profile"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:72
+msgid "Manage"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:82
+msgid "Resolution changeable during session"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:87
+#: plugins/admin/systems/workstationService.tpl:94
+#: plugins/admin/systems/terminalService.tpl:94
+msgid "Resolution"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:106
+#: plugins/admin/systems/workstationStartup.tpl:133
+#: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Shares"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:111
+msgid "User used to connect to the share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:112
+msgid "Select a share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:118
+msgid "Mount path"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/environment/kioskManagement.tpl:15
+#: plugins/personal/generic/generic_certs.tpl:17
+#: plugins/personal/generic/generic_certs.tpl:37
+#: plugins/personal/generic/generic_certs.tpl:57
+#: plugins/personal/connectivity/class_kolabAccount.inc:240
+#: plugins/admin/fai/faiPackage.tpl:72
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:274
+#: plugins/admin/groups/class_groupMail.inc:572
+#: plugins/admin/applications/class_applicationParameters.inc:108
+#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/workstationStartup.tpl:148
+#: plugins/admin/systems/terminalStartup.tpl:81
+#: plugins/admin/systems/glpiManufacturer.tpl:8
+#: plugins/admin/systems/goSpamServer.tpl:37
+#: plugins/admin/systems/printer.tpl:53
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:395
+#: ihtml/themes/altlinux/islocked.tpl:13
+msgid "Remove"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:126
+msgid "Logon scripts"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/logonManagement.tpl:1
+#: plugins/personal/environment/logonManagement.tpl:5
+msgid "Logon script management"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:151
+msgid "Hotplug devices"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:152
+msgid "Hotplug device settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:163
+#: plugins/admin/groups/class_divListGroup.inc:93
+#: plugins/gofon/macro/class_divListMacros.inc:74
+msgid "New"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:164
+msgid "Existing"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:172
+msgid "Printer settings"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:182
+msgid "Toggle admin"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/environment.tpl:186
+msgid "Toggle default"
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:95
+msgid "Specified name should only consist of uper-/lowercase characters."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:99
+msgid "Please specify a valid script name."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:103
+msgid "Specified description contains invalid characters."
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:8
+msgid "Logon script settings"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:10
+#: include/sieve/templates/create_script.tpl:8
+msgid "Script name"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:17
+#: plugins/personal/environment/hotplugDialogNew.tpl:17
+#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/faiPartitionTable.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiVariableEntry.tpl:17
+#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
+#: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/faiTemplateEntry.tpl:11
+#: plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/phone.tpl:30 plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/wingeneric.tpl:25
+#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/conference/generic.tpl:64
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
+#: html/getxls.php:230
+msgid "Description"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:24
+#: plugins/admin/fai/faiScriptEntry.tpl:34
+msgid "Priority"
+msgstr ""
+
+#: plugins/personal/environment/logonManagement.tpl:34
+msgid "Logon script flags"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:38
@@ -2374,42 +2496,24 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:75
-#: plugins/personal/environment/class_kioskManagementDialog.inc:94
+#: plugins/personal/environment/class_kioskManagementDialog.inc:70
+#: plugins/personal/environment/class_kioskManagementDialog.inc:89
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:78
-#: plugins/personal/environment/class_kioskManagementDialog.inc:97
+#: plugins/personal/environment/class_kioskManagementDialog.inc:73
+#: plugins/personal/environment/class_kioskManagementDialog.inc:92
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:139
+#: plugins/personal/environment/class_kioskManagementDialog.inc:134
 msgid ""
 "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:145
+#: plugins/personal/environment/class_kioskManagementDialog.inc:140
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
@@ -2472,158 +2576,158 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:79
+#: include/class_MultiSelectWindow.inc:79 setup/setup_migrate.tpl:79
 msgid "Close"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
+#: plugins/personal/generic/class_user.inc:260
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
+#: plugins/personal/generic/class_user.inc:260
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:272
+#: plugins/personal/generic/class_user.inc:277
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:331
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:422
+#: plugins/personal/generic/class_user.inc:427
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:462
+#: plugins/personal/generic/class_user.inc:467
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:472
+#: plugins/personal/generic/class_user.inc:477
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:475
+#: plugins/personal/generic/class_user.inc:480
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:481
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:480
+#: plugins/personal/generic/class_user.inc:485
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:563
+#: plugins/personal/generic/class_user.inc:568
 msgid "Removing generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:595
-#: plugins/personal/generic/class_user.inc:937
+#: plugins/personal/generic/class_user.inc:600
+#: plugins/personal/generic/class_user.inc:936
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:609
-#: plugins/personal/generic/class_user.inc:954
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:953
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:890
+#: plugins/personal/generic/class_user.inc:889
 msgid "Saving generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:964
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1021
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1019
+#: plugins/personal/generic/class_user.inc:1026
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1032
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:524
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1034
+#: plugins/personal/generic/class_user.inc:1041
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1040
+#: plugins/personal/generic/class_user.inc:1047
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:527
+#: plugins/admin/users/class_userManagement.inc:544
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1043
+#: plugins/personal/generic/class_user.inc:1050
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1055
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1057
+#: plugins/personal/generic/class_user.inc:1062
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1060
+#: plugins/personal/generic/class_user.inc:1065
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1063
-#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1068
+#: plugins/personal/generic/class_user.inc:1093
 #: plugins/addons/addressbook/class_addressbook.inc:565
 #: plugins/addons/addressbook/class_addressbook.inc:593
 #: plugins/admin/departments/class_departmentGeneric.inc:243
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1066
-#: plugins/personal/generic/class_user.inc:1085
+#: plugins/personal/generic/class_user.inc:1071
+#: plugins/personal/generic/class_user.inc:1090
 #: plugins/addons/addressbook/class_addressbook.inc:568
 #: plugins/addons/addressbook/class_addressbook.inc:590
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1071
+#: plugins/personal/generic/class_user.inc:1076
 #: plugins/addons/addressbook/class_addressbook.inc:573
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1074
+#: plugins/personal/generic/class_user.inc:1079
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1077
+#: plugins/personal/generic/class_user.inc:1082
 #: plugins/addons/addressbook/class_addressbook.inc:582
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1080
+#: plugins/personal/generic/class_user.inc:1085
 #: plugins/addons/addressbook/class_addressbook.inc:585
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1207
+#: plugins/personal/generic/class_user.inc:1212
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -2712,8 +2816,8 @@ msgstr ""
 #: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
 #: plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/class_divListSystem.inc:106
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:161
 #: plugins/admin/systems/servservice.tpl:61
 #: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/class_baseSelectDialog.inc:44
@@ -2724,6 +2828,7 @@ msgstr ""
 #: plugins/gofon/macro/class_divListMacros.inc:76
 #: plugins/gofon/conference/generic.tpl:33
 #: plugins/gofon/conference/class_divListConferences.inc:77
+#: setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr ""
 
@@ -2743,10 +2848,9 @@ msgstr ""
 #: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
 #: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
 #: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/workstation.tpl:31
-#: plugins/admin/systems/component.tpl:19
-#: plugins/admin/systems/component.tpl:21 plugins/admin/systems/phone.tpl:19
-#: plugins/admin/systems/phone.tpl:21 plugins/admin/systems/printer.tpl:26
+#: plugins/admin/systems/workstation.tpl:31 plugins/admin/systems/phone.tpl:19
+#: plugins/admin/systems/phone.tpl:21 plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21 plugins/admin/systems/printer.tpl:26
 #: plugins/admin/systems/printer.tpl:28
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:27 plugins/admin/ogroups/generic.tpl:29
@@ -2763,7 +2867,10 @@ msgstr ""
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21
+#: include/sieve/templates/element_address.tpl:15
+#: include/sieve/templates/element_address.tpl:113
+#: include/sieve/class_sieveManagement.inc:602 html/getxls.php:174
 msgid "Address"
 msgstr ""
 
@@ -2801,6 +2908,7 @@ msgid "Organizational information"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: setup/setup_feedback.tpl:16
 msgid "Organization"
 msgstr ""
 
@@ -2810,7 +2918,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/users/class_divListUsers.inc:50
 #: plugins/admin/applications/class_divListApplication.inc:44
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
+#: plugins/admin/ogroups/class_ogroupManagement.inc:366
 #: plugins/gofon/macro/class_divListMacros.inc:46
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
@@ -3023,6 +3131,8 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:293
 #: plugins/admin/systems/glpi_devices.tpl:420
 #: plugins/admin/systems/glpi_devices.tpl:485
+#: include/sieve/templates/element_size.tpl:4
+#: include/sieve/class_sieveManagement.inc:605
 msgid "Size"
 msgstr ""
 
@@ -3050,11 +3160,11 @@ msgstr ""
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:76
+#: plugins/personal/connectivity/class_webdavAccount.inc:78
 msgid "Removing webDAV account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:119
+#: plugins/personal/connectivity/class_webdavAccount.inc:123
 msgid "Saving webDAV account failed"
 msgstr ""
 
@@ -3097,6 +3207,7 @@ msgstr ""
 #: plugins/personal/connectivity/kolab.tpl:55
 #: plugins/personal/connectivity/oxchange.tpl:26
 #: plugins/personal/connectivity/oxchange.tpl:30
+#: include/sieve/templates/element_vacation.tpl:25
 msgid "days"
 msgstr ""
 
@@ -3147,44 +3258,44 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:87
+#: plugins/personal/connectivity/class_proxyAccount.inc:90
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:87
+#: plugins/personal/connectivity/class_proxyAccount.inc:90
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:91
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:91
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:91
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/personal/connectivity/class_proxyAccount.inc:91
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:164
+#: plugins/personal/connectivity/class_proxyAccount.inc:167
 msgid "Removing proxy account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:180
+#: plugins/personal/connectivity/class_proxyAccount.inc:183
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:183
+#: plugins/personal/connectivity/class_proxyAccount.inc:186
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:270
+#: plugins/personal/connectivity/class_proxyAccount.inc:267
 msgid "Saving proxy account failed"
 msgstr ""
 
@@ -3201,8 +3312,8 @@ msgid "Template user"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:110
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/systems/class_servGeneric.inc:48
 #: plugins/admin/ogroups/class_termgroup.inc:48
 msgid "Locked"
 msgstr ""
@@ -3219,11 +3330,11 @@ msgstr ""
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:92
+#: plugins/personal/connectivity/class_pptpAccount.inc:93
 msgid "Removing PPTP account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:135
+#: plugins/personal/connectivity/class_pptpAccount.inc:138
 msgid "Saving PPTP account failed"
 msgstr ""
 
@@ -3231,11 +3342,11 @@ msgstr ""
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:109
+#: plugins/personal/connectivity/class_intranetAccount.inc:108
 msgid "Removing intranet account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:164
+#: plugins/personal/connectivity/class_intranetAccount.inc:163
 msgid "Saving intranet account failed"
 msgstr ""
 
@@ -3243,81 +3354,77 @@ msgstr ""
 msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:80
-msgid "Removing PHPgw account failed"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:81
+msgid "Removing PHPGroupware account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:123
-msgid "Saving PHPgw account failed"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:126
+msgid "Saving PHPGroupware account failed"
 msgstr ""
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:123
+#: plugins/personal/connectivity/class_kolabAccount.inc:125
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:131
+#: plugins/personal/connectivity/class_kolabAccount.inc:133
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:158
+#: plugins/personal/connectivity/class_kolabAccount.inc:160
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:159
+#: plugins/personal/connectivity/class_kolabAccount.inc:161
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:160
+#: plugins/personal/connectivity/class_kolabAccount.inc:162
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:161
+#: plugins/personal/connectivity/class_kolabAccount.inc:163
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:162
+#: plugins/personal/connectivity/class_kolabAccount.inc:164
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:212
+#: plugins/personal/connectivity/class_kolabAccount.inc:214
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:275
 #, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:284
+#: plugins/personal/connectivity/class_kolabAccount.inc:286
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:289
+#: plugins/personal/connectivity/class_kolabAccount.inc:291
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:303
+#: plugins/personal/connectivity/class_kolabAccount.inc:305
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:311
+#: plugins/personal/connectivity/class_kolabAccount.inc:313
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:390
+#: plugins/personal/connectivity/class_kolabAccount.inc:393
 #, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr ""
@@ -3327,31 +3434,31 @@ msgstr ""
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:104
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:106
 msgid "Removing pureftpd account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:155
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:155
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:161
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:183
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:186
 msgid "Saving pureftpd account failed"
 msgstr ""
 
@@ -3359,40 +3466,40 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:822
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:729
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:827
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:730
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:826
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:733
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:831
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:830
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:737
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:835
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:743
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:746
 msgid "Removing of oxchange addressbook failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:751
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:754
 msgid "Removing oxchange account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:810
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:815
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:843
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:848
 msgid "Saving of oxchange account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:850
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:855
 msgid "Creating oxchange addressbook tree failed"
 msgstr ""
 
@@ -3400,19 +3507,19 @@ msgstr ""
 msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:145
+#: plugins/personal/connectivity/class_opengwAccount.inc:148
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:150
+#: plugins/personal/connectivity/class_opengwAccount.inc:153
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:158
+#: plugins/personal/connectivity/class_opengwAccount.inc:161
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
@@ -3422,11 +3529,11 @@ msgstr ""
 msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:84
 msgid "Removing PHPscheduleit account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:127
 msgid "Saving PHPscheduleit account failed"
 msgstr ""
 
@@ -3448,7 +3555,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/fai/class_faiSummaryTab.inc:334
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:200
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/servnfs.tpl:47
@@ -3482,53 +3589,53 @@ msgstr ""
 msgid "FAX Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:172
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:189
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
 msgid "You have no permission to remove this blocklist."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:204
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
 msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:287
 msgid "send"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:287
 msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:390
 msgid "Removing blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:437
 #: plugins/admin/departments/class_departmentGeneric.inc:232
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:440
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:447
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:454
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:502
 msgid "Saving blocklist object failed"
 msgstr ""
 
@@ -3556,8 +3663,8 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:45
 #: plugins/admin/departments/class_divListDepartment.inc:42
 #: plugins/admin/systems/class_divListSystem.inc:58
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:183
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:198
 #: plugins/admin/ogroups/class_divListOGroup.inc:54
 #: plugins/gofon/macro/class_divListMacros.inc:48
 #: plugins/gofon/conference/class_divListConferences.inc:49
@@ -3586,6 +3693,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:48
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:69
 #: plugins/gofon/macro/class_divListMacros.inc:51
@@ -3613,7 +3721,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:95
 #: plugins/admin/departments/class_divListDepartment.inc:74
 #: plugins/admin/systems/class_divListSystem.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
@@ -3628,8 +3736,8 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:95
 #: plugins/admin/departments/class_divListDepartment.inc:74
 #: plugins/admin/systems/class_divListSystem.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
 #: plugins/gofon/macro/class_divListMacros.inc:78
@@ -3639,48 +3747,48 @@ msgid "Submit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/fai/class_faiScript.inc:249
-#: plugins/admin/fai/class_faiScript.inc:252
-#: plugins/admin/fai/class_faiTemplate.inc:245
-#: plugins/admin/fai/class_faiTemplate.inc:248
-#: plugins/admin/fai/class_faiHook.inc:271
-#: plugins/admin/fai/class_faiHook.inc:274
+#: plugins/admin/fai/class_faiScript.inc:244
+#: plugins/admin/fai/class_faiScript.inc:247
+#: plugins/admin/fai/class_faiTemplate.inc:240
+#: plugins/admin/fai/class_faiTemplate.inc:243
+#: plugins/admin/fai/class_faiHook.inc:266
+#: plugins/admin/fai/class_faiHook.inc:269
 #: plugins/admin/fai/class_divListFai.inc:213
 #: plugins/admin/fai/class_divListFai.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/users/class_divListUsers.inc:135
-#: plugins/admin/applications/class_divListApplication.inc:148
-#: plugins/admin/departments/class_divListDepartment.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:157
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/applications/class_divListApplication.inc:156
+#: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
-#: plugins/admin/systems/class_divListSystem.inc:134
+#: plugins/admin/systems/class_divListSystem.inc:143
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/ogroups/class_divListOGroup.inc:129
+#: plugins/admin/ogroups/class_divListOGroup.inc:142
 #: plugins/gofon/macro/class_divListMacros.inc:93
 #: plugins/gofon/conference/class_divListConferences.inc:94
 msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:136
+#: plugins/admin/users/class_divListUsers.inc:185
 msgid "Edit user"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:253
-#: plugins/admin/fai/class_faiTemplate.inc:249
-#: plugins/admin/fai/class_faiHook.inc:275
+#: plugins/admin/fai/class_faiScript.inc:248
+#: plugins/admin/fai/class_faiTemplate.inc:244
+#: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:220
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:153
-#: plugins/admin/departments/class_divListDepartment.inc:91
-#: plugins/admin/systems/class_divListSystem.inc:135
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
-#: plugins/admin/ogroups/class_divListOGroup.inc:131
+#: plugins/admin/groups/class_divListGroup.inc:161
+#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:132
+#: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/gofon/macro/class_divListMacros.inc:95
 #: plugins/gofon/conference/class_divListConferences.inc:96
 #: plugins/gofon/conference/class_divListConferences.inc:98
@@ -3688,7 +3796,7 @@ msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:140
+#: plugins/admin/users/class_divListUsers.inc:196
 msgid "Delete user"
 msgstr ""
 
@@ -3697,18 +3805,24 @@ msgstr ""
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
 #: plugins/admin/systems/remove_ppd.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
 #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
 #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:333 html/index.php:339
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: include/sieve/templates/remove_script.tpl:2 html/index.php:49
+#: html/index.php:349 html/index.php:355 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/conflict.tpl:6 setup/class_setupStep_Migrate.inc:211
+#: setup/class_setupStep_Migrate.inc:260 setup/class_setupStep_Migrate.inc:384
+#: setup/class_setupStep_Migrate.inc:460 setup/class_setupStep_Migrate.inc:595
+#: setup/class_setupStep_Migrate.inc:725 setup/setup_checks.tpl:32
+#: setup/setup_checks.tpl:93
 msgid "Warning"
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:6
 #: plugins/admin/systems/remove_glpi.tpl:6
+#: include/sieve/templates/remove_script.tpl:6
 msgid ""
 "Please double check if your really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -3732,7 +3846,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/admin/ogroups/phonequeue.tpl:48 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr ""
@@ -3836,68 +3950,68 @@ msgstr ""
 msgid "FAX"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:145
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
 msgid "This account has no fax extensions."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:154
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:161
 msgid "Remove fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:157
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:164
 msgid "Create fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:226
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:233
 msgid "You're trying to add an invalid phone number."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:439
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:521
-#: plugins/admin/groups/class_groupApplication.inc:637
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:446
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:528
+#: plugins/admin/groups/class_groupApplication.inc:640
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:142
 msgid "back"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:625
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
 msgid "Removing FAX account failed"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:647
 msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:654
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:661
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:667
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:750
 msgid "Saving FAX account failed"
 msgstr ""
 
@@ -3942,14 +4056,15 @@ msgstr ""
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: setup/setup_ldap.tpl:13
 msgid "Search"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/ogroups/class_ogroupManagement.inc:339
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr ""
 
@@ -4073,13 +4188,12 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/class_faiSummaryTab.inc:329
 #: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/paste_fai_object.tpl:1
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
 #: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
 #: plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/paste_fai_object.tpl:1
 #: plugins/admin/systems/servnfs.tpl:9
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:10
@@ -4098,8 +4212,9 @@ msgstr ""
 #: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:196
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+#: setup/setup_feedback.tpl:24 setup/setup_migrate.tpl:207
 msgid "Name"
 msgstr ""
 
@@ -4125,7 +4240,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:719
+#: plugins/admin/groups/class_groupApplication.inc:722
 msgid "Edit entry"
 msgstr ""
 
@@ -4231,6 +4346,7 @@ msgid "Address book"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:6
+#: setup/class_setupStep_Feedback.inc:105
 msgid "Addressbook"
 msgstr ""
 
@@ -4313,7 +4429,7 @@ msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:524 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
+#: html/getxls.php:299 setup/setup_migrate.tpl:215
 msgid "User ID"
 msgstr ""
 
@@ -4383,15 +4499,17 @@ msgid "No DFS entries found"
 msgstr ""
 
 #: plugins/addons/godfs/class_dfsManagment.inc:213
-msgid "Go up one dfsshare"
+msgid "Go up one dfs share"
 msgstr ""
 
 #: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/fai/class_faiProfile.inc:310
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/fai/class_faiProfile.inc:305
+#: plugins/admin/systems/class_glpiSelectUser.inc:157
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: include/sieve/templates/object_container.tpl:8
+#: include/sieve/templates/object_container_clear.tpl:8
 #: include/class_MultiSelectWindow.inc:196
 #: include/class_MultiSelectWindow.inc:198
 msgid "Up"
@@ -4402,7 +4520,7 @@ msgid "Go to dfs root"
 msgstr ""
 
 #: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_glpiSelectUser.inc:155
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: include/class_MultiSelectWindow.inc:188
 #: include/class_MultiSelectWindow.inc:190
@@ -4410,31 +4528,31 @@ msgid "Root"
 msgstr ""
 
 #: plugins/addons/godfs/class_dfsManagment.inc:215
-msgid "Create new dfsshare"
+msgid "Create new dfs share"
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:102
-#: plugins/addons/godfs/class_dfsgeneric.inc:104
+#: plugins/addons/godfs/class_dfsgeneric.inc:97
+#: plugins/addons/godfs/class_dfsgeneric.inc:99
 msgid "Dfs share already exists."
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:117
+#: plugins/addons/godfs/class_dfsgeneric.inc:112
 msgid "Required Field \"Name of dfs Share\" is not set."
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:120
+#: plugins/addons/godfs/class_dfsgeneric.inc:115
 msgid "Required Field \"Description\" is not set."
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:123
+#: plugins/addons/godfs/class_dfsgeneric.inc:118
 msgid "Required Field \"Fileserver\" is not set."
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:126
+#: plugins/addons/godfs/class_dfsgeneric.inc:121
 msgid "Required Field \"Share on fileserver\" is not set."
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:129
+#: plugins/addons/godfs/class_dfsgeneric.inc:124
 msgid "Required Field \"Location\" is not set."
 msgstr ""
 
@@ -4506,12 +4624,14 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:58
+#: plugins/addons/mailqueue/contents.tpl:58 setup/setup_checks.tpl:30
+#: setup/setup_checks.tpl:91
 msgid "Error"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr ""
 
@@ -4907,7 +5027,7 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTable.tpl:32
 #: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
 #: plugins/admin/fai/faiHook.tpl:34
-#: plugins/admin/fai/class_faiProfileEntry.inc:175
+#: plugins/admin/fai/class_faiProfileEntry.inc:170
 msgid "Objects"
 msgstr ""
 
@@ -4923,36 +5043,36 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:262
-#: plugins/admin/fai/class_faiTemplate.inc:261
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:284
-#: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/fai/class_faiScript.inc:257
+#: plugins/admin/fai/class_faiTemplate.inc:256
+#: plugins/admin/fai/class_faiScriptEntry.inc:84
+#: plugins/admin/fai/class_faiHook.inc:279
+#: plugins/admin/fai/class_faiHookEntry.inc:79
 #: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:324
+#: plugins/admin/fai/class_faiScript.inc:319
 msgid "Removing FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:360
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiScript.inc:355
+#: plugins/admin/fai/class_faiProfile.inc:396
 #, php-format
 msgid ""
 "Can't insert a script named '%s' in '%s' there is already a script with the "
 "given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:393
+#: plugins/admin/fai/class_faiScript.inc:388
 msgid "Creating FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:477
+#: plugins/admin/fai/class_faiScript.inc:472
 msgid "Removing FAI script failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:496
+#: plugins/admin/fai/class_faiScript.inc:491
 msgid "Saving FAI script failed"
 msgstr ""
 
@@ -4964,26 +5084,26 @@ msgstr ""
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:357
+#: plugins/admin/fai/class_faiTemplate.inc:352
 #, php-format
 msgid ""
 "Can't insert a fai template named '%s' in '%s' there is already a template "
 "with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:390
+#: plugins/admin/fai/class_faiTemplate.inc:385
 msgid "Saving FAI template base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:468
+#: plugins/admin/fai/class_faiTemplate.inc:463
 msgid "Removing FAI template entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:473
+#: plugins/admin/fai/class_faiTemplate.inc:468
 msgid "Modifying FAI template entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/fai/class_faiTemplate.inc:481
 msgid "Creating FAI template entry failed"
 msgstr ""
 
@@ -4995,47 +5115,49 @@ msgstr ""
 msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:179
+#: plugins/admin/fai/class_faiManagement.inc:173
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:185
-#: plugins/admin/fai/class_faiManagement.inc:229
+#: plugins/admin/fai/class_faiManagement.inc:179
+#: plugins/admin/fai/class_faiManagement.inc:225
 #: plugins/admin/systems/class_systemManagement.inc:407
 #: plugins/admin/systems/class_systemManagement.inc:467
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:282
+#: plugins/admin/fai/class_faiManagement.inc:278
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:285
+#: plugins/admin/fai/class_faiManagement.inc:281
 msgid "You are not allowed to delete this release!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:341
+#: plugins/admin/fai/class_faiManagement.inc:339
 msgid "Specified branch name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:343
+#: plugins/admin/fai/class_faiManagement.inc:341
 msgid "Specified freeze name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:350
-#: plugins/admin/systems/class_servRepository.inc:237
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:351
+#: plugins/admin/fai/class_faiManagement.inc:348
+#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:346
 msgid "This name is already in use."
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:427
-#: plugins/admin/fai/class_faiManagement.inc:583
-#: plugins/admin/fai/faiPackageNew.tpl:50 plugins/admin/users/template.tpl:48
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:431
 #: plugins/admin/departments/class_departmentGeneric.inc:523
 #: plugins/admin/systems/SelectDeviceType.tpl:44
+#: include/sieve/templates/add_element.tpl:11
+#: include/sieve/templates/select_test_type.tpl:11
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -5043,20 +5165,20 @@ msgstr ""
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/default/setup_step3.tpl:18 setup/class_setup.inc:280
 msgid "Continue"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#: plugins/admin/fai/class_faiPackageEntry.inc:30
 msgid "Please enter your search string here"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
+#: plugins/admin/fai/class_faiPackageEntry.inc:43
 msgid ""
 "This list displays all assigned package names for this repository settings."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#: plugins/admin/fai/class_faiPackageEntry.inc:119
 #, php-format
 msgid ""
 "Your specified search string '%s' returned too many results. Only the first "
@@ -5175,8 +5297,8 @@ msgid "Scripts"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_faiProfileEntry.inc:144
+#: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Partition table"
 msgstr ""
 
@@ -5185,7 +5307,7 @@ msgid "Package list"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:170
-#: plugins/admin/systems/class_servRepository.inc:91
+#: plugins/admin/systems/class_servRepository.inc:86
 msgid "You can't use this plugin until FAI is activated."
 msgstr ""
 
@@ -5206,38 +5328,38 @@ msgid "FS options"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:331
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:209
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:204
 msgid "Mount options"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:332
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:208
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:203
 msgid "Size in MB"
 msgstr ""
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:333
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:207
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:202
 msgid "Mount point"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:68
-#: plugins/admin/fai/class_faiHookEntry.inc:71
+#: plugins/admin/fai/class_faiScriptEntry.inc:63
+#: plugins/admin/fai/class_faiHookEntry.inc:66
 msgid "Please select a valid file."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:71
-#: plugins/admin/fai/class_faiHookEntry.inc:74
+#: plugins/admin/fai/class_faiScriptEntry.inc:66
+#: plugins/admin/fai/class_faiHookEntry.inc:69
 msgid "Selected file is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:133
-#: plugins/admin/fai/class_faiVariableEntry.inc:102
-#: plugins/admin/fai/class_faiHookEntry.inc:147
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiScriptEntry.inc:128
+#: plugins/admin/fai/class_faiVariableEntry.inc:97
+#: plugins/admin/fai/class_faiHookEntry.inc:142
+#: plugins/admin/fai/class_faiTemplateEntry.inc:187
 msgid "Please enter a name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:137
+#: plugins/admin/fai/class_faiScriptEntry.inc:132
 msgid "Please enter a script."
 msgstr ""
 
@@ -5266,57 +5388,61 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:352
+#: plugins/admin/fai/class_faiPackage.inc:204
+#, php-format
+msgid "No repository server found that provide this release '%s'."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:343
 msgid "Removing FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:381
+#: plugins/admin/fai/class_faiPackage.inc:372
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:385
+#: plugins/admin/fai/class_faiPackage.inc:376
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:398
+#: plugins/admin/fai/class_faiPackage.inc:389
 #, php-format
 msgid ""
 "Can't insert a fai package list named '%s' in '%s' there is already a "
 "package list with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:420
+#: plugins/admin/fai/class_faiPackage.inc:411
 msgid "package is configured"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:426
+#: plugins/admin/fai/class_faiPackage.inc:417
 msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:451
+#: plugins/admin/fai/class_faiPackage.inc:443
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:515
+#: plugins/admin/fai/class_faiPackage.inc:507
 msgid "Saving FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:560
+#: plugins/admin/fai/class_faiPackage.inc:553
 msgid "Saving FAI package entry failed"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
-#: plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/fai/faiPackage.tpl:33
 #: plugins/admin/systems/workstationStartup.tpl:47
 #: plugins/admin/systems/workstationStartup.tpl:77
-#: plugins/admin/systems/class_servRepository.inc:277
+#: plugins/admin/systems/class_servRepository.inc:280
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 msgid "Release"
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:413
+#: plugins/admin/systems/class_printerPPDDialog.inc:408
 msgid "Section"
 msgstr ""
 
@@ -5332,7 +5458,7 @@ msgstr ""
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:674
 msgid "Configure"
 msgstr ""
 
@@ -5340,86 +5466,88 @@ msgstr ""
 msgid "Toggle remove flag"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:351
+#: plugins/admin/fai/class_faiHook.inc:346
 msgid "Removing FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:387
+#: plugins/admin/fai/class_faiHook.inc:382
 #, php-format
 msgid ""
 "Can't insert a fai hook named '%s' in '%s' there is already a hook with the "
 "given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:420
+#: plugins/admin/fai/class_faiHook.inc:415
 msgid "Saving FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:510
+#: plugins/admin/fai/class_faiHook.inc:505
 msgid "Removing FAI hook failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:516
-#: plugins/admin/fai/class_faiHook.inc:526
+#: plugins/admin/fai/class_faiHook.inc:511
+#: plugins/admin/fai/class_faiHook.inc:521
 msgid "Saving FAI hook failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:296
-#: plugins/admin/fai/class_faiProfileEntry.inc:172
+#: plugins/admin/fai/class_faiProfile.inc:291
+#: plugins/admin/fai/class_faiProfileEntry.inc:167
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:299
-#: plugins/admin/fai/class_faiProfileEntry.inc:139
+#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfileEntry.inc:134
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:300
-#: plugins/admin/fai/class_faiProfileEntry.inc:140
+#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfileEntry.inc:135
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:301
-#: plugins/admin/fai/class_faiProfileEntry.inc:141
+#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfileEntry.inc:136
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:302
-#: plugins/admin/fai/class_faiProfileEntry.inc:142
+#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfileEntry.inc:137
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:298
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:307
+#: plugins/admin/fai/class_faiProfile.inc:302
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:311
-#: plugins/admin/systems/class_servDNSeditZone.inc:290
-#: plugins/admin/ogroups/phonequeue.tpl:18
+#: plugins/admin/fai/class_faiProfile.inc:306
+#: plugins/admin/systems/class_servDNSeditZone.inc:291
+#: plugins/admin/ogroups/phonequeue.tpl:22
+#: include/sieve/templates/object_container.tpl:12
+#: include/sieve/templates/object_container_clear.tpl:12
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:366
+#: plugins/admin/fai/class_faiProfile.inc:361
 msgid "Removing FAI profile failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:406
+#: plugins/admin/fai/class_faiProfile.inc:401
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:410
+#: plugins/admin/fai/class_faiProfile.inc:405
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:425
+#: plugins/admin/fai/class_faiProfile.inc:420
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:464
+#: plugins/admin/fai/class_faiProfile.inc:459
 msgid "Saving FAI profile failed"
 msgstr ""
 
@@ -5427,65 +5555,69 @@ msgstr ""
 msgid "FAI classes"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/paste_fai_object.tpl:1
+msgid "Enter FAI object name"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "primary"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "logical"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:206
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:201
 msgid "FS type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:210
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
 msgid "FS option"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:211
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:206
 msgid "Preserve"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:362
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:372
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:377
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:372
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:381
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:397
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:399
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:394
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:404
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:399
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -5507,71 +5639,29 @@ msgstr ""
 msgid "List of scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:1
-msgid "Repository settings"
+#: plugins/admin/fai/class_faiVariableEntry.inc:93
+msgid "Please specify a value for the attribute 'content'."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:3
+#: plugins/admin/fai/faiNewBranch.tpl:5
 msgid ""
-"To add packages to your package list you have to setup the repository "
-"settings first."
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:5
+#: plugins/admin/fai/faiNewBranch.tpl:7
 msgid ""
-"Packages are usually stored on different servers called mirrors. These "
-"mirrors have different types of releases (for example woody/sarge/etch), "
-"which finally contain packages sorted by section."
+"Branches are created as subreleases of the currently selected branch. "
+"Creating a new branch named 1.0.2 in SARGE for example, will result in a new "
+"release called SARGE/1.0.2."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:8
-msgid ""
-"Section and release can't be changed in future dialogs, but the mirror can "
-"be changed by editing the entry."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:14
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:26
-msgid "please choose a release..."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:31 plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/servdnseditzone.tpl:67
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:37
-msgid "Sections for this release"
-msgstr ""
-
-#: plugins/admin/fai/class_faiVariableEntry.inc:98
-msgid "Please specify a value for the attribute 'content'."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:7
-msgid ""
-"Branches are created as subreleases of the currently selected branch. "
-"Creating a new branch named 1.0.2 in SARGE for example, will result in a new "
-"release called SARGE/1.0.2."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:13
-msgid "Please enter a name for the branch"
+#: plugins/admin/fai/faiNewBranch.tpl:13
+msgid "Please enter a name for the branch"
 msgstr ""
 
 #: plugins/admin/fai/faiNewBranch.tpl:35
@@ -5705,7 +5795,7 @@ msgid "New profile"
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:224
 msgid "P"
 msgstr ""
 
@@ -5758,34 +5848,34 @@ msgid "PK"
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:206
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:131
-#: plugins/admin/applications/class_divListApplication.inc:142
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/applications/class_divListApplication.inc:147
+#: plugins/admin/ogroups/class_divListOGroup.inc:137
 msgid "cut"
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:206
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:131
-#: plugins/admin/applications/class_divListApplication.inc:142
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/applications/class_divListApplication.inc:147
+#: plugins/admin/ogroups/class_divListOGroup.inc:137
 msgid "Cut this entry"
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:209
-#: plugins/admin/groups/class_divListGroup.inc:142
-#: plugins/admin/users/class_divListUsers.inc:133
-#: plugins/admin/applications/class_divListApplication.inc:145
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
+#: plugins/admin/groups/class_divListGroup.inc:154
+#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/applications/class_divListApplication.inc:151
+#: plugins/admin/ogroups/class_divListOGroup.inc:139
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:209
-#: plugins/admin/groups/class_divListGroup.inc:142
-#: plugins/admin/users/class_divListUsers.inc:133
-#: plugins/admin/applications/class_divListApplication.inc:145
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
+#: plugins/admin/groups/class_divListGroup.inc:154
+#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/applications/class_divListApplication.inc:151
+#: plugins/admin/ogroups/class_divListOGroup.inc:139
 msgid "Copy this entry"
 msgstr ""
 
@@ -5802,35 +5892,35 @@ msgstr ""
 msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:275
-#: plugins/admin/fai/class_faiPartitionTable.inc:281
+#: plugins/admin/fai/class_faiPartitionTable.inc:271
+#: plugins/admin/fai/class_faiPartitionTable.inc:277
 #, php-format
 msgid "%s partition"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:277
-#: plugins/admin/fai/class_faiPartitionTable.inc:283
+#: plugins/admin/fai/class_faiPartitionTable.inc:273
+#: plugins/admin/fai/class_faiPartitionTable.inc:279
 #, php-format
 msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:335
+#: plugins/admin/fai/class_faiPartitionTable.inc:331
 #, php-format
 msgid ""
 "Can't insert a new fai partition table named '%s' in '%s' there is already "
 "one defined with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:372
+#: plugins/admin/fai/class_faiPartitionTable.inc:368
 msgid "Saving FAI partition table base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:419
+#: plugins/admin/fai/class_faiPartitionTable.inc:415
 msgid "Removing FAI partition table failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:427
-#: plugins/admin/fai/class_faiPartitionTable.inc:436
+#: plugins/admin/fai/class_faiPartitionTable.inc:423
+#: plugins/admin/fai/class_faiPartitionTable.inc:432
 msgid "Saving FAI partition table failed"
 msgstr ""
 
@@ -5838,20 +5928,20 @@ msgstr ""
 msgid "Removing FAI partition table entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:526
-#: plugins/admin/fai/class_faiPartitionTable.inc:537
+#: plugins/admin/fai/class_faiPartitionTable.inc:535
+#: plugins/admin/fai/class_faiPartitionTable.inc:549
 msgid "Saving FAI partition table entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHookEntry.inc:143
+#: plugins/admin/fai/class_faiHookEntry.inc:138
 msgid "Please enter a value for script."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:143
+#: plugins/admin/fai/class_faiProfileEntry.inc:138
 msgid "Package bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:174
+#: plugins/admin/fai/class_faiProfileEntry.inc:169
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr ""
@@ -5868,68 +5958,72 @@ msgstr ""
 msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:40
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:285
+#: plugins/admin/fai/class_faiVariable.inc:280
 #, php-format
 msgid ""
 "Can't insert a fai variable named '%s' in '%s' there is already a variable "
 "with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:318
+#: plugins/admin/fai/class_faiVariable.inc:313
 msgid "Saving FAI variable base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:384
+#: plugins/admin/fai/class_faiVariable.inc:379
 msgid "Removing FAI variable failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:391
-#: plugins/admin/fai/class_faiVariable.inc:403
+#: plugins/admin/fai/class_faiVariable.inc:386
+#: plugins/admin/fai/class_faiVariable.inc:398
 msgid "Saving FAI variable failed"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:81
+#: plugins/admin/fai/class_askClassName.inc:76
 msgid "Create new FAI object - partition table."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:82
+#: plugins/admin/fai/class_askClassName.inc:77
 msgid "Create new FAI object - package bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:83
+#: plugins/admin/fai/class_askClassName.inc:78
 msgid "Create new FAI object - script bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:84
+#: plugins/admin/fai/class_askClassName.inc:79
 msgid "Create new FAI object - variable bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:85
+#: plugins/admin/fai/class_askClassName.inc:80
 msgid "Create new FAI object - hook bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:86
+#: plugins/admin/fai/class_askClassName.inc:81
 msgid "Create new FAI object - profile."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:87
+#: plugins/admin/fai/class_askClassName.inc:82
 msgid "Create new FAI object - template."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:88
+#: plugins/admin/fai/class_askClassName.inc:83
 msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:142
+#: plugins/admin/fai/class_askClassName.inc:139
+msgid "Spaces are not allowed within class names."
+msgstr ""
+
+#: plugins/admin/fai/class_askClassName.inc:143
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:146
+#: plugins/admin/fai/class_askClassName.inc:147
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -5962,8 +6056,8 @@ msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #: plugins/admin/systems/glpiDeviceManagement.tpl:51
-#: plugins/admin/systems/class_glpiSelectUser.inc:113
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/class_glpiSelectUser.inc:108
+#: plugins/admin/systems/class_glpiSelectUser.inc:135
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
@@ -5981,36 +6075,36 @@ msgid ""
 "to get your data back."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:88
+#: plugins/admin/fai/class_faiTemplateEntry.inc:83
 msgid "no file uploaded yet"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:93
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:184
+#: plugins/admin/fai/class_faiTemplateEntry.inc:179
 msgid "Please specify a value for attribute 'file'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:188
+#: plugins/admin/fai/class_faiTemplateEntry.inc:183
 msgid "Please specify a value for attribute 'path'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:196
+#: plugins/admin/fai/class_faiTemplateEntry.inc:191
 msgid "Please enter a user."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:199
+#: plugins/admin/fai/class_faiTemplateEntry.inc:194
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:203
+#: plugins/admin/fai/class_faiTemplateEntry.inc:198
 msgid "Please enter a group."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:206
+#: plugins/admin/fai/class_faiTemplateEntry.inc:201
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr ""
 
@@ -6045,9 +6139,9 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:832
-#: plugins/admin/systems/class_printGeneric.inc:834
-#: plugins/admin/ogroups/class_ogroupManagement.inc:340
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
@@ -6057,7 +6151,7 @@ msgid "Access"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
-#: plugins/admin/systems/class_servDNS.inc:161
+#: plugins/admin/systems/class_servDNS.inc:164
 msgid "Class"
 msgstr ""
 
@@ -6097,10 +6191,6 @@ msgstr ""
 msgid "sticky"
 msgstr ""
 
-#: plugins/admin/fai/paste_fai_object.tpl:1
-msgid "Enter FAI object name"
-msgstr ""
-
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr ""
@@ -6160,90 +6250,100 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:244
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/ogroups/class_ogroupManagement.inc:137
+msgid "You are not allowed to execute this method!"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:261
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:250
-#: plugins/admin/groups/class_groupManagement.inc:281
+#: plugins/admin/groups/class_groupManagement.inc:267
+#: plugins/admin/groups/class_groupManagement.inc:298
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:125
+#: plugins/admin/groups/class_groupGeneric.inc:132
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:181
+#: plugins/admin/groups/class_groupGeneric.inc:188
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:321
+#: plugins/admin/groups/class_groupGeneric.inc:328
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:321
+#: plugins/admin/groups/class_groupGeneric.inc:328
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:321
+#: plugins/admin/groups/class_groupGeneric.inc:328
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:322
+#: plugins/admin/groups/class_groupGeneric.inc:329
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:334
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:439
+#: plugins/admin/groups/class_groupGeneric.inc:447
 msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:480
+#: plugins/admin/groups/class_groupGeneric.inc:489
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:509
+#: plugins/admin/groups/class_groupGeneric.inc:518
 msgid "Removing group failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:616
+#: plugins/admin/groups/class_groupGeneric.inc:625
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:621
+#: plugins/admin/groups/class_groupGeneric.inc:630
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:706
+#: plugins/admin/groups/class_groupGeneric.inc:727
 msgid "Saving group failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:735
-#: plugins/admin/ogroups/class_ogroup.inc:613
+#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:612
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:766
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:757
-#: plugins/admin/groups/class_groupGeneric.inc:771
-#: plugins/admin/groups/class_groupGeneric.inc:778
+#: plugins/admin/groups/class_groupGeneric.inc:777
+#: plugins/admin/groups/class_groupGeneric.inc:791
+#: plugins/admin/groups/class_groupGeneric.inc:798
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
+#: plugins/admin/groups/class_groupGeneric.inc:852
+msgid "Too many groups, can't allocate a free ID!"
+msgstr ""
+
 #: plugins/admin/groups/class_divListGroup.inc:35
 #: plugins/admin/groups/class_divListGroup.inc:36
 msgid "List of groups"
@@ -6305,30 +6405,30 @@ msgid "Create new group"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:154
+#: plugins/admin/users/class_divListUsers.inc:139
 msgid "Posix"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:127
 #: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/ogroups/class_ogroupManagement.inc:341
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:148
-#: plugins/admin/departments/class_divListDepartment.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:129
+#: plugins/admin/groups/class_divListGroup.inc:157
+#: plugins/admin/applications/class_divListApplication.inc:156
+#: plugins/admin/departments/class_divListDepartment.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:142
 #: plugins/gofon/conference/class_divListConferences.inc:94
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:153
-#: plugins/admin/departments/class_divListDepartment.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:131
+#: plugins/admin/groups/class_divListGroup.inc:161
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/gofon/conference/class_divListConferences.inc:96
 #: plugins/gofon/conference/class_divListConferences.inc:98
 msgid "Delete this entry"
@@ -6357,66 +6457,78 @@ msgstr ""
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:292
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:293
+#: plugins/admin/groups/class_groupMail.inc:288
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:294
+#: plugins/admin/groups/class_groupMail.inc:289
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:295
+#: plugins/admin/groups/class_groupMail.inc:290
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:296
+#: plugins/admin/groups/class_groupMail.inc:291
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:322
+#: plugins/admin/groups/class_groupMail.inc:292
+msgid "admin"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:293
+#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:388
+#: plugins/admin/systems/class_SelectDeviceType.inc:24
+#: plugins/admin/ogroups/class_ogroup.inc:281
+msgid "none"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:325
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:346
+#: plugins/admin/groups/class_groupMail.inc:349
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:347
+#: plugins/admin/groups/class_groupMail.inc:350
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:402
+#: plugins/admin/groups/class_groupMail.inc:405
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:403
+#: plugins/admin/groups/class_groupMail.inc:406
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:639
+#: plugins/admin/groups/class_groupMail.inc:642
 msgid "Removing group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:813
+#: plugins/admin/groups/class_groupMail.inc:830
 msgid "Saving group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:842
+#: plugins/admin/groups/class_groupMail.inc:859
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:875
+#: plugins/admin/groups/class_groupMail.inc:892
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:879
+#: plugins/admin/groups/class_groupMail.inc:896
 msgid "Please select a valid mail server."
 msgstr ""
 
@@ -6500,138 +6612,142 @@ msgstr ""
 msgid "Group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:57
+#: plugins/admin/groups/class_groupAcl.inc:52
 msgid "You have no permissions to view and edit ACLs."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:68
+#: plugins/admin/groups/class_groupAcl.inc:63
 msgid "This 'dn' is no acl container."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:109
+#: plugins/admin/groups/class_groupAcl.inc:104
 msgid "Removing ACL information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:212
+#: plugins/admin/groups/class_groupAcl.inc:207
 msgid "Saving ACL information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:222
+#: plugins/admin/groups/class_groupAcl.inc:217
 msgid "All fields are writeable"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:395
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:398
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:403
+#: plugins/admin/groups/class_groupApplication.inc:406
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:404
+#: plugins/admin/groups/class_groupApplication.inc:407
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:406
+#: plugins/admin/groups/class_groupApplication.inc:409
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:407
+#: plugins/admin/groups/class_groupApplication.inc:410
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:419
+#: plugins/admin/groups/class_groupApplication.inc:422
 msgid "Invalid character in category name."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:427
+#: plugins/admin/groups/class_groupApplication.inc:430
 msgid "The specified category already exists."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:522
+#: plugins/admin/groups/class_groupApplication.inc:525
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:558
+#: plugins/admin/groups/class_groupApplication.inc:561
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:643
-#: plugins/admin/departments/class_divListDepartment.inc:109
+#: plugins/admin/groups/class_groupApplication.inc:646
+#: plugins/admin/departments/class_divListDepartment.inc:118
 msgid "department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:651
+#: plugins/admin/groups/class_groupApplication.inc:654
 msgid "application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/groups/class_groupApplication.inc:718
+#: plugins/admin/groups/class_groupApplication.inc:685
+#: plugins/admin/groups/class_groupApplication.inc:721
 msgid "Delete entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:686
-#: plugins/admin/groups/class_groupApplication.inc:716
+#: plugins/admin/groups/class_groupApplication.inc:689
+#: plugins/admin/groups/class_groupApplication.inc:719
+#: include/sieve/templates/object_container.tpl:9
+#: include/sieve/templates/object_container_clear.tpl:9
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:687
-#: plugins/admin/groups/class_groupApplication.inc:717
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
+#: include/sieve/templates/object_container.tpl:13
+#: include/sieve/templates/object_container_clear.tpl:13
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:714
+#: plugins/admin/groups/class_groupApplication.inc:717
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:742
+#: plugins/admin/groups/class_groupApplication.inc:745
 msgid "This application is no longer available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:745
+#: plugins/admin/groups/class_groupApplication.inc:748
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:749
+#: plugins/admin/groups/class_groupApplication.inc:752
 msgid "Check parameter"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:751
+#: plugins/admin/groups/class_groupApplication.inc:754
 msgid "This application has changed parameters."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:843
+#: plugins/admin/groups/class_groupApplication.inc:846
 msgid "Removing application information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:888
+#: plugins/admin/groups/class_groupApplication.inc:891
 msgid "Saving application information failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:931
+#: plugins/admin/groups/class_groupApplication.inc:934
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr ""
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6647,35 +6763,28 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:28
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/systems/printer.tpl:71 html/getxls.php:68 html/getxls.php:70
+#: plugins/admin/systems/class_glpiSelectUser.inc:107
+#: plugins/admin/systems/printer.tpl:72 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:204
-#: plugins/admin/users/class_userManagement.inc:280
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:297
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:319
+#: plugins/admin/users/class_userManagement.inc:336
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:342
+#: plugins/admin/users/class_userManagement.inc:369
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:458
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:281
-msgid "none"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:536
+#: plugins/admin/users/class_userManagement.inc:553
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -6715,7 +6824,7 @@ msgstr ""
 #: plugins/admin/users/class_divListUsers.inc:50
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr ""
@@ -6781,65 +6890,57 @@ msgid "New template"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:137
-msgid "password"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:152
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:153
+#: plugins/admin/users/class_divListUsers.inc:138
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:155
+#: plugins/admin/users/class_divListUsers.inc:140
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:157
+#: plugins/admin/users/class_divListUsers.inc:142
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:159
+#: plugins/admin/users/class_divListUsers.inc:144
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:161
+#: plugins/admin/users/class_divListUsers.inc:146
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:163
+#: plugins/admin/users/class_divListUsers.inc:148
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/users/class_divListUsers.inc:150
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:167
+#: plugins/admin/users/class_divListUsers.inc:152
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:153
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:169
+#: plugins/admin/users/class_divListUsers.inc:154
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:222
-msgid "Online"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:229
-msgid "Offline"
+#: plugins/admin/users/class_divListUsers.inc:189
+msgid "password"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_divListApplication.inc:44
-#: plugins/admin/applications/class_applicationGeneric.inc:473
+#: plugins/admin/applications/class_applicationGeneric.inc:468
 msgid "Application name"
 msgstr ""
 
@@ -6849,7 +6950,7 @@ msgid "Display name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/applications/class_applicationGeneric.inc:473
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
@@ -6917,19 +7018,19 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:54
+#: plugins/admin/applications/class_applicationParameters.inc:51
 msgid "Remove options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:55
+#: plugins/admin/applications/class_applicationParameters.inc:52
 msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:57
+#: plugins/admin/applications/class_applicationParameters.inc:54
 msgid "Create options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:58
+#: plugins/admin/applications/class_applicationParameters.inc:55
 msgid ""
 "This application has options disabled. You can enable them by clicking below."
 msgstr ""
@@ -6951,12 +7052,12 @@ msgstr ""
 msgid "Removing application parameters failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:170
+#: plugins/admin/applications/class_applicationParameters.inc:172
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:201
+#: plugins/admin/applications/class_applicationParameters.inc:203
 msgid "Saving applications parameters failed"
 msgstr ""
 
@@ -6971,62 +7072,62 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:96
+#: plugins/admin/applications/class_applicationGeneric.inc:91
 msgid "no example"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:128
+#: plugins/admin/applications/class_applicationGeneric.inc:123
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:206
 msgid "Removing application failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:223
+#: plugins/admin/applications/class_applicationGeneric.inc:218
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:230
+#: plugins/admin/applications/class_applicationGeneric.inc:225
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:272
+#: plugins/admin/applications/class_applicationGeneric.inc:267
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:348
+#: plugins/admin/applications/class_applicationGeneric.inc:343
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:362
+#: plugins/admin/applications/class_applicationGeneric.inc:357
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:367
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:371
+#: plugins/admin/applications/class_applicationGeneric.inc:366
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:375
+#: plugins/admin/applications/class_applicationGeneric.inc:370
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:390
-#: plugins/admin/applications/class_applicationGeneric.inc:398
+#: plugins/admin/applications/class_applicationGeneric.inc:385
+#: plugins/admin/applications/class_applicationGeneric.inc:393
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:444
+#: plugins/admin/applications/class_applicationGeneric.inc:439
 msgid "Saving application failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:469
+#: plugins/admin/applications/class_applicationGeneric.inc:464
 msgid "Application settings"
 msgstr ""
 
@@ -7040,13 +7141,6 @@ msgstr ""
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -7056,7 +7150,7 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:69
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -7069,7 +7163,7 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:127
+#: plugins/gofon/conference/generic.tpl:135
 msgid "Choose subtree to place department in"
 msgstr ""
 
@@ -7121,6 +7215,13 @@ msgstr ""
 msgid "Create new department"
 msgstr ""
 
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
+
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
 msgid ""
@@ -7180,23 +7281,23 @@ msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/class_glpiSelectUser.inc:107
 #: plugins/admin/ogroups/class_divListOGroup.inc:52
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:158
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
+#: plugins/admin/departments/class_departmentManagement.inc:153
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:128
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:179
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
+#: plugins/admin/departments/class_departmentManagement.inc:174
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:147
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:338
+#: plugins/admin/departments/class_departmentManagement.inc:333
 msgid ".."
 msgstr ""
 
@@ -7216,64 +7317,70 @@ msgstr ""
 msgid "Autodetect"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:41
+#: plugins/admin/systems/network.tpl:42
 msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:50
+#: plugins/admin/systems/network.tpl:43
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:76
+msgid "Refresh"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:51
 msgid "Zone"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/network.tpl:59
 #: plugins/admin/systems/servdnseditzone.tpl:85
-#: plugins/admin/systems/class_servDNS.inc:160
+#: plugins/admin/systems/class_servDNS.inc:163
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:63
+#: plugins/admin/systems/network.tpl:64
 msgid "Dns records"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
+#: plugins/admin/systems/class_terminalInfo.inc:49
+#: plugins/admin/systems/class_terminalInfo.inc:194
 msgid "present"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_workstationService.inc:252
-#: plugins/admin/systems/class_workstationStartup.inc:517
-#: plugins/admin/systems/class_terminalService.inc:260
-#: plugins/admin/systems/class_terminalStartup.inc:165
-#: plugins/admin/systems/class_terminalGeneric.inc:240
+#: plugins/admin/systems/class_terminalInfo.inc:62
+#: plugins/admin/systems/class_workstationService.inc:247
+#: plugins/admin/systems/class_workstationStartup.inc:514
+#: plugins/admin/systems/class_terminalService.inc:255
+#: plugins/admin/systems/class_terminalStartup.inc:168
+#: plugins/admin/systems/class_terminalGeneric.inc:236
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
+#: plugins/admin/systems/class_terminalInfo.inc:69
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
+#: plugins/admin/systems/class_terminalInfo.inc:75
+#: plugins/admin/systems/class_terminalInfo.inc:169
 msgid "unknown status"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:84
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
+#: plugins/admin/systems/class_terminalInfo.inc:102
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
+#: plugins/admin/systems/class_terminalInfo.inc:158
 msgid "running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
+#: plugins/admin/systems/class_terminalInfo.inc:161
 msgid "not running"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
+#: plugins/admin/systems/class_terminalInfo.inc:186
 msgid "offline"
 msgstr ""
 
@@ -7336,6 +7443,53 @@ msgstr ""
 msgid "Installed cartridges"
 msgstr ""
 
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#: include/sieve/templates/object_container.tpl:23
+#: include/sieve/templates/element_comment.tpl:4
+#: include/sieve/class_sieveManagement.inc:507
+#: include/sieve/class_sieveManagement.inc:727
+msgid "Comment"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr ""
+
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
 msgstr ""
@@ -7434,49 +7588,6 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-msgid "Comment"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
-msgstr ""
-
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr ""
@@ -7490,9 +7601,8 @@ msgid "Terminal name"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
-#: plugins/admin/systems/workstation.tpl:25
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:25 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/printer.tpl:22
 #: plugins/admin/systems/wingeneric.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr ""
@@ -7557,7 +7667,7 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:118 plugins/admin/systems/server.tpl:51
 #: plugins/admin/systems/workstation.tpl:97
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:158
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
 #: plugins/admin/ogroups/termgroup.tpl:75
 msgid "Action"
@@ -7597,113 +7707,113 @@ msgstr ""
 msgid "Please enter a new name"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/class_workstationService.inc:87
 #: plugins/admin/systems/workstationService.tpl:121
-#: plugins/admin/systems/class_terminalService.inc:70
+#: plugins/admin/systems/class_terminalService.inc:65
 msgid "unknown"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/class_workstationService.inc:93
+#: plugins/admin/systems/class_terminalService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:99
+#: plugins/admin/systems/class_terminalService.inc:100
 msgid "bit"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:138
-#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:133
+#: plugins/admin/systems/class_terminalService.inc:152
 msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:139
-#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_workstationService.inc:134
+#: plugins/admin/systems/class_terminalService.inc:153
 msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:142
-#: plugins/admin/systems/class_terminalService.inc:161
+#: plugins/admin/systems/class_workstationService.inc:137
+#: plugins/admin/systems/class_terminalService.inc:156
 msgid "load balanced"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:145
-#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:140
+#: plugins/admin/systems/class_terminalService.inc:159
 msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:146
-#: plugins/admin/systems/class_terminalService.inc:165
+#: plugins/admin/systems/class_workstationService.inc:141
+#: plugins/admin/systems/class_terminalService.inc:160
 msgid "ICA client"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:201
-#: plugins/admin/systems/class_workstationService.inc:204
-#: plugins/admin/systems/class_workstationService.inc:207
-#: plugins/admin/systems/class_workstationService.inc:210
-#: plugins/admin/systems/class_workstationService.inc:213
-#: plugins/admin/systems/class_workstationService.inc:216
-#: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationService.inc:196
+#: plugins/admin/systems/class_workstationService.inc:199
+#: plugins/admin/systems/class_workstationService.inc:202
+#: plugins/admin/systems/class_workstationService.inc:205
+#: plugins/admin/systems/class_workstationService.inc:208
+#: plugins/admin/systems/class_workstationService.inc:211
+#: plugins/admin/systems/class_workstationService.inc:214
+#: plugins/admin/systems/class_workstationService.inc:224
+#: plugins/admin/systems/class_workstationService.inc:225
+#: plugins/admin/systems/class_workstationService.inc:226
+#: plugins/admin/systems/class_workstationService.inc:227
+#: plugins/admin/systems/class_workstationService.inc:228
 #: plugins/admin/systems/class_workstationService.inc:229
 #: plugins/admin/systems/class_workstationService.inc:230
-#: plugins/admin/systems/class_workstationService.inc:231
-#: plugins/admin/systems/class_workstationService.inc:232
-#: plugins/admin/systems/class_workstationService.inc:233
-#: plugins/admin/systems/class_workstationService.inc:234
-#: plugins/admin/systems/class_workstationService.inc:235
-#: plugins/admin/systems/class_workstationStartup.inc:323
-#: plugins/admin/systems/class_workstationStartup.inc:327
-#: plugins/admin/systems/class_workstationStartup.inc:829
-#: plugins/admin/systems/class_workstationGeneric.inc:125
-#: plugins/admin/systems/class_terminalService.inc:73
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:118
-#: plugins/admin/systems/class_terminalService.inc:120
-#: plugins/admin/systems/class_terminalService.inc:124
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
-#: plugins/admin/systems/class_terminalService.inc:235
-#: plugins/admin/systems/class_terminalStartup.inc:122
+#: plugins/admin/systems/class_workstationStartup.inc:320
+#: plugins/admin/systems/class_workstationStartup.inc:324
+#: plugins/admin/systems/class_workstationStartup.inc:828
+#: plugins/admin/systems/class_workstationGeneric.inc:123
+#: plugins/admin/systems/class_terminalService.inc:68
+#: plugins/admin/systems/class_terminalService.inc:96
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:112
+#: plugins/admin/systems/class_terminalService.inc:113
+#: plugins/admin/systems/class_terminalService.inc:115
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:212
+#: plugins/admin/systems/class_terminalService.inc:215
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalStartup.inc:119
+#: plugins/admin/systems/class_terminalStartup.inc:139
 #: plugins/admin/systems/class_terminalStartup.inc:142
-#: plugins/admin/systems/class_terminalStartup.inc:145
-#: plugins/admin/systems/class_terminalGeneric.inc:121
-#: plugins/admin/systems/class_terminalGeneric.inc:290
+#: plugins/admin/systems/class_terminalGeneric.inc:116
+#: plugins/admin/systems/class_terminalGeneric.inc:287
 msgid "inherited"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:204
-#: plugins/admin/systems/class_terminalService.inc:220
+#: plugins/admin/systems/class_workstationService.inc:199
+#: plugins/admin/systems/class_terminalService.inc:215
 msgid "Bit"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:302
-#: plugins/admin/systems/class_terminalService.inc:311
+#: plugins/admin/systems/class_workstationService.inc:297
+#: plugins/admin/systems/class_terminalService.inc:306
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
+#: plugins/admin/systems/class_workstationService.inc:365
 #: plugins/admin/systems/class_workstationService.inc:370
-#: plugins/admin/systems/class_workstationService.inc:375
+#: plugins/admin/systems/class_terminalService.inc:390
 #: plugins/admin/systems/class_terminalService.inc:395
-#: plugins/admin/systems/class_terminalService.inc:400
 msgid "Please specify a valid VSync range."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationService.inc:380
 #: plugins/admin/systems/class_workstationService.inc:385
-#: plugins/admin/systems/class_workstationService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:405
 #: plugins/admin/systems/class_terminalService.inc:410
-#: plugins/admin/systems/class_terminalService.inc:415
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:433
+#: plugins/admin/systems/class_workstationService.inc:428
 msgid "Saving workstation services failed"
 msgstr ""
 
@@ -7850,42 +7960,42 @@ msgstr ""
 msgid "Provide scan services"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:348
-#: plugins/admin/systems/class_terminalStartup.inc:91
+#: plugins/admin/systems/class_workstationStartup.inc:345
+#: plugins/admin/systems/class_terminalStartup.inc:88
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
 "exist."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:452
+#: plugins/admin/systems/class_workstationStartup.inc:449
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:497
+#: plugins/admin/systems/class_workstationStartup.inc:494
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:557
+#: plugins/admin/systems/class_workstationStartup.inc:554
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:749
+#: plugins/admin/systems/class_workstationStartup.inc:748
 msgid "Not available in current setup"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:901
+#: plugins/admin/systems/class_workstationStartup.inc:900
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:914
+#: plugins/admin/systems/class_workstationStartup.inc:913
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -7893,118 +8003,122 @@ msgid ""
 "reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1085
+#: plugins/admin/systems/class_workstationStartup.inc:1084
 msgid "Saving workstation startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1135
+#: plugins/admin/systems/class_workstationStartup.inc:1134
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1137
-#: plugins/admin/systems/class_servRepositorySetup.inc:189
+#: plugins/admin/systems/class_workstationStartup.inc:1136
+#: plugins/admin/systems/class_servRepositorySetup.inc:184
 #, php-format
 msgid ""
 "The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
 "empty string."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:62
+#: plugins/admin/systems/class_printerPPDDialog.inc:57
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:87
+#: plugins/admin/systems/class_printerPPDDialog.inc:82
 msgid "Can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:99
+#: plugins/admin/systems/class_printerPPDDialog.inc:94
 #, php-format
 msgid ""
 "The specified path '%s' which results from PPD_PATH in your gosa.conf is "
 "invalid, can't read/write any ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:116
+#: plugins/admin/systems/class_printerPPDDialog.inc:111
 msgid "Please specify a valid ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:186
+#: plugins/admin/systems/class_printerPPDDialog.inc:181
 #, php-format
 msgid "Can't select PPD file '%s', the file is not readable"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:203
-#: plugins/admin/systems/class_printerPPDDialog.inc:275
+#: plugins/admin/systems/class_printerPPDDialog.inc:198
+#: plugins/admin/systems/class_printerPPDDialog.inc:270
 #, php-format
 msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:211
+#: plugins/admin/systems/class_printerPPDDialog.inc:206
 #, php-format
 msgid "Can't create file '%s' to store modifed ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:235
+#: plugins/admin/systems/class_printerPPDDialog.inc:230
 #, php-format
 msgid "Can't add new ppd file, the source file '%s' is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:253
+#: plugins/admin/systems/class_printerPPDDialog.inc:248
 #, php-format
 msgid ""
 "The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
 "informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:267
+#: plugins/admin/systems/class_printerPPDDialog.inc:262
 #, php-format
 msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:288
+#: plugins/admin/systems/class_printerPPDDialog.inc:283
 #, php-format
 msgid "Can't save file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:292
+#: plugins/admin/systems/class_printerPPDDialog.inc:287
 msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:462
-#: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/systems/class_printerPPDDialog.inc:461
+#: plugins/admin/systems/class_printerPPDDialog.inc:464
+#: include/sieve/class_sieveElement_If.inc:915
+#: include/sieve/class_sieveManagement.inc:609
 msgid "True"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:463
-#: plugins/admin/systems/class_printerPPDDialog.inc:466
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: include/sieve/class_sieveElement_If.inc:915
+#: include/sieve/class_sieveManagement.inc:610
 msgid "False"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:471
+#: plugins/admin/systems/class_printerPPDDialog.inc:470
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#: plugins/admin/systems/class_printerPPDDialog.inc:487
 #, php-format
 msgid "Removing old ppd file '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#: plugins/admin/systems/class_printerPPDDialog.inc:490
 #, php-format
 msgid "Removing old ppd file '%s' failed. File is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#: plugins/admin/systems/class_printerPPDDialog.inc:493
 #, php-format
 msgid ""
 "Removing old ppd file '%s' failed. File does not exists or is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:502
+#: plugins/admin/systems/class_printerPPDDialog.inc:501
 msgid ""
 "Please select a valid ppd file or use 'Cancel' to go back to printer "
 "configuration."
@@ -8073,7 +8187,7 @@ msgstr ""
 msgid "Add additional modules to load on startup"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:145
+#: plugins/admin/systems/workstationStartup.tpl:146
 #: plugins/admin/systems/terminalStartup.tpl:79
 msgid "Mountpoint"
 msgstr ""
@@ -8095,65 +8209,65 @@ msgstr ""
 msgid "Regular expression for matching device names"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-#: plugins/admin/systems/class_glpiAccount.inc:144
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:151
+#: plugins/admin/systems/class_glpiAccount.inc:139
 msgid "There is no server with valid glpi database service."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-#: plugins/admin/systems/class_glpiAccount.inc:154
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:161
+#: plugins/admin/systems/class_glpiAccount.inc:149
 msgid "Can't connect to glpi database, the php-mysql extension is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-#: plugins/admin/systems/class_glpiAccount.inc:164
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:171
+#: plugins/admin/systems/class_glpiAccount.inc:159
 msgid "Can't connect to glpi database, check configuration twice."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/class_glpiAccount.inc:569
 msgid "Remove inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:204
 msgid ""
 "This server has inventory features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:206
+#: plugins/admin/systems/class_glpiAccount.inc:572
 msgid "Add inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:207
 msgid ""
 "This server has inventory features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:230
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:268
 #, php-format
 msgid ""
 "Can't rename given printer type to '%s', because this type name already "
 "exists."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:282
 #, php-format
 msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
-#: plugins/admin/systems/class_glpiAccount.inc:633
-#: plugins/admin/systems/class_glpiAccount.inc:648
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:615
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:630
+#: plugins/admin/systems/class_glpiAccount.inc:637
+#: plugins/admin/systems/class_glpiAccount.inc:652
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:285
 msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:755
 msgid "since"
 msgstr ""
 
@@ -8162,133 +8276,140 @@ msgstr ""
 msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:109
-#: plugins/admin/systems/class_servGeneric.inc:51
+#: plugins/admin/systems/class_workstationGeneric.inc:107
+#: plugins/admin/systems/class_servGeneric.inc:47
 #: plugins/admin/ogroups/class_termgroup.inc:47
 msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:147
-#: plugins/admin/systems/class_servGeneric.inc:83
+#: plugins/admin/systems/class_workstationGeneric.inc:146
+#: plugins/admin/systems/class_servGeneric.inc:81
 #: plugins/admin/ogroups/class_termgroup.inc:212
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:151
-#: plugins/admin/systems/class_terminalGeneric.inc:181
-#: plugins/admin/systems/class_terminalGeneric.inc:193
-#: plugins/admin/systems/class_terminalGeneric.inc:205
-#: plugins/admin/systems/class_servGeneric.inc:88
+#: plugins/admin/systems/class_workstationGeneric.inc:150
+#: plugins/admin/systems/class_terminalGeneric.inc:177
+#: plugins/admin/systems/class_terminalGeneric.inc:189
+#: plugins/admin/systems/class_terminalGeneric.inc:201
+#: plugins/admin/systems/class_servGeneric.inc:86
 #: plugins/admin/ogroups/class_termgroup.inc:216
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:192
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:248
-#: plugins/admin/systems/class_terminalGeneric.inc:272
-#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/systems/class_servGeneric.inc:170
 #: plugins/admin/ogroups/class_termgroup.inc:262
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:248
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_terminalGeneric.inc:270
+#: plugins/admin/systems/class_servGeneric.inc:170
 #: plugins/admin/ogroups/class_termgroup.inc:263
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:249
-#: plugins/admin/systems/class_servGeneric.inc:173
+#: plugins/admin/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_servGeneric.inc:171
 #: plugins/admin/ogroups/class_termgroup.inc:264
 msgid "Instant update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:250
-#: plugins/admin/systems/class_workstationGeneric.inc:258
-#: plugins/admin/systems/class_servGeneric.inc:174
-#: plugins/admin/systems/class_servGeneric.inc:182
+#: plugins/admin/systems/class_workstationGeneric.inc:253
+#: plugins/admin/systems/class_workstationGeneric.inc:262
+#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/systems/class_servGeneric.inc:181
 #: plugins/admin/ogroups/class_termgroup.inc:265
 msgid "Scheduled update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:251
-#: plugins/admin/systems/class_workstationGeneric.inc:257
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_servGeneric.inc:181
+#: plugins/admin/systems/class_workstationGeneric.inc:254
+#: plugins/admin/systems/class_workstationGeneric.inc:261
+#: plugins/admin/systems/class_servGeneric.inc:173
+#: plugins/admin/systems/class_servGeneric.inc:180
 #: plugins/admin/ogroups/class_termgroup.inc:266
 msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:252
-#: plugins/admin/systems/class_servGeneric.inc:176
+#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/systems/class_servGeneric.inc:174
 #: plugins/admin/ogroups/class_termgroup.inc:267
 msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:253
-#: plugins/admin/systems/class_workstationGeneric.inc:259
-#: plugins/admin/systems/class_terminalGeneric.inc:274
-#: plugins/admin/systems/class_terminalGeneric.inc:278
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:183
+#: plugins/admin/systems/class_workstationGeneric.inc:256
+#: plugins/admin/systems/class_workstationGeneric.inc:263
+#: plugins/admin/systems/class_terminalGeneric.inc:271
+#: plugins/admin/systems/class_terminalGeneric.inc:275
+#: plugins/admin/systems/class_servGeneric.inc:175
+#: plugins/admin/systems/class_servGeneric.inc:182
 #: plugins/admin/ogroups/class_termgroup.inc:49
 msgid "Memory test"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:254
-#: plugins/admin/systems/class_workstationGeneric.inc:260
-#: plugins/admin/systems/class_terminalGeneric.inc:275
-#: plugins/admin/systems/class_terminalGeneric.inc:279
-#: plugins/admin/systems/class_servGeneric.inc:178
+#: plugins/admin/systems/class_workstationGeneric.inc:257
+#: plugins/admin/systems/class_workstationGeneric.inc:264
+#: plugins/admin/systems/class_servGeneric.inc:176
+#: plugins/admin/systems/class_servGeneric.inc:183
+msgid "Force localboot"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:258
+#: plugins/admin/systems/class_workstationGeneric.inc:265
+#: plugins/admin/systems/class_terminalGeneric.inc:272
+#: plugins/admin/systems/class_terminalGeneric.inc:276
+#: plugins/admin/systems/class_servGeneric.inc:177
 #: plugins/admin/systems/class_servGeneric.inc:184
 #: plugins/admin/ogroups/class_termgroup.inc:50
 msgid "System analysis"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:256
-#: plugins/admin/systems/class_terminalGeneric.inc:277
-#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:260
+#: plugins/admin/systems/class_terminalGeneric.inc:274
+#: plugins/admin/systems/class_servGeneric.inc:179
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
 msgid "Removing workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:344
+#: plugins/admin/systems/class_workstationGeneric.inc:349
 #: plugins/admin/ogroups/class_termgroup.inc:115
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:353
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:366
+#: plugins/admin/systems/class_workstationGeneric.inc:371
 #: plugins/admin/systems/class_componentGeneric.inc:166
-#: plugins/admin/systems/class_winGeneric.inc:175
-#: plugins/admin/systems/class_terminalGeneric.inc:411
-#: plugins/admin/systems/class_servGeneric.inc:255
-#: plugins/admin/systems/class_printGeneric.inc:652
-#: plugins/admin/systems/class_phoneGeneric.inc:313
+#: plugins/admin/systems/class_winGeneric.inc:177
+#: plugins/admin/systems/class_terminalGeneric.inc:409
+#: plugins/admin/systems/class_servGeneric.inc:256
+#: plugins/admin/systems/class_printGeneric.inc:660
+#: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:377
-#: plugins/admin/systems/class_terminalGeneric.inc:421
+#: plugins/admin/systems/class_workstationGeneric.inc:382
+#: plugins/admin/systems/class_terminalGeneric.inc:419
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:443
-#: plugins/admin/systems/class_workstationGeneric.inc:467
+#: plugins/admin/systems/class_workstationGeneric.inc:454
+#: plugins/admin/systems/class_workstationGeneric.inc:478
 #: plugins/admin/ogroups/class_termgroup.inc:334
 msgid "Saving workstation failed"
 msgstr ""
@@ -8446,23 +8567,23 @@ msgstr ""
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:134
+#: plugins/admin/systems/class_divListSystem.inc:143
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_divListSystem.inc:145
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:178
 msgid "Set root       password"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:178
+#: plugins/admin/systems/class_divListSystem.inc:184
 msgid "Create CD"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:178
+#: plugins/admin/systems/class_divListSystem.inc:184
 msgid "Create FAI CD"
 msgstr ""
 
@@ -8535,7 +8656,7 @@ msgid "The specified value for '%s' must be a numeric value."
 msgstr ""
 
 #: plugins/admin/systems/class_goVirusServer.inc:305
-#: plugins/admin/systems/class_goSpamServer.inc:451
+#: plugins/admin/systems/class_goSpamServer.inc:446
 #, php-format
 msgid ""
 "Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
@@ -8546,36 +8667,48 @@ msgstr ""
 msgid "Set status flag for server services/anti virus with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:136
-#: plugins/admin/systems/class_servDB.inc:145
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:172
-#: plugins/admin/systems/class_servDB.inc:177
-#: plugins/admin/systems/class_servDB.inc:183
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:138
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:164
+#: plugins/admin/systems/class_servDB.inc:174
+#: plugins/admin/systems/class_servDB.inc:179
+#: plugins/admin/systems/class_servDB.inc:185
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_servDB.inc:154
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:156
+#: plugins/admin/systems/class_servDB.inc:158
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:167
+#: plugins/admin/systems/class_servDB.inc:169
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:191
+#: plugins/admin/systems/class_servDB.inc:211
+#: plugins/admin/systems/class_servDB.inc:309
+#, php-format
+msgid ""
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:220
 #, php-format
 msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:245
+#: plugins/admin/systems/class_servDB.inc:274
 msgid "Saving server db settings failed"
 msgstr ""
 
@@ -8603,41 +8736,41 @@ msgstr ""
 msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:46
+#: plugins/admin/systems/class_servNfs.inc:41
 #, php-format
 msgid "The file '%s/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:49
+#: plugins/admin/systems/class_servNfs.inc:44
 #, php-format
 msgid "Can't read '%s/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:180
+#: plugins/admin/systems/class_servNfs.inc:175
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:186
+#: plugins/admin/systems/class_servNfs.inc:181
 msgid "Please specify a valid name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:189
+#: plugins/admin/systems/class_servNfs.inc:184
 msgid "Please specify a name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:194
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:198
+#: plugins/admin/systems/class_servNfs.inc:193
 msgid "Volume contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:202
+#: plugins/admin/systems/class_servNfs.inc:197
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:206
+#: plugins/admin/systems/class_servNfs.inc:201
 msgid "Option contains invalid characters."
 msgstr ""
 
@@ -8733,69 +8866,69 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:94
+#: plugins/admin/systems/class_servKolab.inc:90
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:100
+#: plugins/admin/systems/class_servKolab.inc:96
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:111
 msgid "Remove Kolab extension"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:111
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
+#: plugins/admin/systems/class_servKolab.inc:114
 msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
+#: plugins/admin/systems/class_servKolab.inc:114
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:199
+#: plugins/admin/systems/class_servKolab.inc:195
 msgid "Removing kolab host entry failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:215
+#: plugins/admin/systems/class_servKolab.inc:211
 msgid "Removing server from kolab object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:254
+#: plugins/admin/systems/class_servKolab.inc:250
 msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:256
+#: plugins/admin/systems/class_servKolab.inc:252
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:260
+#: plugins/admin/systems/class_servKolab.inc:256
 msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:262
+#: plugins/admin/systems/class_servKolab.inc:258
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:264
+#: plugins/admin/systems/class_servKolab.inc:260
 msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:268
+#: plugins/admin/systems/class_servKolab.inc:264
 msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:340
+#: plugins/admin/systems/class_servKolab.inc:336
 msgid "Saving server to kolab object failed"
 msgstr ""
 
@@ -8851,8 +8984,8 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:50
-#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:49
+#: plugins/admin/systems/class_winGeneric.inc:74
 msgid "This 'dn' has no network features."
 msgstr ""
 
@@ -8865,21 +8998,21 @@ msgid "The required field 'Component name' is not set."
 msgstr ""
 
 #: plugins/admin/systems/class_componentGeneric.inc:145
-#: plugins/admin/systems/class_phoneGeneric.inc:285
+#: plugins/admin/systems/class_phoneGeneric.inc:284
 msgid "The required field IP address is empty."
 msgstr ""
 
 #: plugins/admin/systems/class_componentGeneric.inc:148
-#: plugins/admin/systems/class_phoneGeneric.inc:288
+#: plugins/admin/systems/class_phoneGeneric.inc:287
 msgid "The field IP address contains an invalid address."
 msgstr ""
 
 #: plugins/admin/systems/class_componentGeneric.inc:156
-#: plugins/admin/systems/class_winGeneric.inc:165
+#: plugins/admin/systems/class_winGeneric.inc:167
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:224
+#: plugins/admin/systems/class_componentGeneric.inc:225
 msgid "Saving generic component failed"
 msgstr ""
 
@@ -8907,6 +9040,10 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr ""
 
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
+
 #: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
 "This is a new system which currently has no system type defined. Please "
@@ -8933,80 +9070,80 @@ msgstr ""
 msgid "Choose an object group"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:92
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:111
 #, php-format
 msgid ""
 "You can't delete this cartridge type, it is still in use by this printer(s) "
 "'%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:157
 msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:205
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:220
 msgid "New monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:205
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:220
 msgid "M"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
+#: plugins/admin/systems/class_glpiAccount.inc:173
+#: plugins/admin/systems/class_glpiAccount.inc:179
+#: plugins/admin/systems/class_glpiAccount.inc:185
 msgid "This feature is not implemented yet."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
+#: plugins/admin/systems/class_glpiAccount.inc:287
 msgid "Adding new sytem type failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
+#: plugins/admin/systems/class_glpiAccount.inc:307
 #, php-format
 msgid ""
 "You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
+#: plugins/admin/systems/class_glpiAccount.inc:318
 msgid "Rename failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
+#: plugins/admin/systems/class_glpiAccount.inc:374
 msgid "Adding new operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
+#: plugins/admin/systems/class_glpiAccount.inc:396
 #, php-format
 msgid ""
 "You can't delete this operating system, it is still in use by these system"
 "(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
+#: plugins/admin/systems/class_glpiAccount.inc:408
 msgid "Updating operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:566
+#: plugins/admin/systems/class_glpiAccount.inc:570
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:569
+#: plugins/admin/systems/class_glpiAccount.inc:573
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:667
+#: plugins/admin/systems/class_glpiAccount.inc:671
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
@@ -9026,62 +9163,73 @@ msgstr ""
 msgid "Mime-type"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:132
+#: plugins/admin/systems/class_termDNS.inc:138
 #, php-format
 msgid ""
 "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:293
+#: plugins/admin/systems/class_termDNS.inc:224
+msgid "Not matching"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:309
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:300
+#: plugins/admin/systems/class_termDNS.inc:316
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:306
+#: plugins/admin/systems/class_termDNS.inc:322
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:312
+#: plugins/admin/systems/class_termDNS.inc:328
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:333
+#: plugins/admin/systems/class_termDNS.inc:341
+#, php-format
+msgid ""
+"The specified IP address '%s' is not matching the selected reverse zone "
+"entry '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:356
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:341
+#: plugins/admin/systems/class_termDNS.inc:364
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_termDNS.inc:375
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
 "please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:359
-#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#: plugins/admin/systems/class_termDNS.inc:382
+#: plugins/admin/systems/class_servDNSeditZone.inc:416
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:442
+#: plugins/admin/systems/class_termDNS.inc:467
 msgid "Saving terminal to DNS object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:113
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:303
 msgid "The selected name is already in use."
 msgstr ""
 
@@ -9118,45 +9266,45 @@ msgid "Enable use of DDC"
 msgstr ""
 
 #: plugins/admin/systems/goSpamServer.tpl:69
-msgid "Enable use of Pyzer"
+msgid "Enable use of Pyzor"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:122
+#: plugins/admin/systems/class_servRepository.inc:125
 msgid "Remove FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:123
+#: plugins/admin/systems/class_servRepository.inc:126
 msgid ""
 "This server has FAI repository features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:125
+#: plugins/admin/systems/class_servRepository.inc:128
 msgid "Add FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:126
+#: plugins/admin/systems/class_servRepository.inc:129
 msgid ""
 "This server has FAI repository features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:170
+#: plugins/admin/systems/class_servRepository.inc:173
 #, php-format
 msgid ""
 "You can't delete this release, it is still used by these workstations [%s]. "
 "Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:204
+#: plugins/admin/systems/class_servRepository.inc:207
 #, php-format
 msgid ""
 "Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:278
-#: plugins/admin/systems/class_servRepository.inc:297
-#: plugins/admin/systems/class_servRepository.inc:301
+#: plugins/admin/systems/class_servRepository.inc:281
+#: plugins/admin/systems/class_servRepository.inc:300
+#: plugins/admin/systems/class_servRepository.inc:304
 #: plugins/admin/systems/servRepositorySetup.tpl:33
 msgid "Sections"
 msgstr ""
@@ -9250,7 +9398,7 @@ msgid "Serial number (automatically incremented)"
 msgstr ""
 
 #: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/phonequeue.tpl:67
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
@@ -9268,44 +9416,44 @@ msgstr ""
 msgid "Global zone records"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:127
+#: plugins/admin/systems/class_winGeneric.inc:129
 msgid "Removing Samba workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:225
+#: plugins/admin/systems/class_winGeneric.inc:228
 msgid "Saving Samba workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/class_glpiSelectUser.inc:135
 msgid "use"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_glpiSelectUser.inc:155
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: include/class_MultiSelectWindow.inc:188
 msgid "Go to root department"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_glpiSelectUser.inc:157
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: include/class_MultiSelectWindow.inc:196
 msgid "Go up one department"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_glpiSelectUser.inc:159
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: include/class_MultiSelectWindow.inc:204
 msgid "Go to users department"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_glpiSelectUser.inc:159
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: include/class_MultiSelectWindow.inc:204
 #: include/class_MultiSelectWindow.inc:206
 msgid "Home"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: include/class_MultiSelectWindow.inc:211
 msgid "Reload list"
@@ -9316,11 +9464,11 @@ msgid ""
 "This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_terminalService.inc:151
 msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:456
+#: plugins/admin/systems/class_terminalService.inc:451
 msgid "Saving terminal service information failed"
 msgstr ""
 
@@ -9353,6 +9501,13 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:176
 #: plugins/admin/systems/glpi_devices.tpl:296
 #: plugins/admin/systems/glpi_devices.tpl:361
+#: include/sieve/templates/element_address.tpl:40
+#: include/sieve/templates/element_header.tpl:41
+#: include/sieve/templates/element_envelope.tpl:41
+#: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
+#: setup/class_setupStep_Config2.inc:113 setup/class_setupStep_Config3.inc:76
+#: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
+#: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
 msgstr ""
 
@@ -9363,6 +9518,13 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:177
 #: plugins/admin/systems/glpi_devices.tpl:297
 #: plugins/admin/systems/glpi_devices.tpl:362
+#: include/sieve/templates/element_address.tpl:42
+#: include/sieve/templates/element_header.tpl:43
+#: include/sieve/templates/element_envelope.tpl:43
+#: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
+#: setup/class_setupStep_Config2.inc:113 setup/class_setupStep_Config3.inc:76
+#: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
+#: setup/class_setupStep_Schema.inc:63
 msgid "No"
 msgstr ""
 
@@ -9488,36 +9650,36 @@ msgstr ""
 msgid "format"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:400
+#: plugins/admin/systems/class_terminalStartup.inc:406
 msgid "Saving terminal startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:108
+#: plugins/admin/systems/class_servService.inc:103
 #, php-format
 msgid "The share can't be removed since it is still used by %d users:"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:113
+#: plugins/admin/systems/class_servService.inc:108
 msgid "Please correct the share-/profile settings of these users"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:337
+#: plugins/admin/systems/class_servService.inc:336
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:396
+#: plugins/admin/systems/class_servService.inc:395
 msgid "Saving server service object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:427
+#: plugins/admin/systems/class_servService.inc:426
 msgid "Creating mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:441
+#: plugins/admin/systems/class_servService.inc:440
 msgid "Removing mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:453
+#: plugins/admin/systems/class_servService.inc:452
 msgid "Saving mount container failed"
 msgstr ""
 
@@ -9586,185 +9748,185 @@ msgstr ""
 msgid "Regular expression for matching cartridge types"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:105
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:100
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:106
+#: plugins/admin/systems/class_terminalGeneric.inc:101
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:177
+#: plugins/admin/systems/class_terminalGeneric.inc:173
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:189
+#: plugins/admin/systems/class_terminalGeneric.inc:185
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:201
+#: plugins/admin/systems/class_terminalGeneric.inc:197
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:326
+#: plugins/admin/systems/class_terminalGeneric.inc:324
 msgid "Removing terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:386
+#: plugins/admin/systems/class_terminalGeneric.inc:384
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:390
+#: plugins/admin/systems/class_terminalGeneric.inc:388
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:504
+#: plugins/admin/systems/class_terminalGeneric.inc:503
 msgid "Saving terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-msgid "Select"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:88
 #, php-format
 msgid "Internal Error can't create device of type '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:108
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:110
 #, php-format
 msgid "You're about to delete the glpi device '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:112
 msgid "Can't detect object name."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:133
 #, php-format
 msgid ""
 "You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:182
 msgid "devices"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:222
 msgid "New mainbord"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:224
 msgid "New processor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:226
 msgid "New case"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:226
 msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:228
 msgid "New network interface"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:228
 msgid "NI"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:230
 msgid "New ram"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:230
 msgid "R"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:232
 msgid "New hard disk"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:232
 msgid "HDD"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:234
 msgid "New drive"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:234
 msgid "D"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:236
 msgid "New controller"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:236
 msgid "CS"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:238
 msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:238
 msgid "GC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:240
 msgid "New sound card"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:240
 msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:242
 msgid "New power supply"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:242
 msgid "PS"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:244
 msgid "New misc device"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:244
 msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:342
 msgid "You have to specify a valid name for this device."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:362
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:365
 msgid "This device name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:401
 msgid "Other"
 msgstr ""
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
+msgstr ""
+
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
 msgstr ""
 
 #: plugins/admin/systems/printer.tpl:6
@@ -9795,19 +9957,19 @@ msgstr ""
 msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:93
 msgid "Add user"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:94
 msgid "Add group"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/printer.tpl:88
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/printer.tpl:90
 msgid "Admins"
 msgstr ""
 
@@ -9879,23 +10041,23 @@ msgstr ""
 msgid "Database"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_servGeneric.inc:73
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:201
+#: plugins/admin/systems/class_servGeneric.inc:202
 msgid "Removing server failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:237
+#: plugins/admin/systems/class_servGeneric.inc:238
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:244
+#: plugins/admin/systems/class_servGeneric.inc:245
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:313
+#: plugins/admin/systems/class_servGeneric.inc:315
 msgid "Saving server failed"
 msgstr ""
 
@@ -9903,74 +10065,74 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_servDHCP.inc:31
 msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:37
+#: plugins/admin/systems/class_servDHCP.inc:32
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:39
+#: plugins/admin/systems/class_servDHCP.inc:34
 msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:40
+#: plugins/admin/systems/class_servDHCP.inc:35
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:77
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
 msgid "New entry"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:172
 #, php-format
 msgid ""
 "Can't rename '%s' to '%s' there is already an entry with the same name in "
 "our zone editing dialog."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:205
 #, php-format
 msgid "Entry name '%s' contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:214
 #, php-format
 msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:220
 #, php-format
 msgid "Can not create '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:229
 #, php-format
 msgid "The name '%s' is used more than once."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:237
 #, php-format
 msgid "The host name '%s' should be written in lowercase."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:254
 #, php-format
 msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:261
 #, php-format
 msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:269
 #, php-format
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
@@ -10037,14 +10199,14 @@ msgid "New System from incoming"
 msgstr ""
 
 #: plugins/admin/systems/class_systemManagement.inc:864
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:346
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
 msgid "Terminal"
 msgstr ""
 
 #: plugins/admin/systems/class_systemManagement.inc:865
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:345
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
@@ -10112,58 +10274,54 @@ msgid "Website"
 msgstr ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_phonequeue.inc:691
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
+#: plugins/admin/ogroups/class_phonequeue.inc:889
+#: plugins/gofon/conference/generic.tpl:82 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:67
-#: plugins/admin/systems/class_inventory.inc:36
+#: plugins/admin/systems/class_servDNS.inc:70
+#: plugins/admin/systems/class_inventory.inc:32
 msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:68
-#: plugins/admin/systems/class_inventory.inc:37
+#: plugins/admin/systems/class_servDNS.inc:71
+#: plugins/admin/systems/class_inventory.inc:33
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:70
-#: plugins/admin/systems/class_inventory.inc:39
+#: plugins/admin/systems/class_servDNS.inc:73
+#: plugins/admin/systems/class_inventory.inc:35
 msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:71
-#: plugins/admin/systems/class_inventory.inc:40
+#: plugins/admin/systems/class_servDNS.inc:74
+#: plugins/admin/systems/class_inventory.inc:36
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:159
+#: plugins/admin/systems/class_servDNS.inc:162
 msgid "Reverse zone"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:223
+#: plugins/admin/systems/class_servDNS.inc:229
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:261
-msgid "Removing DNS service failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:282
+#: plugins/admin/systems/class_servDNS.inc:297
 msgid "Updating DNS service failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:291
+#: plugins/admin/systems/class_servDNS.inc:306
 msgid "Removing DNS entries failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:312
+#: plugins/admin/systems/class_servDNS.inc:327
 msgid "Saving DNS entries failed"
 msgstr ""
 
@@ -10189,165 +10347,165 @@ msgid ""
 "back."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#: plugins/admin/systems/class_servDNSeditZone.inc:366
 #, php-format
 msgid "Please choose a valid zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#: plugins/admin/systems/class_servDNSeditZone.inc:370
 #, php-format
 msgid "Please choose a valid reverse zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:367
+#: plugins/admin/systems/class_servDNSeditZone.inc:374
 msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:371
+#: plugins/admin/systems/class_servDNSeditZone.inc:378
 msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:375
-#: plugins/admin/systems/class_servDNSeditZone.inc:379
+#: plugins/admin/systems/class_servDNSeditZone.inc:382
+#: plugins/admin/systems/class_servDNSeditZone.inc:386
 msgid ""
 "Your mail address contains '@' replace this with '.' to enable GOsa to "
 "create a valid SOA record."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:383
+#: plugins/admin/systems/class_servDNSeditZone.inc:390
 msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:387
+#: plugins/admin/systems/class_servDNSeditZone.inc:394
 msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:391
+#: plugins/admin/systems/class_servDNSeditZone.inc:398
 msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:395
+#: plugins/admin/systems/class_servDNSeditZone.inc:402
 msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:399
+#: plugins/admin/systems/class_servDNSeditZone.inc:406
 msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:403
+#: plugins/admin/systems/class_servDNSeditZone.inc:410
 msgid "Please specify a numeric value for retry."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:109
+#: plugins/admin/systems/class_printGeneric.inc:105
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:253
-#: plugins/admin/systems/class_printGeneric.inc:261
-#: plugins/admin/systems/class_printGeneric.inc:266
-#: plugins/admin/systems/class_printGeneric.inc:305
-#: plugins/admin/systems/class_printGeneric.inc:321
-#: plugins/admin/systems/class_printGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:251
+#: plugins/admin/systems/class_printGeneric.inc:259
+#: plugins/admin/systems/class_printGeneric.inc:264
+#: plugins/admin/systems/class_printGeneric.inc:310
+#: plugins/admin/systems/class_printGeneric.inc:326
+#: plugins/admin/systems/class_printGeneric.inc:329
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:254
+#: plugins/admin/systems/class_printGeneric.inc:252
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:262
+#: plugins/admin/systems/class_printGeneric.inc:260
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:267
+#: plugins/admin/systems/class_printGeneric.inc:265
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:298
+#: plugins/admin/systems/class_printGeneric.inc:303
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:306
+#: plugins/admin/systems/class_printGeneric.inc:311
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
 "template"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:313
-#: plugins/admin/systems/class_printGeneric.inc:316
+#: plugins/admin/systems/class_printGeneric.inc:318
+#: plugins/admin/systems/class_printGeneric.inc:321
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:314
+#: plugins/admin/systems/class_printGeneric.inc:319
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:317
+#: plugins/admin/systems/class_printGeneric.inc:322
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:327
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:325
+#: plugins/admin/systems/class_printGeneric.inc:330
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:491
+#: plugins/admin/systems/class_printGeneric.inc:497
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:505
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:512
+#: plugins/admin/systems/class_printGeneric.inc:518
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:514
+#: plugins/admin/systems/class_printGeneric.inc:520
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:570
+#: plugins/admin/systems/class_printGeneric.inc:578
 msgid "Removing printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:634
+#: plugins/admin/systems/class_printGeneric.inc:642
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:811
+#: plugins/admin/systems/class_printGeneric.inc:821
 msgid "Saving printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:857
+#: plugins/admin/systems/class_printGeneric.inc:866
 #, php-format
 msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:879
+#: plugins/admin/systems/class_printGeneric.inc:888
 #, php-format
 msgid "Can't add '%s' to the list of members, it is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:887
+#: plugins/admin/systems/class_printGeneric.inc:896
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -10451,73 +10609,74 @@ msgstr ""
 msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:68
 #, php-format
 msgid "You're about to delete the glpi attachment component '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:107
 #, php-format
 msgid ""
 "You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:119
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:123
 msgid "There is no valid file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:126
 msgid "Upload wasn't successfull."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:129
 #, php-format
 msgid "Missing directory '%s/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:133
 msgid "There is already a file with the same name uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:137
 #, php-format
 msgid "Can't create file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:181
 msgid "File is available."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:183
 msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
 msgid "Currently no file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:197
 msgid "Mime"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:200
 msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:217
+#: include/sieve/class_sieveElement_If.inc:447
 msgid "empty"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:254
 msgid "Create new attachment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:255
 msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 msgid "Please specify a valid name for this attachment."
 msgstr ""
 
@@ -10559,14 +10718,10 @@ msgstr ""
 msgid "Other network component"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
+#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:859
 msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/remove_ppd.tpl:9
-msgid "The ppd file will be removed from the server and can not be restored."
-msgstr ""
-
 #: plugins/admin/systems/glpiAttachmentPool.tpl:6
 msgid "List of attachments"
 msgstr ""
@@ -10585,15 +10740,15 @@ msgstr ""
 msgid "Regular expression for matching attachment names"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:136
+#: plugins/admin/systems/class_servRepositorySetup.inc:131
 msgid "Please enter a value for 'release'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:140
+#: plugins/admin/systems/class_servRepositorySetup.inc:135
 msgid "Please specify a valid value for 'url'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:187
+#: plugins/admin/systems/class_servRepositorySetup.inc:182
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
@@ -10614,52 +10769,48 @@ msgstr ""
 msgid "Create ISO-Image"
 msgstr ""
 
-#: plugins/admin/systems/gencd_frame.tpl:2
-msgid "Your browser does not supprt iframes."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:105
+#: plugins/admin/systems/class_phoneGeneric.inc:103
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/admin/systems/class_phoneGeneric.inc:201
 #: plugins/gofon/macro/class_divListMacros.inc:100
 msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/admin/systems/class_phoneGeneric.inc:201
 #: plugins/gofon/macro/class_divListMacros.inc:101
 msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
+#: plugins/admin/systems/class_phoneGeneric.inc:223
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
+#: plugins/admin/systems/class_phoneGeneric.inc:223
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:241
+#: plugins/admin/systems/class_phoneGeneric.inc:240
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:248
+#: plugins/admin/systems/class_phoneGeneric.inc:247
 msgid "Removing phone failed"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:293
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:296
+#: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:303
+#: plugins/admin/systems/class_phoneGeneric.inc:302
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
@@ -10671,104 +10822,104 @@ msgstr ""
 msgid "Select entries to add"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:38
 msgid "Display members of department"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:50
 msgid "Display members matching"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:55
 msgid "Regular expression for matching member names"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#: plugins/admin/systems/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
 "You can't delete this manufacturer, it is still in use by these system(s) '%"
 "s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#: plugins/admin/systems/class_glpiManufacturer.inc:99
 msgid "Please specify a name."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#: plugins/admin/systems/class_glpiManufacturer.inc:108
+#: plugins/admin/systems/class_glpiManufacturer.inc:114
 msgid "Specified name is already in use, please choose another one."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:47
-#: plugins/admin/systems/class_goSpamServer.inc:391
+#: plugins/admin/systems/class_goSpamServer.inc:42
+#: plugins/admin/systems/class_goSpamServer.inc:386
 msgid "Spamassassin"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:102
+#: plugins/admin/systems/class_goSpamServer.inc:97
 msgid "Remove spamassassin extension"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:103
+#: plugins/admin/systems/class_goSpamServer.inc:98
 msgid ""
 "This server has spamassassin features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:106
+#: plugins/admin/systems/class_goSpamServer.inc:101
 msgid "Add spamassassin service"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:107
+#: plugins/admin/systems/class_goSpamServer.inc:102
 msgid ""
 "This server has spamassassin features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:233
+#: plugins/admin/systems/class_goSpamServer.inc:228
 msgid "Specified value is not a valid 'trusted network' value."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:274
+#: plugins/admin/systems/class_goSpamServer.inc:269
 #, php-format
 msgid "Removing of server services/spamassassin with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:322
+#: plugins/admin/systems/class_goSpamServer.inc:317
 #, php-format
 msgid "Saving of server services/spamassassin with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:331
+#: plugins/admin/systems/class_goSpamServer.inc:326
 msgid "Required score must be a numeric value."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:475
+#: plugins/admin/systems/class_goSpamServer.inc:470
 #, php-format
 msgid "Set status flag for server services/spamassassin with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:69
 #, php-format
 msgid "You're about to delete the ppd file '%s' at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:73
 #, php-format
 msgid "Could not found specified ppd file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:99
 msgid ""
 "Something went wrong while trying to remove the ppd file from server, "
 "possibly we have no write access."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:119
 #, php-format
 msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:128
 msgid "Printer ppd selection."
 msgstr ""
 
@@ -10787,24 +10938,29 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:61
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
+#: plugins/admin/ogroups/tabs_ogroups.inc:63
+#: plugins/admin/ogroups/tabs_ogroups.inc:168
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/tabs_ogroups.inc:89
 msgid "System"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
+#: plugins/admin/ogroups/tabs_ogroups.inc:147
 msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
+#: plugins/admin/ogroups/phonequeue.tpl:2
+msgid ""
+"Only users with the same asterisk home server will be included to this queue."
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:5
 msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/admin/ogroups/phonequeue.tpl:8
 #: plugins/gofon/phoneaccount/generic.tpl:1
 #: plugins/gofon/phoneaccount/generic.tpl:4
 #: plugins/gofon/phoneaccount/paste_generic.tpl:2
@@ -10812,117 +10968,121 @@ msgstr ""
 msgid "Phone numbers"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
+#: plugins/admin/ogroups/phonequeue.tpl:12
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/phonequeue.tpl:38
+#: plugins/gofon/phoneaccount/generic.tpl:32
+#: plugins/gofon/conference/generic.tpl:46
+msgid "Home server"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:59
 msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:62
+#: plugins/admin/ogroups/phonequeue.tpl:75
 msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:74
+#: plugins/admin/ogroups/phonequeue.tpl:87
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:82
+#: plugins/admin/ogroups/phonequeue.tpl:95
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:86
+#: plugins/admin/ogroups/phonequeue.tpl:99
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
+#: plugins/admin/ogroups/phonequeue.tpl:107
 msgid "Queue sound setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
+#: plugins/admin/ogroups/phonequeue.tpl:112
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:116
+#: plugins/admin/ogroups/phonequeue.tpl:129
 msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:124
+#: plugins/admin/ogroups/phonequeue.tpl:137
 msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:132
+#: plugins/admin/ogroups/phonequeue.tpl:145
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:153
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
+#: plugins/admin/ogroups/phonequeue.tpl:161
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
+#: plugins/admin/ogroups/phonequeue.tpl:169
 msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
+#: plugins/admin/ogroups/phonequeue.tpl:177
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
+#: plugins/admin/ogroups/phonequeue.tpl:185
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
+#: plugins/admin/ogroups/phonequeue.tpl:193
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
+#: plugins/admin/ogroups/phonequeue.tpl:201
 msgid "Less Than sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
+#: plugins/admin/ogroups/phonequeue.tpl:217
 msgid "Phone attributes "
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/phonequeue.tpl:225
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/phonequeue.tpl:231
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:237
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/phonequeue.tpl:247
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/phonequeue.tpl:253
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/phonequeue.tpl:259
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:37
-msgid "Member objects"
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
 #: plugins/admin/ogroups/class_termgroup.inc:120
@@ -10990,21 +11150,37 @@ msgstr ""
 msgid "Display objects of department"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:163
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:37
+msgid "Member objects"
+msgstr ""
+
+#: plugins/admin/ogroups/paste_mail.tpl:7
+msgid "Please enter a mail address"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:169
-#: plugins/admin/ogroups/class_ogroupManagement.inc:197
+#: plugins/admin/ogroups/class_ogroupManagement.inc:193
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
 msgid "You are not allowed to delete this object group!"
 msgstr ""
 
+#: plugins/admin/ogroups/paste_generic.tpl:7
+msgid "Please enter the new object group name"
+msgstr ""
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11097,12 +11273,12 @@ msgstr ""
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:154
+#: plugins/admin/ogroups/class_divListOGroup.inc:160
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:148
+#: plugins/admin/ogroups/class_ogroup.inc:149
 msgid "This 'dn' is no object group."
 msgstr ""
 
@@ -11150,181 +11326,220 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:486
+#: plugins/admin/ogroups/class_ogroup.inc:485
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:606
+#: plugins/admin/ogroups/class_ogroup.inc:605
 msgid "There is already an object with this cn."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:623
+#: plugins/admin/ogroups/class_ogroup.inc:622
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:672
+#: plugins/admin/ogroups/class_ogroup.inc:671
 msgid "Saving object group failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:685
+#: plugins/admin/ogroups/class_ogroup.inc:684
 msgid "Removing object group failed"
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: plugins/admin/ogroups/class_phonequeue.inc:92
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:98
+#, php-format
 msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+"The specified home server '%s' is not available in GOsa server "
+"configuration. Saving this account will create a new entry on the server '%"
+"s'. Use cancel if you do not want to create a new entry while ignoring old "
+"accounts."
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:41
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/admin/ogroups/class_phonequeue.inc:122
+msgid "ring all"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/admin/ogroups/class_phonequeue.inc:123
+msgid "round robin"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:98
-msgid "Saving mail objectgroup settings failed"
+#: plugins/admin/ogroups/class_phonequeue.inc:124
+msgid "least recently called"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:131
-msgid "Removing mail objectgroup settings failed"
+#: plugins/admin/ogroups/class_phonequeue.inc:125
+msgid "fewest completed calls"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:79
-msgid "ring all"
+#: plugins/admin/ogroups/class_phonequeue.inc:126
+msgid "random"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-msgid "round robin"
+#: plugins/admin/ogroups/class_phonequeue.inc:127
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-msgid "least recently called"
+#: plugins/admin/ogroups/class_phonequeue.inc:148
+#: plugins/gofon/macro/class_gofonMacro.inc:172
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:265
+msgid ""
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:82
-msgid "fewest completed calls"
+#: plugins/admin/ogroups/class_phonequeue.inc:159
+#: plugins/gofon/macro/class_gofonMacro.inc:182
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:276
+#, php-format
+msgid ""
+"The MySQL home server '%s' isn't reachable as user '%s', check GOsa log for "
+"mysql error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-msgid "random"
+#: plugins/admin/ogroups/class_phonequeue.inc:166
+#: plugins/gofon/macro/class_gofonMacro.inc:189
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:283
+#, php-format
+msgid "Can't select database '%s' on home server '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-msgid "round robin with memory"
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:295
+#, php-format
+msgid ""
+"The MySQL initial home server '%s' isn't reachable as user '%s', check GOsa "
+"log for mysql error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:185
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:302
+#, php-format
+msgid "Can't select database '%s' on initial home server '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "Remove the phone queue from this Account"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:114
+#: plugins/admin/ogroups/class_phonequeue.inc:212
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:116
+#: plugins/admin/ogroups/class_phonequeue.inc:214
 msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:117
+#: plugins/admin/ogroups/class_phonequeue.inc:215
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:201
+#: plugins/admin/ogroups/class_phonequeue.inc:298
+msgid ""
+"There must be at least one server with an asterisk database to create a "
+"phone queue."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:301
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1116
+msgid "Please select a valid goFonHomeServer."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:307
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:204
+#: plugins/admin/ogroups/class_phonequeue.inc:310
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:207
+#: plugins/admin/ogroups/class_phonequeue.inc:313
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:210
+#: plugins/admin/ogroups/class_phonequeue.inc:316
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:319
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:227
+#: plugins/admin/ogroups/class_phonequeue.inc:342
+#: plugins/admin/ogroups/class_phonequeue.inc:391
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:299
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:860
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
 msgid ""
-"There is currently no asterisk server defined. Your settings can't be saved."
+"There is currently no asterisk server defined. Possibly you are missing a "
+"server that handles the asterisk management (goFonServer). Your settings "
+"can't be saved to asterisk database."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:240
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:270
-#, php-format
-msgid ""
-"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+#: plugins/admin/ogroups/class_phonequeue.inc:374
+msgid "Error while removing old queue entries from database."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:625
-#: plugins/gofon/macro/class_gofonMacro.inc:246
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:91
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:311
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1053
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:281
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:397
-#, php-format
-msgid "Can't select database %s on %s."
+#: plugins/admin/ogroups/class_phonequeue.inc:375
+#: plugins/admin/ogroups/class_phonequeue.inc:434
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:407
+msgid "Please have a look a the gosa logfiles."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:434
+msgid "Could not detect old queue entry, query failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:281
-#: plugins/admin/ogroups/class_phonequeue.inc:495
-#: plugins/admin/ogroups/class_phonequeue.inc:661
+#: plugins/admin/ogroups/class_phonequeue.inc:520
 #, php-format
-msgid "Can't delete in Database %s, on Server %s."
+msgid ""
+"More than one entry in queue table found, that uses the name ('%s'). Please "
+"fix this issue manually first."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "Mysql query failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/admin/ogroups/class_phonequeue.inc:527
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1158
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1160
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:437
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:439
+#: plugins/admin/ogroups/class_phonequeue.inc:761
+#: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1378
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1380
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:565
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:587
+#: plugins/admin/ogroups/class_phonequeue.inc:830
 msgid "Saving phone queue failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:615
-#: plugins/gofon/macro/class_gofonMacro.inc:235
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:84
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:300
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1042
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:386
-#, php-format
+#: plugins/admin/ogroups/class_phonequeue.inc:882
+msgid "Removing phone queue failed"
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:48
 msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:684
-msgid "Removing phone queue failed"
+#: plugins/admin/ogroups/class_mailogroup.inc:50
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/paste_generic.tpl:7
-msgid "Please enter the new object group name"
+#: plugins/admin/ogroups/class_mailogroup.inc:105
+msgid "Saving mail objectgroup settings failed"
 msgstr ""
 
-#: plugins/admin/ogroups/paste_mail.tpl:7
-msgid "Please enter a mail address"
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+msgid "Removing mail objectgroup settings failed"
 msgstr ""
 
 #: plugins/gofon/fonreports/main.inc:21
@@ -11382,10 +11597,6 @@ msgstr ""
 msgid "Display macros matching"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr ""
-
 #: plugins/gofon/macro/headpage.tpl:41
 #: plugins/gofon/macro/class_divListMacros.inc:54
 msgid "Regular expression for matching macro names"
@@ -11458,92 +11669,101 @@ msgid "You are not allowed to delete this macro!"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:391
+#: setup/class_setupStep_Migrate.inc:467 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:721
+#: setup/class_setupStep_Migrate.inc:853
+#: setup/class_setupStep_Migrate.inc:1614 setup/setup_checks.tpl:27
+#: setup/setup_checks.tpl:87
 msgid "Ok"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:255
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:650
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:249
-msgid ""
-"There is currently no asterisk server defined. Possibly you are missing a "
-"server that handles the asterisk management (goFonServer). Your settings "
-"can't be saved to asterisk database."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:103
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
-msgid "This 'dn' is no phone macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:187
-msgid ""
-"This macro ist still in use. To delete this Macro ensure that nobody has "
-"selected this Macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:194
-msgid "Removing phone macro failed"
+#: plugins/gofon/macro/class_gofonMacro.inc:219
+#, php-format
+msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:208
-msgid "Removing phone macro reverences failed"
+#: plugins/gofon/macro/class_gofonMacro.inc:287
+#, php-format
+msgid "More than one '(' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:221
-msgid ""
-"There is no mysql extension available in your php setup, can't save any "
-"changes to asterisk db."
+#: plugins/gofon/macro/class_gofonMacro.inc:290
+#, php-format
+msgid "More than one ')' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:291
+#: plugins/gofon/macro/class_gofonMacro.inc:294
 #, php-format
-msgid "Unable to parse macro contents on line: %s"
+msgid "There is no application given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:309
+#: plugins/gofon/macro/class_gofonMacro.inc:298
 #, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:318
-#: plugins/gofon/macro/class_gofonMacro.inc:326
+#: plugins/gofon/macro/class_gofonMacro.inc:327
 #, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+msgid "Insert of new macro failed for server '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:340
-#, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+#: plugins/gofon/macro/class_gofonMacro.inc:362
+msgid ""
+"There must be at least one server with an asterisk database to save this "
+"phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:388
+#: plugins/gofon/macro/class_gofonMacro.inc:376
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:393
+#: plugins/gofon/macro/class_gofonMacro.inc:382
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:397
+#: plugins/gofon/macro/class_gofonMacro.inc:386
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:402
+#: plugins/gofon/macro/class_gofonMacro.inc:392
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:408
+#: plugins/gofon/macro/class_gofonMacro.inc:403
+msgid ""
+"This macro is still in use. It is necessary to mark this macro as visible "
+"for users."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:411
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:413
-msgid "Please choose a valid  base."
+#: plugins/gofon/macro/class_gofonMacro.inc:429
+msgid ""
+"This macro is still in use. To delete this Macro ensure that nobody has "
+"selected it."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:442
+msgid ""
+"Could not remove the macro entry from asterisk databases. Please check your "
+"asterisk database configurations."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:448
+msgid "Removing phone macro failed"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:457
+msgid "Removing phone macro reverences failed"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:456
+#: plugins/gofon/macro/class_gofonMacro.inc:491
 msgid "Saving phone macro failed"
 msgstr ""
 
@@ -11555,46 +11775,51 @@ msgstr ""
 msgid "type"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:190
+msgid "This 'dn' is no phone macro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:238
 msgid "String"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+#: include/sieve/templates/element_boolean.tpl:4
 msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
 msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:920
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:389
 msgid "Saving phone macro parameters failed"
 msgstr ""
 
@@ -11602,133 +11827,199 @@ msgstr ""
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
+#: plugins/gofon/phoneaccount/generic.tpl:35
+msgid "Select the accounts home server"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:42
 #: plugins/gofon/phoneaccount/paste_generic.tpl:32
 msgid "Voicemail PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:41
+#: plugins/gofon/phoneaccount/generic.tpl:50
 #: plugins/gofon/phoneaccount/paste_generic.tpl:40
 msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:60
+#: plugins/gofon/phoneaccount/generic.tpl:68
+#: plugins/gofon/phoneaccount/generic.tpl:69
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:123
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:103
+#, php-format
+msgid ""
+"The specified goFonHomeServer '%s' is not available in GOsa server "
+"configuration. Saving this account will create a new entry on the server '%"
+"s'. Use cancel if you do not want to create a new entry ignoring old "
+"accounts."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:112
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1262
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1273
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:155
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:140
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:173
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:427
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s'. Abort saving entries to "
+"keep the database consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:435
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:462
+#, php-format
+msgid ""
+"Can't select database %s on %s. Abort saving entries to keep the database "
+"consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#, php-format
+msgid ""
+"The old MySQL home server '%s' isn't reachable as user '%s'. Abort saving "
+"entries to keep the database consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:768
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:745
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:825
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:956
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:851
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:966
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:967
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:762
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:970
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:973
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:760
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:971
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:974
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:776
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:987
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:806
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1026
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:892
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1112
+msgid ""
+"There must be at least one server with an asterisk database to create a "
+"phone account."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1120
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1123
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1128
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:903
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:913
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1141
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
 msgid "Saving phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1084
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1304
+#: include/sieve/templates/object_container.tpl:30
+#: include/sieve/templates/element_stop.tpl:4
+#: include/sieve/class_sieveManagement.inc:514
+#: include/sieve/class_sieveManagement.inc:734
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1089
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1122
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1342
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1129
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1349
 msgid "Removing phone account failed"
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1426
+#, php-format
+msgid ""
+"The previously selected asterisk home server (%s) is no longer available. "
+"Remove aborted."
+msgstr ""
+
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 #: plugins/gofon/phoneaccount/main.inc:122
 msgid "Phone settings"
@@ -11765,40 +12056,40 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:66
+#: plugins/gofon/conference/generic.tpl:74
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/generic.tpl:112
 msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/generic.tpl:120
 #: plugins/gofon/conference/class_divListConferences.inc:48
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/generic.tpl:126
 msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:126
+#: plugins/gofon/conference/generic.tpl:134
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/generic.tpl:151
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:149
+#: plugins/gofon/conference/generic.tpl:157
 msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:155
+#: plugins/gofon/conference/generic.tpl:163
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:161
+#: plugins/gofon/conference/generic.tpl:169
 msgid "Count users"
 msgstr ""
 
@@ -11818,7 +12109,7 @@ msgstr ""
 msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:131
+#: plugins/gofon/conference/class_divListConferences.inc:138
 msgid "Conference"
 msgstr ""
 
@@ -11830,36 +12121,66 @@ msgstr ""
 msgid "Management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:215
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:230
+#, php-format
+msgid ""
+"Could not remove the conference entry from database on home server (%s). "
+"Please check your asterisk database configuration."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:319
+#, php-format
+msgid ""
+"The previously selected asterisk home server (%s) is no longer available."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:324
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:219
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:328
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:223
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:332
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:336
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:231
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:340
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:261
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
 msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
+"Can not check if there are already some entries with given telephone number "
+"and/or cn in the destination home server."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:406
+msgid ""
+"Can not remove entries with some telephone number and/or cn from destination "
+"home server."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:524
+msgid ""
+"Can not check if entry exists in old database. Please have a look a the gosa "
+"logfiles."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:509
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
+msgid ""
+"Can not remove old entries from initial home server. Please have a look a "
+"the gosa logfiles."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:633
 msgid "Saving phone conference failed"
 msgstr ""
 
@@ -11905,1665 +12226,3418 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:40
-msgid "Warning: Account has an invalid mailserver string!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:53
+#: include/sieve/templates/remove_script.tpl:10
 msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
+"Best thing to do before performing this action would be to save the current "
+"script in a file. So - if you've done so - press 'Delete' to continue or "
+"'Cancel' to abort."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:151
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
+#: include/sieve/templates/element_size.tpl:11
+#: include/sieve/templates/element_anyof.tpl:5
+#: include/sieve/templates/element_exists.tpl:10
+#: include/sieve/templates/element_address.tpl:116
+#: include/sieve/templates/element_header.tpl:109
+#: include/sieve/templates/element_envelope.tpl:108
+#: include/sieve/templates/element_allof.tpl:5
+msgid "Not"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:170
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
+#: include/sieve/templates/element_size.tpl:11
+#: include/sieve/templates/element_size.tpl:13
+#: include/sieve/templates/element_anyof.tpl:5
+#: include/sieve/templates/element_anyof.tpl:7
+#: include/sieve/templates/element_exists.tpl:10
+#: include/sieve/templates/element_exists.tpl:12
+#: include/sieve/templates/element_envelope.tpl:41
+#: include/sieve/templates/element_envelope.tpl:43
+#: include/sieve/templates/element_allof.tpl:5
+#: include/sieve/templates/element_allof.tpl:7
+msgid "Inverse match"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:196
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+#: include/sieve/templates/element_size.tpl:13
+#: include/sieve/templates/element_exists.tpl:12
+#: include/sieve/templates/element_address.tpl:118
+#: include/sieve/templates/element_header.tpl:111
+#: include/sieve/templates/element_envelope.tpl:110
+#: include/sieve/templates/element_allof.tpl:7
+msgid "-"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:214
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+#: include/sieve/templates/element_size.tpl:16
+msgid "Select match type"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
+#: include/sieve/templates/element_size.tpl:20
+msgid "Select value unit"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:264
-#, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+#: include/sieve/templates/element_require.tpl:12
+#: include/sieve/templates/object_container.tpl:29
+#: include/sieve/class_sieveManagement.inc:513
+#: include/sieve/class_sieveManagement.inc:733
+msgid "Require"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:277
-#, php-format
-msgid "Can't get sieve script. Server says '%s'."
+#: include/sieve/templates/element_reject.tpl:14
+msgid "Reject mail"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:348
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
+#: include/sieve/templates/element_reject.tpl:17
+msgid "This is a multiline text element"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:352
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+#: include/sieve/templates/element_reject.tpl:19
+msgid "This is stored as single string"
 msgstr ""
 
-#: include/class_debconfTemplate.inc:260
-msgid "This package has no debconf options."
+#: include/sieve/templates/element_anyof.tpl:10
+#: include/sieve/class_sieveManagement.inc:608
+msgid "Any of"
 msgstr ""
 
-#: include/class_plugin.inc:404
-#, php-format
+#: include/sieve/templates/create_script.tpl:2
 msgid ""
-"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+"Please enter the name for the new script below. Script names must consist of "
+"lower case characters only."
 msgstr ""
 
-#: include/class_plugin.inc:550
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+#: include/sieve/templates/element_exists.tpl:8
+#: include/sieve/class_sieveManagement.inc:606
+msgid "Exists"
 msgstr ""
 
-#: include/class_plugin.inc:584 include/class_password-methods.inc:183
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+#: include/sieve/templates/element_keep.tpl:4
+#: include/sieve/templates/object_container.tpl:22
+#: include/sieve/templates/object_container.tpl:25
+#: include/sieve/class_sieveManagement.inc:506
+#: include/sieve/class_sieveManagement.inc:509
+#: include/sieve/class_sieveManagement.inc:726
+#: include/sieve/class_sieveManagement.inc:729
+msgid "Keep"
 msgstr ""
 
-#: include/class_plugin.inc:618
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+#: include/sieve/templates/element_keep.tpl:9
+msgid "Keep message"
 msgstr ""
 
-#: include/class_plugin.inc:926
-#, php-format
-msgid "Object '%s' is already tagged"
+#: include/sieve/templates/element_address.tpl:18
+#: include/sieve/templates/element_header.tpl:19
+#: include/sieve/templates/element_envelope.tpl:19
+#: include/sieve/templates/element_vacation.tpl:16
+msgid "Normal view"
 msgstr ""
 
-#: include/class_plugin.inc:933
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
+#: include/sieve/templates/element_address.tpl:25
+#: include/sieve/templates/element_header.tpl:26
+#: include/sieve/templates/element_envelope.tpl:26
+msgid "Match type"
 msgstr ""
 
-#: include/class_plugin.inc:947 include/class_plugin.inc:976
-msgid "Handle object tagging failed"
+#: include/sieve/templates/element_address.tpl:28
+#: include/sieve/templates/element_address.tpl:51
+#: include/sieve/templates/element_address.tpl:61
+#: include/sieve/templates/element_address.tpl:72
+#: include/sieve/templates/element_address.tpl:121
+#: include/sieve/templates/element_address.tpl:126
+#: include/sieve/templates/element_header.tpl:29
+#: include/sieve/templates/element_header.tpl:52
+#: include/sieve/templates/element_header.tpl:63
+#: include/sieve/templates/element_header.tpl:114
+#: include/sieve/templates/element_header.tpl:119
+#: include/sieve/templates/element_envelope.tpl:29
+#: include/sieve/templates/element_envelope.tpl:52
+#: include/sieve/templates/element_envelope.tpl:63
+#: include/sieve/templates/element_envelope.tpl:113
+#: include/sieve/templates/element_envelope.tpl:118
+#: include/sieve/templates/element_boolean.tpl:5
+msgid "Boolean value"
 msgstr ""
 
-#: include/class_plugin.inc:963
-#, php-format
-msgid "Removing tag from object '%s'"
+#: include/sieve/templates/element_address.tpl:36
+#: include/sieve/templates/element_header.tpl:37
+#: include/sieve/templates/element_envelope.tpl:37
+msgid "Invert test"
 msgstr ""
 
-#: include/class_password-methods.inc:167
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
+#: include/sieve/templates/element_address.tpl:48
+msgid "Part of address that should be used"
 msgstr ""
 
-#: include/class_password-methods.inc:204
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+#: include/sieve/templates/element_address.tpl:58
+#: include/sieve/templates/element_header.tpl:49
+#: include/sieve/templates/element_envelope.tpl:49
+msgid "Comparator"
 msgstr ""
 
-#: include/functions_setup.inc:84
-msgid "Can't get schema information from server. No schema check possible!"
+#: include/sieve/templates/element_address.tpl:69
+#: include/sieve/templates/element_envelope.tpl:60
+msgid "Operator"
 msgstr ""
 
-#: include/functions_setup.inc:99
-#, php-format
-msgid ""
-"Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
-"setup"
+#: include/sieve/templates/element_address.tpl:85
+#: include/sieve/templates/element_header.tpl:77
+#: include/sieve/templates/element_envelope.tpl:76
+msgid "Address fields to include"
 msgstr ""
 
-#: include/functions_setup.inc:103
-#, php-format
-msgid ""
-"Optional objectclass '%s' required by plugin '%s' does not have version %s"
+#: include/sieve/templates/element_address.tpl:89
+#: include/sieve/templates/element_header.tpl:81
+#: include/sieve/templates/element_envelope.tpl:80
+msgid "Values to match for"
 msgstr ""
 
-#: include/functions_setup.inc:108
-#, php-format
-msgid "Support for '%s' enabled"
+#: include/sieve/templates/element_address.tpl:138
+#: include/sieve/templates/element_header.tpl:131
+#: include/sieve/templates/element_envelope.tpl:130
+#: include/sieve/templates/element_vacation.tpl:47
+msgid "Expert view"
 msgstr ""
 
-#: include/functions_setup.inc:118
-#, php-format
-msgid "Required objectclass '%s' is not present in LDAP setup"
+#: include/sieve/templates/element_header.tpl:16
+#: include/sieve/templates/element_header.tpl:106
+#: include/sieve/class_sieveManagement.inc:603
+msgid "Header"
 msgstr ""
 
-#: include/functions_setup.inc:122
-#, php-format
-msgid "Required objectclass '%s' does not have version %s"
+#: include/sieve/templates/element_header.tpl:60
+msgid "operator"
 msgstr ""
 
-#: include/functions_setup.inc:133
-msgid "SAMBA 3 support disabled, no schema seems to be installed"
+#: include/sieve/templates/element_else.tpl:4
+#: include/sieve/templates/object_container.tpl:33
+#: include/sieve/class_sieveElement_If.inc:840
+#: include/sieve/class_sieveManagement.inc:575
+#: include/sieve/class_sieveManagement.inc:771
+msgid "Else"
 msgstr ""
 
-#: include/functions_setup.inc:138
-msgid "SAMBA 3 support enabled"
+#: include/sieve/templates/element_if.tpl:4
+#: include/sieve/class_sieveElement_If.inc:834
+msgid "Condition"
 msgstr ""
 
-#: include/functions_setup.inc:143
-msgid "SAMBA 2 support disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:8
+msgid "Move object up one position"
 msgstr ""
 
-#: include/functions_setup.inc:148
-msgid "SAMBA 2 support enabled"
+#: include/sieve/templates/object_container.tpl:12
+msgid "Move object down one position"
 msgstr ""
 
-#: include/functions_setup.inc:154
-msgid "Support for pureftp disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:16
+#: include/sieve/templates/object_test_container.tpl:10
+msgid "Remove object"
 msgstr ""
 
-#: include/functions_setup.inc:159
-msgid "Support for pureftp enabled"
+#: include/sieve/templates/object_container.tpl:17
+#: include/sieve/templates/object_container_clear.tpl:17
+msgid "Remove element"
 msgstr ""
 
-#: include/functions_setup.inc:164
-msgid "Support for WebDAV disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:21
+msgid "choose element"
 msgstr ""
 
-#: include/functions_setup.inc:169
-msgid "Support for WebDAV enabled"
+#: include/sieve/templates/object_container.tpl:24
+msgid "Fileinto"
 msgstr ""
 
-#: include/functions_setup.inc:174
-msgid "Support for phpgroupware disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:26
+#: include/sieve/templates/element_discard.tpl:4
+#: include/sieve/class_sieveManagement.inc:510
+#: include/sieve/class_sieveManagement.inc:730
+msgid "Discard"
 msgstr ""
 
-#: include/functions_setup.inc:179
-msgid "Support for phpgroupware enabled"
+#: include/sieve/templates/object_container.tpl:27
+#: include/sieve/templates/element_redirect.tpl:13
+#: include/sieve/class_sieveManagement.inc:511
+#: include/sieve/class_sieveManagement.inc:731
+msgid "Redirect"
 msgstr ""
 
-#: include/functions_setup.inc:184
-msgid "Support for trustAccount disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:28
+#: include/sieve/class_sieveManagement.inc:512
+#: include/sieve/class_sieveManagement.inc:732
+msgid "Reject"
 msgstr ""
 
-#: include/functions_setup.inc:189
-msgid "Support for trustAccount enabled"
+#: include/sieve/templates/object_container.tpl:32
+#: include/sieve/class_sieveElement_If.inc:836
+#: include/sieve/class_sieveManagement.inc:516
+#: include/sieve/class_sieveManagement.inc:736
+msgid "If"
 msgstr ""
 
-#: include/functions_setup.inc:194
-msgid "Support for gofon disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:34
+#: include/sieve/templates/element_elsif.tpl:4
+#: include/sieve/class_sieveElement_If.inc:838
+#: include/sieve/class_sieveManagement.inc:577
+#: include/sieve/class_sieveManagement.inc:773
+#: include/sieve/class_sieveManagement.inc:778
+msgid "Else If"
 msgstr ""
 
-#: include/functions_setup.inc:199
-msgid "Support for gofon enabled"
+#: include/sieve/templates/object_container.tpl:38
+#: include/sieve/templates/object_container.tpl:42
+msgid "Add new"
 msgstr ""
 
-#: include/functions_setup.inc:204
-msgid "Support for nagios disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:38
+#: include/sieve/templates/object_container.tpl:40
+msgid "Add a new object above this one."
 msgstr ""
 
-#: include/functions_setup.inc:209
-msgid "Support for nagios enabled"
+#: include/sieve/templates/object_container.tpl:40
+msgid "Add element above"
 msgstr ""
 
-#: include/functions_setup.inc:214
-msgid "Support for netatalk disabled, no schema seems to be installed"
+#: include/sieve/templates/object_container.tpl:42
+#: include/sieve/templates/object_container.tpl:44
+msgid "Add a new object below this one."
 msgstr ""
 
-#: include/functions_setup.inc:219
-msgid "Support for netatalk enabled"
+#: include/sieve/templates/object_container.tpl:44
+msgid "Add element below"
 msgstr ""
 
-#: include/functions_setup.inc:229
-msgid ""
-"Support for Kolab disabled, no schema seems to be installed, setting mail-"
-"method to cyrus"
+#: include/sieve/templates/element_redirect.tpl:18
+msgid "Redirect mail to following recipients"
 msgstr ""
 
-#: include/functions_setup.inc:236
-msgid "Support for Kolab enabled"
+#: include/sieve/templates/element_fileinto.tpl:4
+msgid "Move mail into folder"
 msgstr ""
 
-#: include/functions_setup.inc:254 include/functions.inc:1137
-msgid "OK"
+#: include/sieve/templates/element_fileinto.tpl:8
+msgid "Select from list"
 msgstr ""
 
-#: include/functions_setup.inc:257
-msgid "Ignored"
+#: include/sieve/templates/element_fileinto.tpl:10
+msgid "Manual selection"
 msgstr ""
 
-#: include/functions_setup.inc:259
-msgid "Failed"
+#: include/sieve/templates/element_fileinto.tpl:18
+msgid "Folder"
 msgstr ""
 
-#: include/functions_setup.inc:276
-msgid "PHP setup inspection"
+#: include/sieve/templates/element_discard.tpl:9
+msgid "Discard message"
 msgstr ""
 
-#: include/functions_setup.inc:278
-msgid "Checking for PHP version (>=4.1.0)"
+#: include/sieve/templates/element_envelope.tpl:16
+#: include/sieve/templates/element_envelope.tpl:105
+#: include/sieve/class_sieveManagement.inc:604
+msgid "Envelope"
 msgstr ""
 
-#: include/functions_setup.inc:279
-msgid ""
-"PHP must be of version 4.1.0 or above for some functions and known bugs in "
-"PHP language."
+#: include/sieve/templates/element_boolean.tpl:8
+msgid "update"
 msgstr ""
 
-#: include/functions_setup.inc:282
-msgid "Checking if register_globals is set to 'off'"
+#: include/sieve/templates/edit_frame_base.tpl:12
+msgid "View structured"
 msgstr ""
 
-#: include/functions_setup.inc:283
-msgid ""
-"register_globals is a PHP mechanism to register all global varibales to be "
-"accessible from scripts without changing the scope. This may be a security "
-"risk. GOsa will run in both modes."
+#: include/sieve/templates/edit_frame_base.tpl:14
+msgid "View source"
 msgstr ""
 
-#: include/functions_setup.inc:286
-msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
+#: include/sieve/templates/import_script.tpl:1
+msgid "Import sieve script"
 msgstr ""
 
-#: include/functions_setup.inc:287
+#: include/sieve/templates/import_script.tpl:2
 msgid ""
-"PHP uses this value for the garbage collector to delete old sessions, "
-"setting this value to one day will prevent loosing session and cookie  "
-"before they really timeout."
+"Please select the sieve script you want to import. Use the import button to "
+"import the script or the cancel button to abort."
 msgstr ""
 
-#: include/functions_setup.inc:290
-msgid "Checking for ldap module"
+#: include/sieve/templates/import_script.tpl:5
+msgid "Script to import"
 msgstr ""
 
-#: include/functions_setup.inc:291
-msgid "This is the main module used by GOsa and therefore really required."
+#: include/sieve/templates/element_stop.tpl:9
+msgid "Stop execution here"
 msgstr ""
 
-#: include/functions_setup.inc:294
-msgid "Checking for XML functions"
+#: include/sieve/templates/add_element.tpl:1
+msgid "Add a new element"
 msgstr ""
 
-#: include/functions_setup.inc:295
-msgid "XML functions are required to parse the configuration file."
+#: include/sieve/templates/add_element.tpl:2
+msgid "Please select the type of element you want to add"
 msgstr ""
 
-#: include/functions_setup.inc:298
-msgid "Checking for gettext support"
+#: include/sieve/templates/add_element.tpl:13 setup/setup_migrate.tpl:197
+msgid "Abort"
 msgstr ""
 
-#: include/functions_setup.inc:299
-msgid "Gettext support is required for internationalized GOsa."
+#: include/sieve/templates/element_allof.tpl:10
+#: include/sieve/class_sieveManagement.inc:607
+msgid "All of"
 msgstr ""
 
-#: include/functions_setup.inc:302
-msgid "Checking for iconv support"
+#: include/sieve/templates/object_test_container.tpl:6
+msgid "Add object"
 msgstr ""
 
-#: include/functions_setup.inc:303
-msgid ""
-"This module is used by GOsa to convert samba munged dial informations and is "
-"therefore required."
+#: include/sieve/templates/management.tpl:1
+msgid "List of sieve scripts"
 msgstr ""
 
-#: include/functions_setup.inc:306
-msgid "Checking for mhash module"
+#: include/sieve/templates/management.tpl:5
+msgid ""
+"Connection to the sieve server could not be established, the "
+"authentification attribute is empty."
 msgstr ""
 
-#: include/functions_setup.inc:307
+#: include/sieve/templates/management.tpl:6
 msgid ""
-"To use SSHA encryption, you'll need this module. If you are just using crypt "
-"or md5 encryption, ignore this message. GOsa will run without it."
+"Please verfiy that the attributes uid and mail are not empty and try again."
+msgstr ""
+
+#: include/sieve/templates/management.tpl:12
+msgid "Connection to the sieve server could not be established."
 msgstr ""
 
-#: include/functions_setup.inc:310
-msgid "Checking for imap module"
+#: include/sieve/templates/management.tpl:15
+msgid "Possibly the sieve account has not been created yet."
 msgstr ""
 
-#: include/functions_setup.inc:311
+#: include/sieve/templates/management.tpl:19
 msgid ""
-"The IMAP module is needed to communicate with the IMAP server. It gets "
-"status informations, creates and deletes mail users."
+"Be careful. All your changes will be saved directly to sieve, if you use the "
+"save button below."
 msgstr ""
 
-#: include/functions_setup.inc:314
-msgid "Checking for getacl in imap"
+#: include/sieve/templates/management.tpl:22
+msgid "Create new script"
 msgstr ""
 
-#: include/functions_setup.inc:315
-msgid ""
-"The getacl support is needed for shared folder permissions. The standard "
-"IMAP module is not capable of reading acl's. You need a recend PHP version "
-"for this feature."
+#: include/sieve/templates/element_vacation.tpl:13
+msgid "Vacation Message"
 msgstr ""
 
-#: include/functions_setup.inc:318
-msgid "Checking for mysql module"
+#: include/sieve/templates/element_vacation.tpl:21
+msgid "Release interval"
 msgstr ""
 
-#: include/functions_setup.inc:319
-msgid "MySQL support is needed for reading GOfax reports from databases."
+#: include/sieve/templates/element_vacation.tpl:30
+msgid "Alternative sender addresses"
 msgstr ""
 
-#: include/functions_setup.inc:322
-msgid "Checking for cups module"
+#: include/sieve/templates/object_container_clear.tpl:8
+msgid "Move this object up one position"
 msgstr ""
 
-#: include/functions_setup.inc:323
-msgid ""
-"In order to read available printers from IPP protocol instead of printcap "
-"files, you've to install the CUPS module."
+#: include/sieve/templates/object_container_clear.tpl:12
+msgid "Move this object down one position"
 msgstr ""
 
-#: include/functions_setup.inc:326
-msgid "Checking for kadm5 module"
+#: include/sieve/templates/object_container_clear.tpl:16
+msgid "Remove this object"
 msgstr ""
 
-#: include/functions_setup.inc:327
-msgid ""
-"Managing users in kerberos requires the kadm5 module which is downloadable "
-"via PEAR network."
+#: include/sieve/templates/select_test_type.tpl:1
+msgid "Select the type of test you want to add"
 msgstr ""
 
-#: include/functions_setup.inc:330
-msgid "Checking for snmp Module"
+#: include/sieve/templates/select_test_type.tpl:3
+msgid "Available test types"
 msgstr ""
 
-#: include/functions_setup.inc:331
-msgid ""
-"Simple Network Management Protocol (SNMP) is required for client monitoring."
+#: include/sieve/class_sieveElement_If.inc:27
+msgid "Complete address"
 msgstr ""
 
-#: include/functions_setup.inc:368
-msgid "PHP detailed function inspection"
+#: include/sieve/class_sieveElement_If.inc:27
+#: include/sieve/class_sieveElement_If.inc:33
+msgid "Default"
 msgstr ""
 
-#: include/functions_setup.inc:372
-#, php-format
-msgid "Checking for function %s"
+#: include/sieve/class_sieveElement_If.inc:28
+msgid "Domain part"
 msgstr ""
 
-#: include/functions_setup.inc:373
-#, php-format
-msgid ""
-"The function %s is used by GOsa. There is no information if it's optional or "
-"required yet."
+#: include/sieve/class_sieveElement_If.inc:29
+msgid "Local part"
 msgstr ""
 
-#: include/functions_setup.inc:384
-msgid "Checking for some additional programms"
+#: include/sieve/class_sieveElement_If.inc:33
+msgid "Case insensitive"
 msgstr ""
 
-#: include/functions_setup.inc:395
-msgid "Checking for GraphicsMagick (>=1.1.2)"
+#: include/sieve/class_sieveElement_If.inc:34
+msgid "Case sensitive"
 msgstr ""
 
-#: include/functions_setup.inc:396
-msgid ""
-"GraphicsMagick is used to convert user supplied images to fit the suggested "
-"size and the unified JPEG format."
+#: include/sieve/class_sieveElement_If.inc:35
+msgid "Numeric"
 msgstr ""
 
-#: include/functions_setup.inc:399
-msgid "Checking for ImageMagick (>=5.4.0)"
+#: include/sieve/class_sieveElement_If.inc:39
+msgid "is"
 msgstr ""
 
-#: include/functions_setup.inc:400
-msgid ""
-"ImageMagick is used to convert user supplied images to fit the suggested "
-"size and the unified JPEG format."
+#: include/sieve/class_sieveElement_If.inc:40
+msgid "regex"
 msgstr ""
 
-#: include/functions_setup.inc:404
-msgid "Checking imagick module for PHP"
+#: include/sieve/class_sieveElement_If.inc:41
+msgid "contains"
 msgstr ""
 
-#: include/functions_setup.inc:405
-msgid ""
-"Imagick is used to convert user supplied images to fit the suggested size "
-"and the unified JPEG format from PHP script."
+#: include/sieve/class_sieveElement_If.inc:42
+msgid "matches"
 msgstr ""
 
-#: include/functions_setup.inc:412
-msgid "Checking for fping utility"
+#: include/sieve/class_sieveElement_If.inc:43
+msgid "count"
 msgstr ""
 
-#: include/functions_setup.inc:413
-msgid ""
-"The fping utility is only used if you've got a thin client based terminal "
-"environment running."
+#: include/sieve/class_sieveElement_If.inc:44
+msgid "value is"
 msgstr ""
 
-#: include/functions_setup.inc:428
-msgid "Checking for a way to generate LM/NT password hashes"
+#: include/sieve/class_sieveElement_If.inc:48
+msgid "less than"
 msgstr ""
 
-#: include/functions_setup.inc:429
-msgid ""
-"In order to use SAMBA 2/3, you've to install some additional packages to "
-"generate password hashes."
+#: include/sieve/class_sieveElement_If.inc:49
+msgid "less or equal"
 msgstr ""
 
-#: include/functions_setup.inc:442
-msgid "php.ini check -> session.auto_register"
+#: include/sieve/class_sieveElement_If.inc:50
+msgid "equals"
 msgstr ""
 
-#: include/functions_setup.inc:443
-msgid ""
-"In Order to use GOsa without any trouble, the session.auto_register option "
-"in your php.ini must be set to 'Off'."
+#: include/sieve/class_sieveElement_If.inc:51
+msgid "greater or equal"
 msgstr ""
 
-#: include/functions_setup.inc:446
-msgid "php.ini check -> implicit_flush"
+#: include/sieve/class_sieveElement_If.inc:52
+#: include/sieve/class_sieveElement_If.inc:726
+#: include/sieve/class_sieveElement_If.inc:1059
+msgid "greater than"
 msgstr ""
 
-#: include/functions_setup.inc:447
-msgid ""
-"This option influences the Output handling. Turn this Option off, to "
-"increase performance."
+#: include/sieve/class_sieveElement_If.inc:53
+msgid "not equal"
 msgstr ""
 
-#: include/functions_setup.inc:454
-msgid "php.ini check -> max_execution_time"
+#: include/sieve/class_sieveElement_If.inc:102
+msgid "Can't save empty tests."
 msgstr ""
 
-#: include/functions_setup.inc:455
-msgid ""
-"The Execution time should be at least 30 seconds, because some actions may "
-"consume more time."
+#: include/sieve/class_sieveElement_If.inc:446
+msgid "emtpy"
 msgstr ""
 
-#: include/functions_setup.inc:462
-msgid "php.ini check -> memory_limit"
+#: include/sieve/class_sieveElement_If.inc:493
+msgid "Nothing specified right now"
 msgstr ""
 
-#: include/functions_setup.inc:463
-msgid ""
-"GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
-"Increase it for larger setups."
+#: include/sieve/class_sieveElement_If.inc:595
+msgid "Invalid type of address part."
 msgstr ""
 
-#: include/functions_setup.inc:467
-msgid "php.ini check -> expose_php"
+#: include/sieve/class_sieveElement_If.inc:605
+msgid "Invalid match type given."
 msgstr ""
 
-#: include/functions_setup.inc:468
-msgid ""
-"Increase the server security by setting expose_php to 'off'. PHP won't send "
-"any Information about the server you are running in this case."
+#: include/sieve/class_sieveElement_If.inc:621
+msgid "Invalid operator given."
 msgstr ""
 
-#: include/functions_setup.inc:472
-msgid "php.ini check -> magic_quotes_gpc"
+#: include/sieve/class_sieveElement_If.inc:638
+msgid "Please specify a valid operator."
 msgstr ""
 
-#: include/functions_setup.inc:473
+#: include/sieve/class_sieveElement_If.inc:654
 msgid ""
-"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
-"escape all quotes in strings in this case."
+"Invalid character found in address attribute. Quotes are not allowed here."
 msgstr ""
 
-#: include/functions_setup.inc:720 include/functions_setup.inc:831
+#: include/sieve/class_sieveElement_If.inc:669
 msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
+"Invalid character found in value attribute. Quotes are not allowed here."
 msgstr ""
 
-#: include/functions_setup.inc:734
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
+#: include/sieve/class_sieveElement_If.inc:727
+#: include/sieve/class_sieveElement_If.inc:1060
+msgid "lower than"
 msgstr ""
 
-#: include/functions_setup.inc:792
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
+#: include/sieve/class_sieveElement_If.inc:729
+#: include/sieve/class_sieveElement_If.inc:1062
+msgid "Megabyte"
 msgstr ""
 
-#: include/functions_setup.inc:836
-msgid "Can't set ldap protocol version 3."
+#: include/sieve/class_sieveElement_If.inc:730
+#: include/sieve/class_sieveElement_If.inc:1063
+msgid "Kilobyte"
 msgstr ""
 
-#: include/functions_setup.inc:841
-msgid ""
-"Could not bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
+#: include/sieve/class_sieveElement_If.inc:731
+#: include/sieve/class_sieveElement_If.inc:1064
+msgid "Bytes"
 msgstr ""
 
-#: include/functions_setup.inc:909
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
+#: include/sieve/class_sieveElement_If.inc:745
+msgid "Please select a valid match type in the list box below."
 msgstr ""
 
-#: include/functions_setup.inc:918
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
+#: include/sieve/class_sieveElement_If.inc:759
+msgid "Only numeric values are allowed here."
 msgstr ""
 
-#: include/functions_setup.inc:1092
-msgid ""
-"User and/or group could not be created, please check your configuration "
-"twice !"
+#: include/sieve/class_sieveElement_If.inc:769
+msgid "No valid unit selected"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
+#: include/sieve/class_sieveElement_If.inc:876
+msgid "Empty"
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/sieve/class_sieveElement_If.inc:1134
+#: include/sieve/class_sieveElement_If.inc:1164
+msgid "Click here to add a new test"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:44
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
+#: include/sieve/class_sieveElement_If.inc:1176
+msgid "Unhandled switch type"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:53
-msgid "Kerberos database communication failed!"
+#: include/sieve/class_My_Tree.inc:245
+msgid "Can't remove last element."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:60
-msgid "Changing password in kerberos database failed!"
+#: include/sieve/class_My_Tree.inc:658
+msgid "Require must be the first command in the script."
 msgstr ""
 
-#: include/functions_helpviewer.inc:43
-#, php-format
-msgid "XML error in guide.xml: %s at line %d"
+#: include/sieve/class_sieveElement_Redirect.inc:24
+#: setup/class_setupStep_Feedback.inc:179
+msgid "Please specify a valid email address."
 msgstr ""
 
-#: include/functions_helpviewer.inc:84
-msgid "No help available for this plugin."
+#: include/sieve/class_sieveElement_Redirect.inc:35
+msgid "Place a mail address here"
 msgstr ""
 
-#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
-msgid "previous"
+#: include/sieve/class_sieveElement_Comment.inc:21
+msgid "Your comment here"
 msgstr ""
 
-#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
-msgid "next"
+#: include/sieve/class_sieveManagement.inc:120
+#: include/sieve/class_sieveManagement.inc:247
+msgid "Parse failed"
 msgstr ""
 
-#: include/functions_helpviewer.inc:385
-#, php-format
-msgid "%s results for your search with the keyword %s"
+#: include/sieve/class_sieveManagement.inc:124
+#: include/sieve/class_sieveManagement.inc:251
+msgid "Parse successful"
 msgstr ""
 
-#: include/functions_helpviewer.inc:459
+#: include/sieve/class_sieveManagement.inc:161
 #, php-format
-msgid "%s%% hit rate in file %s"
+msgid ""
+"The specified mail server '%s' does not exist within the GOsa configuration."
 msgstr ""
 
-#: include/class_ppdManager.inc:13
-#, php-format
-msgid "PPD manager : The specified path '%s' doesn't exists."
+#: include/sieve/class_sieveManagement.inc:206
+msgid "You should specify a name for your new script."
 msgstr ""
 
-#: include/class_ppdManager.inc:144
-#, php-format
-msgid "Specified ppd file '%s' can't be opened for reading."
+#: include/sieve/class_sieveManagement.inc:211
+msgid "Only lower case names are allowed."
 msgstr ""
 
-#: include/class_ppdManager.inc:146
-#, php-format
-msgid "The required tmp file file '%s' can't be opened for writing."
+#: include/sieve/class_sieveManagement.inc:217
+msgid "Only alphabetical characters are allowed in script names."
 msgstr ""
 
-#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
-#, php-format
-msgid ""
-"Parsing PPD file %s failed - line too long. Trailing characters have been "
-"ignored"
+#: include/sieve/class_sieveManagement.inc:223
+msgid "The specified name is already in use."
 msgstr ""
 
-#: include/class_ppdManager.inc:178
-msgid "Nested groups are not supported!"
+#: include/sieve/class_sieveManagement.inc:309
+#: include/sieve/class_sieveManagement.inc:355
+#: include/sieve/class_sieveManagement.inc:685
+#: include/sieve/class_sieveManagement.inc:1045
+#: include/class_mail-methods-cyrus.inc:264
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: include/class_ppdManager.inc:182
-msgid "Group name not unique!"
+#: include/sieve/class_sieveManagement.inc:317
+#, php-format
+msgid "Can't activate sieve script on server. Server says '%s'."
 msgstr ""
 
-#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
-msgid "Symbol values are not supported yet!"
+#: include/sieve/class_sieveManagement.inc:360
+#, php-format
+msgid "Can't remove sieve script from server. Server says '%s'."
 msgstr ""
 
-#: include/class_ppdManager.inc:212
-msgid "Nested options are not supported!"
+#: include/sieve/class_sieveManagement.inc:372
+#, php-format
+msgid "You are going to remove the sieve script '%s' from your mail server."
 msgstr ""
 
-#: include/class_ppdManager.inc:237
-msgid "PickMany is not supported yet!"
+#: include/sieve/class_sieveManagement.inc:408
+msgid "Edited"
 msgstr ""
 
-#: include/class_ppdManager.inc:318
+#: include/sieve/class_sieveManagement.inc:415
 #, php-format
-msgid "Parsing PPD file %s failed - no information found."
+msgid "Please fix all errors before saving. Last error was: %s"
 msgstr ""
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
+#: include/sieve/class_sieveManagement.inc:442
+msgid "Specified file seems to be empty."
 msgstr ""
 
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
+#: include/sieve/class_sieveManagement.inc:444
+msgid "Upload failed. The temporary file can't be accessed."
 msgstr ""
 
-#: include/class_ldap.inc:456
+#: include/sieve/class_sieveManagement.inc:446 html/get_attachment.php:69
 #, php-format
-msgid "Creating copy of %s"
+msgid "Can't open file '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:459
-msgid "Processing"
+#: include/sieve/class_sieveManagement.inc:508
+#: include/sieve/class_sieveManagement.inc:728
+msgid "File into"
 msgstr ""
 
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
+#: include/sieve/class_sieveManagement.inc:532
+msgid "Failed to add new element."
 msgstr ""
 
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
+#: include/sieve/class_sieveManagement.inc:648
+msgid "This script is marked as active"
 msgstr ""
 
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
+#: include/sieve/class_sieveManagement.inc:653
+msgid "Script length"
 msgstr ""
 
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+#: include/sieve/class_sieveManagement.inc:657
+msgid "Remove script"
 msgstr ""
 
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
+#: include/sieve/class_sieveManagement.inc:666
+msgid "Activate script"
 msgstr ""
 
-#: include/class_ldap.inc:803
-#, php-format
-msgid "while operating on LDAP server %s"
+#: include/sieve/class_sieveManagement.inc:670
+msgid "Edit script"
 msgstr ""
 
-#: include/class_ldap.inc:999
+#: include/sieve/class_sieveManagement.inc:785
 #, php-format
+msgid "Can't add the specified element at the given position."
+msgstr ""
+
+#: include/sieve/class_sieveManagement.inc:1060
+msgid "Failed to save sieve script"
+msgstr ""
+
+#: include/sieve/class_sieveElement_Vacation.inc:148
+msgid "Alternative sender address must be a valid email addresses."
+msgstr ""
+
+#: include/sieve/class_sieveElement_Reject.inc:21
+msgid "Invalid character found, quotes are not allowed in a reject message."
+msgstr ""
+
+#: include/sieve/class_sieveElement_Reject.inc:37
+msgid "Your reject text here"
+msgstr ""
+
+#: include/sieve/class_sieveElement_Require.inc:73
+msgid "Please specify at least one valid requirement."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:40
+msgid "Warning: Account has an invalid mailserver string!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:53
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_ldap.inc:1012
+#: include/class_mail-methods-cyrus.inc:151
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:1028
+#: include/class_mail-methods-cyrus.inc:170
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
+#: include/class_mail-methods-cyrus.inc:196
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
+#: include/class_mail-methods-cyrus.inc:214
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
+#: include/class_mail-methods-cyrus.inc:277
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
+#: include/class_mail-methods-cyrus.inc:348
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
+#: include/class_mail-methods-cyrus.inc:352
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/php_setup.inc:71
-msgid "Generating this page caused the PHP interpreter to raise some errors!"
+#: include/class_debconfTemplate.inc:260
+msgid "This package has no debconf options."
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:380
-msgid "Toggle information"
+#: include/class_plugin.inc:404
+#, php-format
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/php_setup.inc:76
-msgid "PHP error"
+#: include/class_plugin.inc:555
+#, php-format
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/php_setup.inc:87
-msgid "class"
+#: include/class_plugin.inc:589 include/class_password-methods.inc:183
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/php_setup.inc:93
-msgid "function"
+#: include/class_plugin.inc:623
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/php_setup.inc:98
-msgid "static"
+#: include/class_plugin.inc:931
+#, php-format
+msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/php_setup.inc:102
-msgid "method"
+#: include/class_plugin.inc:938
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/php_setup.inc:135
-msgid "Trace"
+#: include/class_plugin.inc:952 include/class_plugin.inc:981
+msgid "Handle object tagging failed"
 msgstr ""
 
-#: include/php_setup.inc:136
-msgid "Line"
+#: include/class_plugin.inc:968
+#, php-format
+msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/php_setup.inc:137
-msgid "Arguments"
+#: include/class_password-methods.inc:167
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
+#: include/class_password-methods.inc:204
+#, php-format
+msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/functions.inc:298
+#: include/functions.inc:305
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:315
+#: include/functions.inc:322
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:336
+#: include/functions.inc:343
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:468
+#: include/functions.inc:475
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:478
+#: include/functions.inc:485
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf! LDAP server says '%s'."
+"entry in %s! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:500
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:519
+#: include/functions.inc:526
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:549
+#: include/functions.inc:556
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:559
+#: include/functions.inc:566
+#, php-format
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf!"
+"entry in %s!"
 msgstr ""
 
-#: include/functions.inc:567
+#: include/functions.inc:574
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:653
+#: include/functions.inc:660
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:655
+#: include/functions.inc:662
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:672
+#: include/functions.inc:679
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1115 include/functions.inc:1309
+#: include/functions.inc:1122 include/functions.inc:1316
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1116
+#: include/functions.inc:1123
 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:1124
+#: include/functions.inc:1131
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1133
-msgid "An error occured while processing your request"
+#: include/functions.inc:1140
+msgid "An error occurred while processing your request"
+msgstr ""
+
+#: include/functions.inc:1144
+msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1198
+#: include/functions.inc:1205
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1200
+#: include/functions.inc:1207
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1202
+#: include/functions.inc:1209
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1491
+#: include/functions.inc:1498
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1519
+#: include/functions.inc:1526
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1800
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1836
+#: include/functions.inc:1843
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions_dns.inc:166
-#, php-format
-msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+#: include/functions.inc:2245 include/functions.inc:2249
+msgid "Warning - base_hook is not available. Using default base."
 msgstr ""
 
-#: include/functions_dns.inc:171
-#, php-format
-msgid ""
-"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
-"zone."
+#: include/functions.inc:2255
+msgid "Warning - no base_hook defined. Using default base."
 msgstr ""
 
-#: include/class_tabs.inc:190
-#, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
+#: include/functions.inc:2280 setup/class_setupStep_Schema.inc:95
+msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+#: include/functions.inc:2306
+msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/class_pluglist.inc:115
+#: include/functions.inc:2313
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Used to lock currently edited entries to avoid multiple changes at the same "
+"time."
 msgstr ""
 
-#: include/class_pluglist.inc:129 include/class_pluglist.inc:130
-#: include/class_pluglist.inc:229
-msgid "Unknown"
-msgstr ""
-
-#: include/class_pluglist.inc:137 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+#: include/functions.inc:2356
+#, php-format
+msgid "The required objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:161
+#: include/functions.inc:2358
 #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "The optional objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:225
-msgid "Paste"
+#: include/functions.inc:2364
+#, php-format
+msgid "The required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:227
-msgid "Can't paste"
+#: include/functions.inc:2366
+#, php-format
+msgid "The optional objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/class_config.inc:71
+#: include/functions.inc:2370
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "Class(es) available"
 msgstr ""
 
-#: include/class_config.inc:207 html/index.php:207
-msgid "Can't bind to LDAP. Please contact the system administrator."
+#: include/functions.inc:2393
+msgid ""
+"You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
+"schema    configuration do not support this option."
 msgstr ""
 
-#: include/class_config.inc:485
-msgid "SID and/or RIDBASE missing in your configuration!"
+#: include/functions.inc:2394
+msgid ""
+"In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
+"be      AUXILIARY"
 msgstr ""
 
-#: html/setup.php:89
-#, php-format
+#: include/functions.inc:2398
 msgid ""
-"Directory '%s' specified as smarty compile directory is not accessible, "
-"please check existence and rights of this directory!"
+"You have disabled the rfc2307bis option on the 'ldap setup' step, but your "
+"schema   configuration do not support this option."
 msgstr ""
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
+#: include/functions.inc:2399
+msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: html/helpviewer.php:67
-msgid "Help browser"
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
 msgstr ""
 
-#: html/helpviewer.php:118
-msgid "There is no helpfile specified for this class"
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
 msgstr ""
 
-#: html/helpviewer.php:265
+#: include/class_ldap.inc:456
 #, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgid "Creating copy of %s"
 msgstr ""
 
-#: html/getxls.php:65
-msgid "Birthday"
+#: include/class_ldap.inc:459
+msgid "Processing"
 msgstr ""
 
-#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
-#: html/getxls.php:236
-msgid "Surname"
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: html/getxls.php:74
+#: include/class_ldap.inc:562 include/class_ldap.inc:579
 #, php-format
-msgid "User list of %s on %s"
+msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: html/getxls.php:94 html/getxls.php:227
-msgid "Members"
+#: include/class_ldap.inc:739
+#, php-format
+msgid ""
+"Autocreation of subtree failed. No objectClass found for attribute '%s'."
 msgstr ""
 
-#: html/getxls.php:104 html/getxls.php:295
+#: include/class_ldap.inc:787 include/class_ldap.inc:877
 #, php-format
-msgid "Groups of %s on %s"
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
 
-#: html/getxls.php:124 html/getxls.php:246
-msgid "Computers"
+#: include/class_ldap.inc:795
+#, php-format
+msgid "Creating subtree '%s' failed."
 msgstr ""
 
-#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
-#: html/getxls.php:356
-msgid "Common name"
+#: include/class_ldap.inc:816
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
 msgstr ""
 
-#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
-#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
+#: include/class_ldap.inc:946
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: html/getxls.php:156 html/getxls.php:314
+#: include/class_ldap.inc:948
 #, php-format
-msgid "Servers of %s on %s"
+msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: html/getxls.php:174
-msgid "Home postal address"
+#: include/class_ldap.inc:1144
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
 
-#: html/getxls.php:174
+#: include/class_ldap.inc:1157
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:1173
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:44
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:53
+msgid "Kerberos database communication failed!"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:60
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+
+#: include/functions_helpviewer.inc:43
+#, php-format
+msgid "XML error in guide.xml: %s at line %d"
+msgstr ""
+
+#: include/functions_helpviewer.inc:84
+msgid "No help available for this plugin."
+msgstr ""
+
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
+msgid "previous"
+msgstr ""
+
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
+msgid "next"
+msgstr ""
+
+#: include/functions_helpviewer.inc:385
+#, php-format
+msgid "%s results for your search with the keyword %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:459
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
+#: include/class_ppdManager.inc:13
+#, php-format
+msgid "PPD manager : The specified path '%s' doesn't exists."
+msgstr ""
+
+#: include/class_ppdManager.inc:144
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
+msgstr ""
+
+#: include/class_ppdManager.inc:146
+#, php-format
+msgid "The required tmp file file '%s' can't be opened for writing."
+msgstr ""
+
+#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
+#, php-format
+msgid ""
+"Parsing PPD file %s failed - line too long. Trailing characters have been "
+"ignored"
+msgstr ""
+
+#: include/class_ppdManager.inc:178
+msgid "Nested groups are not supported!"
+msgstr ""
+
+#: include/class_ppdManager.inc:182
+msgid "Group name not unique!"
+msgstr ""
+
+#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
+msgid "Symbol values are not supported yet!"
+msgstr ""
+
+#: include/class_ppdManager.inc:212
+msgid "Nested options are not supported!"
+msgstr ""
+
+#: include/class_ppdManager.inc:237
+msgid "PickMany is not supported yet!"
+msgstr ""
+
+#: include/class_ppdManager.inc:318
+#, php-format
+msgid "Parsing PPD file %s failed - no information found."
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:456
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
+msgstr ""
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr ""
+
+#: include/php_setup.inc:71
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr ""
+
+#: include/php_setup.inc:71 html/main.php:389
+msgid "Toggle information"
+msgstr ""
+
+#: include/php_setup.inc:76
+msgid "PHP error"
+msgstr ""
+
+#: include/php_setup.inc:87
+msgid "class"
+msgstr ""
+
+#: include/php_setup.inc:93
+msgid "function"
+msgstr ""
+
+#: include/php_setup.inc:98
+msgid "static"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "method"
+msgstr ""
+
+#: include/php_setup.inc:135
+msgid "Trace"
+msgstr ""
+
+#: include/php_setup.inc:136
+msgid "Line"
+msgstr ""
+
+#: include/php_setup.inc:137
+msgid "Arguments"
+msgstr ""
+
+#: include/class_tabs.inc:198
+#, php-format
+msgid "Delete process has been canceled by plugin '%s': %s"
+msgstr ""
+
+#: include/functions_dns.inc:169
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgstr ""
+
+#: include/functions_dns.inc:174
+#, php-format
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr ""
+
+#: include/functions_dns.inc:610
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_pluglist.inc:116
+#, php-format
+msgid ""
+"Your %s information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr ""
+
+#: include/class_pluglist.inc:130 include/class_pluglist.inc:131
+#: include/class_pluglist.inc:241
+msgid "Unknown"
+msgstr ""
+
+#: include/class_pluglist.inc:138 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:15 ihtml/themes/default/framework.tpl:17
+#: ihtml/themes/default/framework.tpl:29 ihtml/themes/default/framework.tpl:33
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:161
+#, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:225
+msgid "Paste"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:227
+msgid "Can't paste"
+msgstr ""
+
+#: include/class_config.inc:71
+#, php-format
+msgid "XML error in %s: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:208 html/index.php:207
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:510
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr ""
+
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+
+#: html/helpviewer.php:67
+msgid "Help browser"
+msgstr ""
+
+#: html/helpviewer.php:118
+msgid "There is no helpfile specified for this class"
+msgstr ""
+
+#: html/helpviewer.php:265
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
+#: html/getxls.php:65
+msgid "Birthday"
+msgstr ""
+
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+msgid "Surname"
+msgstr ""
+
+#: html/getxls.php:74
+#, php-format
+msgid "User list of %s on %s"
+msgstr ""
+
+#: html/getxls.php:94 html/getxls.php:227
+msgid "Members"
+msgstr ""
+
+#: html/getxls.php:104 html/getxls.php:295
+#, php-format
+msgid "Groups of %s on %s"
+msgstr ""
+
+#: html/getxls.php:124 html/getxls.php:246
+msgid "Computers"
+msgstr ""
+
+#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
+#: html/getxls.php:356
+msgid "Common name"
+msgstr ""
+
+#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
+#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr ""
+
+#: html/getxls.php:156 html/getxls.php:314
+#, php-format
+msgid "Servers of %s on %s"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Home postal address"
+msgstr ""
+
+#: html/getxls.php:174
 msgid "Mobile phone"
 msgstr ""
 
-#: html/getxls.php:174 html/getxls.php:236
-msgid "Postal address"
+#: html/getxls.php:174 html/getxls.php:236
+msgid "Postal address"
+msgstr ""
+
+#: html/getxls.php:174
+msgid "Function"
+msgstr ""
+
+#: html/getxls.php:177 html/getxls.php:247
+msgid "Adressbook"
+msgstr ""
+
+#: html/getxls.php:184 html/getxls.php:349
+#, php-format
+msgid "Adressbook of %s on %s"
+msgstr ""
+
+#: html/getxls.php:190
+msgid "Common Name"
+msgstr ""
+
+#: html/getxls.php:224
+msgid "Day of birth"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Email address"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Organizational unit"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Postal Code"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Surename"
+msgstr ""
+
+#: html/getxls.php:236
+msgid "Title"
+msgstr ""
+
+#: html/getxls.php:239
+msgid "Full"
+msgstr ""
+
+#: html/getxls.php:276
+#, php-format
+msgid "User List of %s on %s"
+msgstr ""
+
+#: html/getxls.php:330
+#, php-format
+msgid "Computers of %s on %s"
+msgstr ""
+
+#: html/index.php:49 html/index.php:349
+msgid "Session will not be encrypted."
+msgstr ""
+
+#: html/index.php:49 html/index.php:349
+msgid "Enter SSL session"
+msgstr ""
+
+#: html/index.php:117
+#, php-format
+msgid "GOsa configuration %s/%s is not readable. Aborted."
+msgstr ""
+
+#: html/index.php:138
+#, php-format
+msgid "Directory '%s' specified as compile directory is not accessible!"
+msgstr ""
+
+#: html/index.php:222
+msgid ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
+msgstr ""
+
+#: html/index.php:238
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgstr ""
+
+#: html/index.php:257 ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+
+#: html/index.php:265
+msgid "Please specify a valid username!"
+msgstr ""
+
+#: html/index.php:267
+msgid "Please specify your password!"
+msgstr ""
+
+#: html/index.php:274
+msgid "Please check the username/password combination."
+msgstr ""
+
+#: html/index.php:303
+msgid "Account locked. Please contact your system administrator."
+msgstr ""
+
+#: html/index.php:355
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
+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 ""
+
+#: html/getfax.php:53
+msgid "Could not connect to database server!"
+msgstr ""
+
+#: html/getfax.php:55
+msgid "Could not select database!"
+msgstr ""
+
+#: html/getfax.php:60 html/getfax.php:68
+msgid "Database query failed!"
+msgstr ""
+
+#: html/main.php:165
+msgid ""
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
+msgstr ""
+
+#: html/main.php:221
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+
+#: html/main.php:350
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr ""
+
+#: html/main.php:365
+msgid "Your password is about to expire, please change your password"
+msgstr ""
+
+#: html/main.php:389
+msgid ""
+"Generating this page caused the W3C          conformance checker to raise "
+"some errors!"
+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 ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your username and password to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
+msgid "Session conflict detected"
+msgstr ""
+
+#: ihtml/themes/altlinux/conflict.tpl:6
+msgid ""
+"Probably there's another active instance of your session. Multiple window "
+"operation is technical not possible and heavily depends on the browser "
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
+"possible. Pressing the 'Logout' button will close this session."
+msgstr ""
+
+#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+msgid ""
+"Ignoring this message will change/destroy the data you're currently editing, "
+"so please close multiple windows and log in again."
+msgstr ""
+
+#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+msgid "Logout"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_introduction.tpl:1
+#: ihtml/themes/default/setup_introduction.tpl:1
+msgid "Welcome to the GOsa setup!"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_introduction.tpl:4
+msgid ""
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic informations for your LDAP "
+"connectivity, we're going to check your LDAP setup."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+
+#: ihtml/themes/altlinux/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:19
+msgid "Main"
+msgstr ""
+
+#: ihtml/themes/altlinux/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:24
+msgid "Help"
+msgstr ""
+
+#: ihtml/themes/altlinux/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:30 ihtml/themes/default/framework.tpl:34
+msgid "Sign out"
+msgstr ""
+
+#: ihtml/themes/altlinux/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:43
+msgid "Signed in:"
+msgstr ""
+
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr ""
+
+#: ihtml/themes/altlinux/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the 'Remove' button."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step2.tpl:1
+#: ihtml/themes/altlinux/setup_step3.tpl:1
+#: ihtml/themes/altlinux/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+msgid "Setup continued..."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
+msgid ""
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4
+msgid ""
+"Now we're going include your LDAP server and create an initial "
+"configuration. After you've entered the server URI below, a quick check is "
+"performed if required LDAP schemas are in place. Samba versions are "
+"autodetected by the installed objectclasses. Details on how your LDAP tree "
+"is organized will be asked later on."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10
+msgid ""
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"(Example: ldap://your.server:389)."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2
+msgid ""
+"The following fields allow the basic configuration of GOsa's behaviour and "
+"affect various properties in your main configuration."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7
+msgid "Enter a description for the location you're configuring here"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11 setup/setup_ldap.tpl:29
+msgid "Location name"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18
+msgid ""
+"GOsa always acts as admin and manages access rights internally. This is a "
+"workaround till OpenLDAP's in directory ACI's are fully implemented. For "
+"this to work, we need the admin DN and the corresponding password."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 setup/setup_ldap.tpl:73
+msgid "Admin DN"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 setup/setup_ldap.tpl:92
+msgid "Admin password"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 setup/setup_config1.tpl:211
+msgid ""
+"Some basic LDAP parameters are tunable and affect the locations where GOsa "
+"saves people and groups, including the way accounts get created. Check the "
+"values below if the fit your needs."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39
+msgid "Base "
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43
+#: setup/class_setupStep_Config1.inc:121
+msgid "People storage ou"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47
+msgid "People dn attribute"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55
+#: setup/class_setupStep_Config1.inc:125
+msgid "Group storage ou"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59
+msgid "ID base for users/groups"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 setup/setup_config1.tpl:209
+msgid ""
+"GOsa supports several encryption types for your passwords. Normally this is "
+"adjustable via user templates, but you can specify a default method to be "
+"used here, too."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72
+msgid "Encryption algorithm"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83
+msgid ""
+"GOsa has modular support for several mail methods. These methods provide "
+"interfaces to users mailboxes and general handling for quotas. You can "
+"choose the dummy plugin to leave all your mail settings untouched."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 setup/setup_config2.tpl:99
+msgid "Mail method"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:99
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it  could be a security risk)  "
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:103
+#: ihtml/themes/default/setup_step4.tpl:104
+msgid "Display PHP errors"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:106
+#: ihtml/themes/default/setup_step4.tpl:107
+msgid "true"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:107
+#: ihtml/themes/default/setup_step4.tpl:108
+msgid "false"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_step4.tpl:115
+#: ihtml/themes/default/setup_step4.tpl:115
+msgid "Check"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1
+msgid "Setup finished"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3
+msgid ""
+"Basically the setup is finished. You can check the result of the schema "
+"check here and download the autogenerated gosa.conf below."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7
+msgid "Schema Configuration"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:12
+#: ihtml/themes/default/setup_finish.tpl:12
+msgid "Configuration File"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:14
+#: ihtml/themes/default/setup_finish.tpl:14
+msgid ""
+"GOsa setup has collected all data needed to create an initial configuration "
+"file. Save the the link below as your gosa.conf and place that file in /etc/"
+"gosa. Change it as needed."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:17
+#: ihtml/themes/default/setup_finish.tpl:17 setup/setup_finish.tpl:13
+msgid "Download configuration"
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_finish.tpl:20
+#: ihtml/themes/default/setup_finish.tpl:20
+msgid ""
+"After placing the file under /etc/gosa, place make sure that the webserver "
+"user is able to read gosa.conf, while other users shouldn't. You may want to "
+"execute these commands to achieve this requirement:"
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' button."
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:2
+msgid "Object to be pasted"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:6
+msgid ""
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:22
+msgid "Operation complete"
+msgstr ""
+
+#: ihtml/themes/default/conflict.tpl:6
+msgid ""
+"Probably there's another active instance of your session. Multiple window "
+"operation is technical not possible and heavily depends on the browser "
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
+"possible. Pressing the 'Logout'button will close this session."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:4
+msgid ""
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic information for your LDAP "
+"connectivity, we're going to check your LDAP setup."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:17
+msgid ""
+"You can also use the new and more-advanced way of inspecting your PHP-"
+"installation. It will give you information about the exact function that "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:10
+msgid "Sign in again"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+msgid "Old Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+msgid "New Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+msgid "Verify Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:51
+msgid "Change Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:52
+msgid "Click here to Change your password"
+msgstr ""
+
+#: ihtml/themes/default/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+
+#: setup/class_setup.inc:210
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:53
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:54
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:55
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"GOsa."
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:99
+#, php-format
+msgid "Anonymous bind failed on server '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:101
+#, php-format
+msgid "Bind as user '%s' failed on server '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:106
+#, php-format
+msgid "Anonymous bind on server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:107
+msgid "Please specify user and password."
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:109
+#, php-format
+msgid "Bind as user '%s' on server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:38
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:39
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:100
+msgid ""
+"Your configuration file is currently world readable. Please updated the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:102
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:111
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't. You may want to execute these commands to achieve this "
+"requirement:"
+msgstr ""
+
+#: setup/class_setupStep_License.inc:53 setup/class_setupStep_License.inc:54
+msgid "License"
+msgstr ""
+
+#: setup/class_setupStep_License.inc:55
+msgid "Terms and conditions for usage"
+msgstr ""
+
+#: setup/setup_ldap.tpl:7
+msgid "Please choose the LDAP user to be used by GOsa"
+msgstr ""
+
+#: setup/setup_ldap.tpl:25
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/setup_ldap.tpl:37
+msgid "Connection URL"
+msgstr ""
+
+#: setup/setup_ldap.tpl:45
+msgid "TLS connection"
+msgstr ""
+
+#: setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr ""
+
+#: setup/setup_ldap.tpl:69
+msgid "Authentication"
+msgstr ""
+
+#: setup/setup_ldap.tpl:77
+msgid "Select user"
+msgstr ""
+
+#: setup/setup_ldap.tpl:85
+msgid "Automatically append LDAP base to admin DN"
+msgstr ""
+
+#: setup/setup_ldap.tpl:100
+msgid "Schema based settings"
+msgstr ""
+
+#: setup/setup_ldap.tpl:104
+msgid "Use rfc2307bis compliant groups"
+msgstr ""
+
+#: setup/setup_ldap.tpl:116
+msgid "Current status"
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:40 setup/class_setupStep_Language.inc:41
+msgid "Language setup"
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:42
+msgid "This step allows you to select your preferred language."
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:47
+msgid "Automatic"
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:51
+msgid "Chinese"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:91
+msgid "UNIX accounts/groups"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:93
+msgid "Samba management"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:95
+msgid "Mailsystem management"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:97
+msgid "FAX system administration"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:99
+msgid "Asterisk administration"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:101
+msgid "System inventory"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:103
+msgid "System / Config management"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:111
+#: setup/class_setupStep_Feedback.inc:113
+msgid "Notification and feedback"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:112
+msgid "Get notifications or send feedback"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:140
+#, php-format
+msgid ""
+"Could not connect to feedback server (%s). There is possibly no connection "
+"to the internet."
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:147
+msgid ""
+"Error while sending your feedback. The service is possible temporary "
+"unavailable"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:149
+msgid "Feedback sucessfully send"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:183
+msgid ""
+"You should have enabled at least one option, to subscribe or send your "
+"feedback."
+msgstr ""
+
+#: setup/setup_frame.tpl:11
+msgid "GOsa setup wizard"
+msgstr ""
+
+#: setup/setup_frame.tpl:18
+msgid "Installation"
+msgstr ""
+
+#: setup/setup_frame.tpl:18
+msgid "Steps"
+msgstr ""
+
+#: setup/setup_finish.tpl:3
+msgid "Create your configuration file"
+msgstr ""
+
+#: setup/setup_finish.tpl:18
+msgid "Status: "
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:73 setup/class_setupStep_Config1.inc:74
+msgid "GOsa settings 1/3"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:75
+msgid "GOsa generic settings"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:117
+#, php-format
+msgid "The specified value for '%s' must be a numeric value"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:117 setup/setup_config1.tpl:85
+msgid "GID / UID min id"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:121 setup/class_setupStep_Config1.inc:125
+#, php-format
+msgid "Don't add a trailing comma to '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:129
+msgid "Uid base must be numeric"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:133
+msgid "The given password minimum length is not numeric."
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:136
+msgid "The given password differ value is not numeric."
+msgstr ""
+
+#: setup/class_setupStep_Config2.inc:74 setup/class_setupStep_Config2.inc:75
+msgid "GOsa settings 2/3"
+msgstr ""
+
+#: setup/class_setupStep_Config2.inc:76
+msgid "Customize special parameters"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+msgid "LDAP inspection"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:107
+msgid "Analyze your current LDAP for GOsa compatibility"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:113
+msgid "Checking for root object"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:119
+msgid "Checking permissions on LDAP database"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:125
+msgid "Checking for invisible deparmtments"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:131
+msgid "Checking for invisible users"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:137
+msgid "Checking for super administrator"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:143
+msgid "Checking for users outside the people tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:149
+msgid "Checking for groups outside the groups tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:155
+msgid "Checking for windows workstations outside the winstation tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:161
+msgid "Checking for duplicate uid numbers"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:167
+msgid "Checking for duplicate gid numbers"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:190 setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStep_Migrate.inc:301 setup/class_setupStep_Migrate.inc:362
+#: setup/class_setupStep_Migrate.inc:429 setup/class_setupStep_Migrate.inc:503
+#: setup/class_setupStep_Migrate.inc:587 setup/class_setupStep_Migrate.inc:717
+#: setup/class_setupStep_Migrate.inc:807
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:191 setup/class_setupStep_Migrate.inc:240
+#: setup/class_setupStep_Migrate.inc:302 setup/class_setupStep_Migrate.inc:363
+#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:504
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:718
+#: setup/class_setupStep_Migrate.inc:808
+msgid "Possibly the 'root object' is missing."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:213
+#, php-format
+msgid "Found %s duplicate values for attribute 'uidNumber'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:262
+#, php-format
+msgid "Found %s duplicate values for attribute 'gidNumber'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:317 setup/class_setupStep_Migrate.inc:517
+#: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:857
+#: setup/class_setupStep_Migrate.inc:1591
+#: setup/class_setupStep_Migrate.inc:1604
+msgid "Failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:319
+#, php-format
+msgid ""
+"Found %s winstations outside the predefined winstation department ou '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:320 setup/class_setupStep_Migrate.inc:598
+#: setup/class_setupStep_Migrate.inc:727
+msgid "Migrate"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:386
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:387 setup/class_setupStep_Migrate.inc:463
+msgid "Move"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:462
+#, php-format
+msgid "Found %s user(s) outside the configured tree '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:519 setup/class_setupStep_Migrate.inc:532
+#, php-format
+msgid ""
+"The specified user '%s' does not have full access to your ldap database."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:596
+#, php-format
+msgid "Found %s user(s) that will not be visible in GOsa."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:778
+#, php-format
+msgid ""
+"Failed to migrate the department '%s' into GOsa, error message is as follows "
+"'%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:726
+#, php-format
+msgid "Found %s department(s) that will not be visible in GOsa."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:858
+msgid "There is no GOsa administrator account inside your LDAP."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:918
+msgid "Appending user to group administrational group:"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:919
+msgid "Before"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:922
+msgid "After"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:929 setup/class_setupStep_Migrate.inc:958
+#, php-format
+msgid "Adding acls for user '%s' failed, ldap says '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:949
+msgid "Creating new administrational group:"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:985
+msgid "Specified passwords are empty or not equal."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:990
+msgid "Please specify a valid uid."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1032
+#, php-format
+msgid ""
+"Could not add administrative user, there is already an object with the same "
+"dn '%s' in your ldap database."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1070
+#: setup/class_setupStep_Migrate.inc:1118
+#: setup/class_setupStep_Migrate.inc:1166
+msgid "Couldn't move users to specified department."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1080
+msgid "Winstation will be moved from"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1080
+#: setup/class_setupStep_Migrate.inc:1128
+#: setup/class_setupStep_Migrate.inc:1176
+msgid "to"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1091
+#: setup/class_setupStep_Migrate.inc:1139
+msgid "Updating following references too"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1128
+msgid "Group will be moved from"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1176
+msgid "User will be moved from"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1186
+msgid "The following references will be updated"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1592
+msgid ""
+"The LDAP root object is missing. It is required to use your LDAP service."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1593
+#: setup/class_setupStep_Migrate.inc:1606
+msgid "Try to create root object"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1605
+msgid "Root object couldn't be created, you should try it on your own."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1895
+#, php-format
+msgid "Failed to copy '%s' to '%s'. LDAP says '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1898
+msgid "Something went wrong while copying dns."
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+msgid "GOsa settings 3/3"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:69
+msgid "Tweak some GOsa core behaviour"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:171
+msgid "Session lifetime must be a numeric value."
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:175
+msgid "Maximal ldap query time must be a numeric value. "
+msgstr ""
+
+#: setup/setup_language.tpl:3
+msgid "Please select the preferred language"
+msgstr ""
+
+#: setup/setup_language.tpl:5
+msgid ""
+"At this point, you can select the site wide default language. Choosing "
+"'automatic' will use the language requested by the browser. This setting can "
+"be overriden per user."
+msgstr ""
+
+#: setup/setup_language.tpl:9
+msgid "Please your preferred language here"
+msgstr ""
+
+#: setup/setup_feedback.tpl:8
+msgid "Subscribe to the gosa-announce mailinglist"
 msgstr ""
 
-#: html/getxls.php:174
-msgid "Function"
+#: setup/setup_feedback.tpl:11
+msgid ""
+"When checking this option, GOsa will try to connect http://oss.gonicus.de in "
+"order to subscribe you to the gosa-announce mailing list. You've to confirm "
+"this by mail."
 msgstr ""
 
-#: html/getxls.php:177 html/getxls.php:247
-msgid "Adressbook"
+#: setup/setup_feedback.tpl:43
+msgid "Send feedback to the GOsa project team"
 msgstr ""
 
-#: html/getxls.php:184 html/getxls.php:349
-#, php-format
-msgid "Adressbook of %s on %s"
+#: setup/setup_feedback.tpl:46
+msgid ""
+"When checking this option, GOsa will try to connect http://oss.gonicus.de in "
+"order to submit your form anonymously."
 msgstr ""
 
-#: html/getxls.php:190
-msgid "Common Name"
+#: setup/setup_feedback.tpl:52
+msgid "Did the setup procedure help you to get started?"
 msgstr ""
 
-#: html/getxls.php:224
-msgid "Day of birth"
+#: setup/setup_feedback.tpl:62
+msgid "If not, what problems did you encounter"
 msgstr ""
 
-#: html/getxls.php:236
-msgid "Email address"
+#: setup/setup_feedback.tpl:70
+msgid "Is this the first time you use GOsa?"
 msgstr ""
 
-#: html/getxls.php:236
-msgid "Organizational unit"
+#: setup/setup_feedback.tpl:76
+msgid "I use it since"
 msgstr ""
 
-#: html/getxls.php:236
-msgid "Postal Code"
+#: setup/setup_feedback.tpl:77
+msgid "Select the year since when you are using GOsa"
 msgstr ""
 
-#: html/getxls.php:236
-msgid "Surename"
+#: setup/setup_feedback.tpl:84
+msgid "What operating system / distribution do you use?"
 msgstr ""
 
-#: html/getxls.php:236
-msgid "Title"
+#: setup/setup_feedback.tpl:92
+msgid "What web server do you use?"
 msgstr ""
 
-#: html/getxls.php:239
-msgid "Full"
+#: setup/setup_feedback.tpl:100
+msgid "What PHP version do you use?"
 msgstr ""
 
-#: html/getxls.php:276
-#, php-format
-msgid "User List of %s on %s"
+#: setup/setup_feedback.tpl:108
+msgid "LDAP"
 msgstr ""
 
-#: html/getxls.php:330
-#, php-format
-msgid "Computers of %s on %s"
+#: setup/setup_feedback.tpl:112
+msgid "What kind of LDAP server(s) do you use?"
 msgstr ""
 
-#: html/index.php:49 html/index.php:333
-msgid "Session will not be encrypted."
+#: setup/setup_feedback.tpl:118
+msgid "How many objects are in your LDAP?"
 msgstr ""
 
-#: html/index.php:49 html/index.php:333
-msgid "Enter SSL session"
+#: setup/setup_feedback.tpl:125
+msgid "Features"
 msgstr ""
 
-#: html/index.php:117
-#, php-format
-msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
+#: setup/setup_feedback.tpl:128
+msgid "What features of GOsa do you use?"
 msgstr ""
 
-#: html/index.php:138
-#, php-format
-msgid "Directory '%s' specified as compile directory is not accessible!"
+#: setup/setup_feedback.tpl:138
+msgid "What features do you want to see in future versions of GOsa?"
+msgstr ""
+
+#: setup/setup_feedback.tpl:145
+msgid "Send feedback"
+msgstr ""
+
+#: setup/class_setupStep_Welcome.inc:38
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStep_Welcome.inc:39
+msgid "The welcome message"
+msgstr ""
+
+#: setup/class_setupStep_Welcome.inc:40
+msgid "Welcome to GOsa setup wizard"
+msgstr ""
+
+#: setup/setup_config1.tpl:2
+msgid "Look and feel"
+msgstr ""
+
+#: setup/setup_config1.tpl:6
+msgid "Theme"
+msgstr ""
+
+#: setup/setup_config1.tpl:15
+msgid "People and group storage"
+msgstr ""
+
+#: setup/setup_config1.tpl:18
+msgid "People DN attribute"
+msgstr ""
+
+#: setup/setup_config1.tpl:29
+msgid "People storage subtree"
+msgstr ""
+
+#: setup/setup_config1.tpl:38
+msgid "Group storage subtree"
+msgstr ""
+
+#: setup/setup_config1.tpl:47
+msgid "Include personal title in user DN"
+msgstr ""
+
+#: setup/setup_config1.tpl:58
+msgid "Relaxed naming policies"
+msgstr ""
+
+#: setup/setup_config1.tpl:69
+msgid "Automatic uids"
+msgstr ""
+
+#: setup/setup_config1.tpl:101
+msgid "Number base for people/groups"
+msgstr ""
+
+#: setup/setup_config1.tpl:109
+msgid "Hook for number base"
+msgstr ""
+
+#: setup/setup_config1.tpl:124
+msgid "Password settings"
+msgstr ""
+
+#: setup/setup_config1.tpl:128
+msgid "Password encryption algorithm"
+msgstr ""
+
+#: setup/setup_config1.tpl:139
+msgid "Password restrictions"
+msgstr ""
+
+#: setup/setup_config1.tpl:146 setup/setup_config1.tpl:150
+msgid "Password minimum length"
+msgstr ""
+
+#: setup/setup_config1.tpl:157 setup/setup_config1.tpl:161
+msgid "Different characters from old password"
+msgstr ""
+
+#: setup/setup_config1.tpl:170
+msgid "Password change hook"
+msgstr ""
+
+#: setup/setup_config1.tpl:186
+msgid "Use SASL for kerberos"
+msgstr ""
+
+#: setup/setup_config1.tpl:197
+msgid "Use account expiration"
 msgstr ""
 
-#: html/index.php:219
+#: setup/setup_config1.tpl:210
 msgid ""
-"GOsa cannot retrieve information about the installed schema files. Please "
-"make sure, that this is possible."
+"GOsa always acts as admin and manages access rights internally. This is a "
+"workaround till OpenLDAP's in directory ACI's are    fully implemented. For "
+"this to work, we need the admin DN and the corresponding password."
 msgstr ""
 
-#: html/index.php:227
+#: setup/setup_config1.tpl:212
 msgid ""
-"Your ldap setup contains old schema definitions. Please re-run the setup."
+"GOsa has modular support for several mail methods. These methods provide "
+"interfaces to users mailboxes and general handling    for quotas. You can "
+"choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: html/index.php:246 ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: setup/setup_config2.tpl:6
+msgid "Samba hash generator"
+msgstr ""
+
+#: setup/setup_config2.tpl:15
+msgid "Samba SID"
+msgstr ""
+
+#: setup/setup_config2.tpl:31
+msgid "RID base"
+msgstr ""
+
+#: setup/setup_config2.tpl:46
+msgid "Workstation container"
+msgstr ""
+
+#: setup/setup_config2.tpl:61
+msgid "Samba SID mapping"
+msgstr ""
+
+#: setup/setup_config2.tpl:70
+msgid "Additional GOsa settings"
+msgstr ""
+
+#: setup/setup_config2.tpl:74
+msgid "Enable Copy & Paste"
+msgstr ""
+
+#: setup/setup_config2.tpl:86
+msgid "Government mode"
+msgstr ""
+
+#: setup/setup_config2.tpl:113
+msgid "Vacation templates"
+msgstr ""
+
+#: setup/setup_config2.tpl:129
+msgid "Use Cyrus UNIX style"
+msgstr ""
+
+#: setup/setup_config3.tpl:2
+msgid "GOsa core settings"
+msgstr ""
+
+#: setup/setup_config3.tpl:6
+msgid "Disable primary group filter"
+msgstr ""
+
+#: setup/setup_config3.tpl:18
+msgid "Honour administrative units"
+msgstr ""
+
+#: setup/setup_config3.tpl:30
+msgid "Smarty compile directory"
+msgstr ""
+
+#: setup/setup_config3.tpl:39
+msgid "Path for PPD storage"
+msgstr ""
+
+#: setup/setup_config3.tpl:55
+msgid "Path for kiosk profile storage"
+msgstr ""
+
+#: setup/setup_config3.tpl:74
+msgid "Network resolv hook"
+msgstr ""
+
+#: setup/setup_config3.tpl:92
+msgid "Mail queue script"
+msgstr ""
+
+#: setup/setup_config3.tpl:110
+msgid "Notification script"
+msgstr ""
+
+#: setup/setup_config3.tpl:126
+msgid "Login and session"
+msgstr ""
+
+#: setup/setup_config3.tpl:129
+msgid "Enforce register_globals to be deactivated"
+msgstr ""
+
+#: setup/setup_config3.tpl:141
+msgid "Enforce encrypted connections"
+msgstr ""
+
+#: setup/setup_config3.tpl:153
+msgid "Warn if session is not encrypted"
+msgstr ""
+
+#: setup/setup_config3.tpl:165
+msgid "Session lifetime"
+msgstr ""
+
+#: setup/setup_config3.tpl:173
+msgid "Debugging"
+msgstr ""
+
+#: setup/setup_config3.tpl:177
+msgid "Show PHP errors"
+msgstr ""
+
+#: setup/setup_config3.tpl:189
+msgid "Maximum LDAP query time"
+msgstr ""
+
+#: setup/setup_config3.tpl:207
+msgid "Log LDAP statistics"
+msgstr ""
+
+#: setup/setup_config3.tpl:219
+msgid "Debug level"
+msgstr ""
+
+#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+msgid "Disabled"
+msgstr ""
+
+#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+msgid "Enabled"
+msgstr ""
+
+#: setup/setup_migrate.tpl:5
 msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"During the LDAP inspection, we're going to check for several common pitfalls "
+"that may occur when migration to GOsa base LDAP administration. You may want "
+"to fix the problems below, in order to provide smooth services."
 msgstr ""
 
-#: html/index.php:254
-msgid "Please specify a valid username!"
+#: setup/setup_migrate.tpl:33
+msgid "Check again"
 msgstr ""
 
-#: html/index.php:256
-msgid "Please specify your password!"
+#: setup/setup_migrate.tpl:37
+msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
 
-#: html/index.php:263
-msgid "Please check the username/password combination."
+#: setup/setup_migrate.tpl:39
+msgid ""
+"This dialog allows you to move the displayed windows workstations into a "
+"valid department"
 msgstr ""
 
-#: html/index.php:287
-msgid "Account locked. Please contact your system administrator."
+#: setup/setup_migrate.tpl:41
+msgid ""
+"Be careful with this tool, there may be references pointing to this "
+"workstations that can't be migrated."
+msgstr ""
+
+#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:120
+#: setup/setup_migrate.tpl:171 setup/setup_migrate.tpl:294
+#: setup/setup_migrate.tpl:347
+msgid "Select all"
+msgstr ""
+
+#: setup/setup_migrate.tpl:67
+msgid "Move selected windows workstations into the following GOsa department"
+msgstr ""
+
+#: setup/setup_migrate.tpl:72
+msgid "Move selected workstations"
+msgstr ""
+
+#: setup/setup_migrate.tpl:73
+msgid "What will be done here"
+msgstr ""
+
+#: setup/setup_migrate.tpl:85
+msgid "Move groups into configured group tree"
 msgstr ""
 
-#: html/index.php:339
+#: setup/setup_migrate.tpl:88
 msgid ""
-"Your browser has cookies disabled. Please enable cookies and reload this "
-"page before logging in!"
+"This dialog allows moving a couple of groups to the configured group tree. "
+"Doing this may straighten your LDAP service."
 msgstr ""
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
+#: setup/setup_migrate.tpl:91
+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."
 msgstr ""
 
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
+#: setup/setup_migrate.tpl:94
+msgid "Move selected groups into this group tree"
 msgstr ""
 
-#: html/getfax.php:53
-msgid "Could not connect to database server!"
+#: setup/setup_migrate.tpl:123 setup/setup_migrate.tpl:175
+#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
+msgid "Hide changes"
 msgstr ""
 
-#: html/getfax.php:55
-msgid "Could not select database!"
+#: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
+#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
+msgid "Show changes"
 msgstr ""
 
-#: html/getfax.php:60 html/getfax.php:68
-msgid "Database query failed!"
+#: setup/setup_migrate.tpl:138
+msgid "Move users into configured user tree"
 msgstr ""
 
-#: html/main.php:164
+#: setup/setup_migrate.tpl:140
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"This dialog allows moving a couple of users to the configured user tree. "
+"Doing this may straighten your LDAP service."
 msgstr ""
 
-#: html/main.php:206
-msgid "Warning: memory is getting low - please increase the memory_limit!"
+#: setup/setup_migrate.tpl:143
+msgid ""
+"Be careful with this option! There may be references pointing to these "
+"users. The GOsa setup can't migrate references, so you may want to cancel "
+"the migration in this case."
 msgstr ""
 
-#: html/main.php:341
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+#: setup/setup_migrate.tpl:146
+msgid "Move selected users into this people tree"
 msgstr ""
 
-#: html/main.php:356
-msgid "Your password is about to expire, please change your password"
+#: setup/setup_migrate.tpl:196
+msgid "Next"
+msgstr ""
+
+#: setup/setup_migrate.tpl:199
+msgid "Create a new GOsa administrator account"
 msgstr ""
 
-#: html/main.php:380
+#: setup/setup_migrate.tpl:202
 msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
+"This dialog will automatically add a new super administrator to your LDAP "
+"tree."
 msgstr ""
 
-#: html/get_attachment.php:47
+#: setup/setup_migrate.tpl:231
+msgid "Password (again)"
+msgstr ""
+
+#: setup/setup_migrate.tpl:259
 msgid ""
-"Can't connect to glpi database, there is no mysl extension available in your "
-"php setup."
+"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 "
+"migrate button below."
 msgstr ""
 
-#: html/get_attachment.php:55
+#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
 msgid ""
-"Can't connect to specified database, please check your glpi configuration."
+"If you want to know what will be done when migrating the selected entries, "
+"use the 'Show changes' button to see the LDIF."
 msgstr ""
 
-#: html/get_attachment.php:64
-msgid "Can't get specified attachment file, there is no entry with this id."
+#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
+msgid "Current"
 msgstr ""
 
-#: html/get_attachment.php:69
-#, php-format
-msgid "Can't open file '%s'."
+#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
+msgid "After migration"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: setup/setup_migrate.tpl:314
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
+"The listed users are currenlty invisble in the GOsa user interface. If you "
+"want to change this for a couple of users, just select them and use the "
+"'Migrate' button below."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
+#: setup/class_setupStep_Schema.inc:40 setup/class_setupStep_Schema.inc:41
+msgid "LDAP schema check"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
+#: setup/class_setupStep_Schema.inc:42
+msgid "Perform test on your current LDAP schema"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: setup/class_setupStep_Checks.inc:38 setup/class_setupStep_Checks.inc:39
+msgid "Installation check"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:40
+msgid "Basic checks for PHP version and required extensions."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:64
+msgid "Checking PHP version"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:65
+#, php-format
+msgid "PHP must be of version %s / %s or above."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:66
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"GOsa requires functionality that is not available (or buggy) in older PHP "
+"versions. Please update to a supported version."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your username and password to log in"
+#: setup/class_setupStep_Checks.inc:72
+msgid "Checking for LDAP support"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
+#: setup/class_setupStep_Checks.inc:73
+msgid "This is the main extension used by GOsa and therefore really required."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
+#: setup/class_setupStep_Checks.inc:74
+msgid ""
+"The ldap extension (php4-ldap/php5-ldap) is required to communicate with "
+"your LDAP server."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
+#: setup/class_setupStep_Checks.inc:80
+msgid "Checking for gettext support"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
-msgid "Session conflict detected"
+#: setup/class_setupStep_Checks.inc:81
+msgid "Gettext support is required for internationalization."
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:6
+#: setup/class_setupStep_Checks.inc:82 setup/class_setupStep_Checks.inc:90
+msgid "Please make sure that the extension is activated."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:88
+msgid "Checking for iconv support"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:89
 msgid ""
-"Probably there's another active instance of your session. Multiple window "
-"operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the 'Logout' button will close this session."
+"This module is used by GOsa to convert samba munged dial informations and is "
+"therefore required. "
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:96
+msgid "Checking for mhash support"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: setup/class_setupStep_Checks.inc:97
+msgid "You'll need this module to make use of SSHA encryption"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:98
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"The mhash module for PHP 4/5 is not available.Please install php4-mhash/php5-"
+"mhash."
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
-msgid "Logout"
+#: setup/class_setupStep_Checks.inc:104
+msgid "Checking for IMAP support"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
+#: setup/class_setupStep_Checks.inc:105
+msgid ""
+"The IMAP module is needed to communicate with the IMAP server. GOsa "
+"retrieves status information, creates and deletes mail users, etc."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: setup/class_setupStep_Checks.inc:106
 msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+"This module is used to communicate with your mail server. Please install "
+"php4-imap/php5-imap."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
+#: setup/class_setupStep_Checks.inc:112
+msgid "Checking for getacl in IMAP implementation"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: setup/class_setupStep_Checks.inc:113
 msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+"The getacl support is needed to handle shared folder permissions. Old IMAP "
+"extensions are not capable of reading acl's. You need a recent PHP version "
+"to use this feature."
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
-msgid "Main"
+#: setup/class_setupStep_Checks.inc:120
+msgid "Checking for MySQL support"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
-msgid "Help"
+#: setup/class_setupStep_Checks.inc:121
+msgid ""
+"MySQL support is needed to communicate with several supported databases."
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
-msgid "Sign out"
+#: setup/class_setupStep_Checks.inc:122
+msgid ""
+"This module is required to communicate with database servers (GOfax, "
+"asterisk, GLPI, etc.). Please install php4-mysql/php5-mysql"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
-msgid "Signed in:"
+#: setup/class_setupStep_Checks.inc:128
+msgid "Checking for kadm5 support"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
+#: setup/class_setupStep_Checks.inc:129
+msgid ""
+"Managing users in kerberos requires the kadm5 module which is downloadable "
+"via PEAR network."
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:9
+#: setup/class_setupStep_Checks.inc:130
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the 'Remove' button."
+"This module is required to manage user in kerberos, it is downloadable via "
+"PEAR network"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
+#: setup/class_setupStep_Checks.inc:136
+msgid "Checking for SNMP support"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: setup/class_setupStep_Checks.inc:137
 msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
+"The simple network management protocol is needed to get status information "
+"from clients."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
+#: setup/class_setupStep_Checks.inc:138
 msgid ""
-"Now we're going include your LDAP server and create an initial "
-"configuration. After you've entered the server URI below, a quick check is "
-"performed if required LDAP schemas are in place. Samba versions are "
-"autodetected by the installed objectclasses. Details on how your LDAP tree "
-"is organized will be asked later on."
+"This module is required for client monitoring. Please install php4-snmp/php5-"
+"snmp."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
-msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"(Example: ldap://your.server:389)."
+#: setup/class_setupStep_Checks.inc:144
+msgid "Checking for CUPS support"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2
+#: setup/class_setupStep_Checks.inc:145
 msgid ""
-"The following fields allow the basic configuration of GOsa's behaviour and "
-"affect various properties in your main configuration."
+"In order to read available printers via the IPP protocol instead of printcap "
+"files, you've to install the CUPS module."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7
-msgid "Enter a description for the location you're configuring here"
+#: setup/class_setupStep_Checks.inc:154
+msgid "Checking for fping utility"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11
-msgid "Location name"
+#: setup/class_setupStep_Checks.inc:155
+msgid ""
+"The fping utility is used if you've got a thin client based terminal "
+"environment."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18
+#: setup/class_setupStep_Checks.inc:156
 msgid ""
-"GOsa always acts as admin and manages access rights internally. This is a "
-"workaround till OpenLDAP's in directory ACI's are fully implemented. For "
-"this to work, we need the admin DN and the corresponding password."
+"The fping utility is only used in thin client based terminal environment."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23
-msgid "Admin DN"
+#: setup/class_setupStep_Checks.inc:171
+msgid "SAMBA password hash generation"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
+#: setup/class_setupStep_Checks.inc:172
+msgid ""
+"In order to use SAMBA 2/3 passwords, you've to install additional packages "
+"to generate password hashes."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34
+#: setup/class_setupStep_Checks.inc:173
 msgid ""
-"Some basic LDAP parameters are tunable and affect the locations where GOsa "
-"saves people and groups, including the way accounts get created. Check the "
-"values below if the fit your needs."
+"In order to use SAMBA 2/3 you've to install additional perl libraries. Take "
+"a look at mkntpasswd."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39
-msgid "Base "
+#: setup/class_setupStep_Checks.inc:183 setup/class_setupStep_Checks.inc:202
+#: setup/class_setupStep_Checks.inc:218 setup/class_setupStep_Checks.inc:234
+#: setup/class_setupStep_Checks.inc:251
+msgid "Off"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43
-msgid "People storage ou"
+#: setup/class_setupStep_Checks.inc:184
+msgid ""
+"register_globals is a PHP mechanism to register all global variables to be "
+"accessible from scripts without changing the scope. This may be a security "
+"risk."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47
-msgid "People dn attribute"
+#: setup/class_setupStep_Checks.inc:185
+msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55
-msgid "Group storage ou"
+#: setup/class_setupStep_Checks.inc:193
+msgid "PHP uses this value for the garbage collector to delete old sessions."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59
-msgid "ID base for users/groups"
+#: setup/class_setupStep_Checks.inc:194
+msgid ""
+"Setting this value to one day will prevent loosing session and cookies "
+"before they really timeout."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67
+#: setup/class_setupStep_Checks.inc:195
 msgid ""
-"GOsa supports several encryption types for your passwords. Normally this is "
-"adjustable via user templates, but you can specify a default method to be "
-"used here, too."
+"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
+"higher."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72
-msgid "Encryption algorithm"
+#: setup/class_setupStep_Checks.inc:203
+msgid ""
+"In Order to use GOsa without any trouble, the session.auto_register option "
+"in your php.ini should be set to 'Off'."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83
+#: setup/class_setupStep_Checks.inc:204
+msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:211
 msgid ""
-"GOsa has modular support for several mail methods. These methods provide "
-"interfaces to users mailboxes and general handling for quotas. You can "
-"choose the dummy plugin to leave all your mail settings untouched."
+"GOsa needs at least 32MB of memory. Setting it below this limit may cause "
+"errors that are not reproducable! Increase it for larger setups."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88
-msgid "Mail method"
+#: setup/class_setupStep_Checks.inc:212
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: setup/class_setupStep_Checks.inc:219
 msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it  could be a security risk)  "
+"This option influences the PHP output handling. Turn this Option off, to "
+"increase performance."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:103
-#: ihtml/themes/default/setup_step4.tpl:104
-msgid "Display PHP errors"
+#: setup/class_setupStep_Checks.inc:220
+msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:106
-#: ihtml/themes/default/setup_step4.tpl:107
-msgid "true"
+#: setup/class_setupStep_Checks.inc:227
+msgid "The Execution time should be at least 30 seconds."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:107
-#: ihtml/themes/default/setup_step4.tpl:108
-msgid "false"
+#: setup/class_setupStep_Checks.inc:228
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:115
-#: ihtml/themes/default/setup_step4.tpl:115
-msgid "Check"
+#: setup/class_setupStep_Checks.inc:235
+msgid ""
+"Increase the server security by setting expose_php to 'off'. PHP won't send "
+"any information about the server you are running in this case."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
-msgid "Setup finished"
+#: setup/class_setupStep_Checks.inc:236
+msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
+#: setup/class_setupStep_Checks.inc:242
+msgid "On"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:243
 msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
+"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
+"escape all quotes in strings in this case."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
-msgid "Schema Configuration"
+#: setup/class_setupStep_Checks.inc:244
+msgid "Search for 'magic_quotes_gpc' in your php.ini and set it to 'On'."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:12
-#: ihtml/themes/default/setup_finish.tpl:12
-msgid "Configuration File"
+#: setup/class_setupStep_Checks.inc:252
+msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:14
-#: ihtml/themes/default/setup_finish.tpl:14
+#: setup/class_setupStep_Checks.inc:253
 msgid ""
-"GOsa setup has collected all data needed to create an initial configuration "
-"file. Save the the link below as your gosa.conf and place that file in /etc/"
-"gosa. Change it as needed."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:17
-#: ihtml/themes/default/setup_finish.tpl:17
-msgid "Download configuration"
+#: setup/class_setupStep_Checks.inc:264
+msgid "Configuration writeable"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:20
-#: ihtml/themes/default/setup_finish.tpl:20
+#: setup/class_setupStep_Checks.inc:265
+msgid "The configuration file can't be written"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:266
+#, php-format
 msgid ""
-"After placing the file under /etc/gosa, place make sure that the webserver "
-"user is able to read gosa.conf, while other users shouldn't. You may want to "
-"execute these commands to achieve this requirement:"
+"GOsa reads its configuration from a file located in (%s/%s). The setup can "
+"write the configuration directly if it is writeable."
 msgstr ""
 
-#: ihtml/themes/default/islocked.tpl:9
+#: setup/setup_welcome.tpl:4
 msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the 'Edit anyway' button."
+"This seems to be the first time you start GOsa - we didn't find any "
+"configuration right now. This simple wizard intends to help you while "
+"setting it up."
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: setup/setup_welcome.tpl:8
+msgid "What will the wizard do for you?"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: setup/setup_welcome.tpl:11
+msgid "Create a basic, single site configuration"
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
+#: setup/setup_welcome.tpl:12
+msgid "Tries to find problems within your PHP and LDAP setup"
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:2
-msgid "Object to be pasted"
+#: setup/setup_welcome.tpl:13
+msgid "Let you choose from a set of basic and advanced configuration switches"
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:6
-msgid ""
-"Some values need to be unique in the complete directory while some "
-"combinations make no sense. GOsa shows the relevant attributes. Please "
-"maintain the values below to fullfill the policies."
+#: setup/setup_welcome.tpl:14
+msgid "Guided migration of existing LDAP trees"
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:22
-msgid "Operation complete"
+#: setup/setup_welcome.tpl:17
+msgid "What will the wizard NOT do for you?"
 msgstr ""
 
-#: ihtml/themes/default/conflict.tpl:6
-msgid ""
-"Probably there's another active instance of your session. Multiple window "
-"operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the 'Logout'button will close this session."
+#: setup/setup_welcome.tpl:20
+msgid "Find every possible configuration error"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic information for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+#: setup/setup_welcome.tpl:21
+msgid "Migrate every possible LDAP setup - create backup dumps!"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:17
+#: setup/setup_welcome.tpl:25
+msgid "To continue..."
+msgstr ""
+
+#: setup/setup_welcome.tpl:28
 msgid ""
-"You can also use the new and more-advanced way of inspecting your PHP-"
-"installation. It will give you information about the exact function that "
-"could not be found (functions that could be found are not mentioned). This "
-"is useful if you know what you're doing."
+"For security reasons you need to authenticate for the installation by "
+"creating the file '/tmp/gosa.auth', containing the current session ID on the "
+"servers local filesystem. This can be done by executing the following "
+"command:"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
+#: setup/setup_welcome.tpl:34
+msgid "Click the 'Continue' button when you've finished."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
+#: setup/setup_checks.tpl:9
+msgid "PHP module and extension checks"
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
+#: setup/setup_checks.tpl:41 setup/setup_checks.tpl:103
+msgid "GOsa will NOT run without fixing this."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
+#: setup/setup_checks.tpl:45 setup/setup_checks.tpl:107
+msgid "GOsa will run without fixing this."
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:15
-msgid "Your Password has expired !! Choose a new Password"
+#: setup/setup_checks.tpl:67
+msgid "PHP setup configuration"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:23
-#: ihtml/themes/default/accountexpired.tpl:27
-msgid "Old Password"
+#: setup/setup_checks.tpl:67
+msgid "show information"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:32
-#: ihtml/themes/default/accountexpired.tpl:36
-msgid "New Password"
+#: setup/setup_schema.tpl:3
+msgid "Schema specific settings"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:41
-#: ihtml/themes/default/accountexpired.tpl:45
-msgid "Verify Password"
+#: setup/setup_schema.tpl:7
+msgid "Enable schema validation when logging in"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:51
-msgid "Change Password"
+#: setup/setup_schema.tpl:16
+msgid "Check status"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:52
-msgid "Click here to Change your password"
+#: setup/setup_schema.tpl:20
+msgid "Schema check succeeded"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
+#: setup/setup_schema.tpl:23
+msgid "Schema check failed"
 msgstr ""