X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=locale%2Fmessages.po;h=cf41c176734315d1fd1b968afc5f646d533f92d0;hb=bf6e99ebb13e00dc648dba59408ff958fc16670d;hp=46d10d4c3730acbff126a2ebd6720affa2ebe4fb;hpb=46a56ca87ee75cd5717943516727e2b4419b056a;p=gosa.git

diff --git a/locale/messages.po b/locale/messages.po
index 46d10d4c3..cf41c1767 100644
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -2,23 +2,24 @@
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:89 contrib/gosa.conf:98
-#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:115
-#: contrib/gosa.conf:124 contrib/gosa.conf:140 contrib/gosa.conf:149
-#: contrib/gosa.conf:154 contrib/gosa.conf:159 contrib/gosa.conf:164
-#: contrib/gosa.conf:169 contrib/gosa.conf:174
+#: 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:134 contrib/gosa.conf:144
+#: contrib/gosa.conf:149 contrib/gosa.conf:172 contrib/gosa.conf:177
+#: contrib/gosa.conf:182 contrib/gosa.conf:187
 #: 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
 #: plugins/gofax/blocklists/generic.tpl:1
+#: plugins/gofax/faxaccount/paste_generic.tpl:4
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
@@ -28,12 +29,15 @@ msgstr ""
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/goImapServer.tpl:1
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
@@ -42,162 +46,156 @@ msgstr ""
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:78 contrib/gosa.conf:90
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:411
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/groups/class_divListGroup.inc:156
+#: plugins/admin/users/class_divListUsers.inc:169
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:92
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:399
-#: plugins/admin/users/class_userManagement.inc:739
-#: plugins/admin/ogroups/tabs_ogroups.inc:72
-#: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:390
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
+#: plugins/admin/ogroups/tabs_ogroups.inc:178
+#: plugins/admin/ogroups/class_divListOGroup.inc:147
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
 #: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:402
-#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/admin/groups/class_divListGroup.inc:150
+#: plugins/admin/users/class_divListUsers.inc:177
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:81 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_divListUsers.inc:179
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:82 plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:380
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/generic.tpl:402
+#: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:743
-#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/users/class_divListUsers.inc:175
+#: 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:83 plugins/personal/generic/generic.tpl:232
-#: plugins/personal/generic/generic.tpl:370
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:392
+#: plugins/addons/addressbook/address_edit.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:408
-#: plugins/admin/users/class_userManagement.inc:741
-#: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/groups/class_divListGroup.inc:154
+#: plugins/admin/users/class_divListUsers.inc:173
+#: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:920
-#: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/ogroups/class_ogroupManagement.inc:378
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:84 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:85 contrib/gosa.conf:94 contrib/gosa.conf:100
-#: contrib/gosa.conf:105 contrib/gosa.conf:111 contrib/gosa.conf:120
-#: contrib/gosa.conf:136 contrib/gosa.conf:145 contrib/gosa.conf:150
-#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
-#: contrib/gosa.conf:170 contrib/gosa.conf:175
+#: 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:130 contrib/gosa.conf:140 contrib/gosa.conf:145
+#: contrib/gosa.conf:150 contrib/gosa.conf:173 contrib/gosa.conf:178
+#: contrib/gosa.conf:183 contrib/gosa.conf:188
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:93
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:99 plugins/admin/applications/generic.tpl:66
+#: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:73
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/systems/class_servRepository.inc:246
 #: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:87
+#: plugins/gofon/conference/generic.tpl:92
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:110 plugins/gofon/phoneaccount/class_phoneAccount.inc:652
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:92
+#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:135
+#: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:142
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
+#: contrib/gosa.conf:118 contrib/gosa.conf:136
+#: plugins/admin/ogroups/tabs_ogroups.inc:102
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:143
-#: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:926
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:497
+#: contrib/gosa.conf:119 contrib/gosa.conf:137
+#: plugins/personal/environment/environment.tpl:173
+#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/ogroups/class_ogroupManagement.inc:381
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:135 contrib/gosa.conf:144
-#: plugins/gofax/blocklists/generic.tpl:70
-#: plugins/gofax/blocklists/headpage.tpl:20
+#: contrib/gosa.conf:120 contrib/gosa.conf:129 contrib/gosa.conf:138
+#: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
-#: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
-#: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiSelectUser.tpl:20
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
+#: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:24
+#: ihtml/themes/default/MultiSelectWindow.tpl:64
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:125
-msgid "Databases"
-msgstr ""
-
-#: contrib/gosa.conf:126 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:26
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:132 contrib/gosa.conf:134
-#: plugins/admin/fai/faiPackage.tpl:29
-#: plugins/admin/systems/servRepositorySetup.tpl:1
-msgid "Repository"
+#: contrib/gosa.conf:128 contrib/gosa.conf:139
+msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:199
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:197 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:210 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -206,89 +204,95 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:211
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:199 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:212 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
-#: plugins/addons/ldapmanager/contentimport.tpl:49
+#: plugins/addons/ldapmanager/contentimport.tpl:50
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
-#: plugins/admin/applications/generic.tpl:94
+#: plugins/admin/applications/generic.tpl:101
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:213
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:204
+#: contrib/gosa.conf:217
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:208 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:221 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
-#: plugins/admin/applications/generic.tpl:92
+#: plugins/admin/applications/generic.tpl:99
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:212 plugins/admin/fai/class_faiManagement.inc:743
-#: plugins/admin/fai/class_faiManagement.inc:744
+#: contrib/gosa.conf:225 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:216 plugins/admin/fai/class_faiManagement.inc:736
-#: plugins/admin/fai/class_faiManagement.inc:737
+#: contrib/gosa.conf:229 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:220 plugins/admin/fai/class_faiManagement.inc:757
-#: plugins/admin/fai/class_faiManagement.inc:758
+#: contrib/gosa.conf:233 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:224 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:237 plugins/personal/environment/environment.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:228
+#: contrib/gosa.conf:238 plugins/admin/ogroups/tabs_ogroups.inc:107
+msgid "Summary"
+msgstr ""
+
+#: contrib/gosa.conf:242
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:264
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:284 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:285
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:286
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:287
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:288
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:289
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:290
 msgid "Italian"
 msgstr ""
 
+#: contrib/gosa.conf:291
+msgid "Polish"
+msgstr ""
+
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
@@ -304,13 +308,14 @@ msgstr ""
 #: plugins/personal/connectivity/class_kolabAccount.inc:6
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:7
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
 #: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
 #: plugins/gofax/faxreports/class_faxreport.inc:7
 #: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:11
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/addons/ldapmanager/class_csvimport.inc:7
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
@@ -319,14 +324,14 @@ msgstr ""
 #: plugins/addons/ldapmanager/class_export.inc:7
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:29
 #: plugins/admin/applications/class_applicationManagement.inc:26
 #: plugins/admin/departments/class_departmentManagement.inc:26
 #: plugins/admin/systems/class_systemManagement.inc:33
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
 msgid "This does something"
 msgstr ""
 
@@ -354,124 +359,153 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
+msgid "Saving nagios account failed"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:167
 msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
 msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:226
+msgid "Removing nagios account failed"
+msgstr ""
+
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
-#: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
+#: plugins/personal/posix/main.inc:110 plugins/personal/netatalk/main.inc:104
+#: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
 #: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:80
+#: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/fai/class_faiManagement.inc:583
-#: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:640
-#: plugins/admin/applications/class_applicationManagement.inc:308
-#: plugins/admin/departments/class_departmentManagement.inc:366
-#: plugins/admin/systems/class_systemManagement.inc:720
-#: plugins/admin/ogroups/class_ogroupManagement.inc:346
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+#: plugins/admin/fai/class_faiManagement.inc:542
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/ogroups/class_ogroupManagement.inc:332
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
-msgid "Finish"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+msgid "Ok"
 msgstr ""
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/main.inc:112 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/samba/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
 #: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialogNew.tpl:52
 #: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:120
-#: plugins/gofax/blocklists/generic.tpl:82
+#: plugins/gofax/blocklists/generic.tpl:91
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:585
-#: plugins/admin/fai/class_faiManagement.inc:590
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:249
+#: plugins/admin/fai/class_faiManagement.inc:548
+#: plugins/admin/fai/class_faiManagement.inc:553
 #: 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:45
+#: plugins/admin/fai/faiPackageNew.tpl:51
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
 #: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:345
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/groups/class_groupManagement.inc:336
 #: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:642
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/template.tpl:50 plugins/admin/users/remove.tpl:16
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:310
+#: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:368
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpiSelectUser.tpl:51
-#: plugins/admin/systems/glpi_edit_os.tpl:29
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/goKrbServer.tpl:21
+#: plugins/admin/systems/ServiceAddDialog.tpl:31
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:29
+#: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/goCupsServer.tpl:8
+#: plugins/admin/systems/goSyslogServer.tpl:8
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/goTerminalServer.tpl:19
+#: plugins/admin/systems/servRepository.tpl:66
+#: plugins/admin/systems/servkolab.tpl:205
+#: plugins/admin/systems/goNtpServer.tpl:24
+#: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/servdnseditzone.tpl:120
+#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/systems/goFaxServer.tpl:18
+#: plugins/admin/systems/servdns.tpl:23 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/goLogDBServer.tpl:18
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/goFonServer.tpl:26
+#: plugins/admin/systems/goMailServer.tpl:169
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/goGlpiServer.tpl:26
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:484
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
+#: plugins/admin/systems/glpiAttachmentPool.tpl:52
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: 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:268
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
 #: plugins/gofon/conference/remove.tpl:16
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/copyPasteDialog.tpl:15
+#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/snapshotdialog.tpl:50
+#: ihtml/themes/default/snapshotdialog.tpl:97
 msgid "Cancel"
 msgstr ""
 
 #: plugins/personal/nagios/main.inc:114 plugins/personal/mail/main.inc:114
-#: plugins/personal/posix/main.inc:120 plugins/personal/samba/main.inc:114
+#: plugins/personal/posix/main.inc:120 plugins/personal/netatalk/main.inc:111
+#: plugins/personal/samba/main.inc:114
 #: plugins/personal/environment/main.inc:114
 #: plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
@@ -481,8 +515,9 @@ msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
-#: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/posix/main.inc:122 plugins/personal/netatalk/main.inc:112
+#: plugins/personal/samba/main.inc:115
+#: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
@@ -490,18 +525,18 @@ msgstr ""
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdnseditzone.tpl:27
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
+#: plugins/admin/systems/printer.tpl:52
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/goShareServer.tpl:11
+#: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/glpiManufacturer.tpl:7
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:191
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
@@ -519,7 +554,7 @@ msgid "Alias"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
+#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
 msgid "Mail address"
 msgstr ""
 
@@ -540,9 +575,9 @@ msgid "Host notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:243
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:265
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Pager"
 msgstr ""
@@ -587,51 +622,32 @@ msgstr ""
 msgid "trigger all host commands"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
-#: plugins/admin/ogroups/mail.tpl:10
-msgid "Primary address"
-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:921
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:14
-msgid "Specify the mail server where the user will be hosted on"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
 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:418
-msgid "not defined"
+#: plugins/personal/mail/copypaste.tpl:7 plugins/personal/mail/generic.tpl:7
+#: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
+#: plugins/admin/ogroups/mail.tpl:10
+msgid "Primary address"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
+#: plugins/personal/mail/copypaste.tpl:13
+#: plugins/personal/mail/generic.tpl:119
+msgid "Forward messages to"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:44
+#: plugins/personal/mail/copypaste.tpl:25 plugins/personal/mail/generic.tpl:49
+#: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:51 plugins/admin/groups/mail.tpl:45
-#: plugins/admin/systems/phonesettings.tpl:170
-#: plugins/admin/systems/phonesettings.tpl:185
-msgid "List of alternative mail addresses"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/copypaste.tpl:43
+#: plugins/personal/mail/copypaste.tpl:61 plugins/personal/mail/generic.tpl:57
+#: plugins/personal/mail/generic.tpl:128
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:65
+#: plugins/personal/posix/posix_groups.tpl:79
+#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
@@ -639,105 +655,167 @@ msgstr ""
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
-#: plugins/personal/environment/environment.tpl:120
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:119
+#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:182
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
-#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:61
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiTemplate.tpl:41 plugins/admin/fai/faiHook.tpl:48
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:41
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:41
 #: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:533
-#: plugins/admin/groups/application.tpl:15
+#: plugins/admin/groups/class_groupMail.inc:540
+#: plugins/admin/groups/application.tpl:27
 #: plugins/admin/groups/group_objects.tpl:55
-#: plugins/admin/groups/generic.tpl:104
-#: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:61
-#: plugins/admin/systems/workstationStartup.tpl:81
-#: plugins/admin/systems/workstationStartup.tpl:100
-#: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/groups/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
+#: plugins/admin/groups/paste_mail.tpl:41
+#: plugins/admin/groups/mail_locals.tpl:66 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
+#: plugins/admin/systems/workstationStartup.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:124
+#: plugins/admin/systems/workstationStartup.tpl:143
+#: plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/goNtpServer.tpl:13
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/goShareServer.tpl:10
+#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/goMailServer.tpl:56
+#: plugins/admin/systems/goMailServer.tpl:79
+#: plugins/admin/systems/goMailServer.tpl:96
+#: plugins/admin/systems/goMailServer.tpl:120
+#: plugins/admin/systems/goMailServer.tpl:136
 #: plugins/admin/systems/glpiManufacturer.tpl:6
+#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:480
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/class_termDNS.inc:425
-#: plugins/admin/systems/class_termDNS.inc:446
-#: plugins/admin/systems/glpi.tpl:100
-#: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
-#: plugins/admin/systems/class_servDNSeditZone.inc:480
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:164
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/generic.tpl:39
+#: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:18
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
+#: plugins/personal/mail/copypaste.tpl:44
+#: plugins/personal/mail/generic.tpl:130
+#: 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/copypaste.tpl:45
+#: plugins/personal/mail/copypaste.tpl:62 plugins/personal/mail/generic.tpl:59
+#: plugins/personal/mail/generic.tpl:132
+#: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/environment/class_environment.inc:619
 #: plugins/personal/environment/environment.tpl:138
 #: plugins/personal/environment/environment.tpl:166
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/environment/environment.tpl:183
 #: plugins/personal/connectivity/kolab.tpl:20
-#: plugins/gofax/blocklists/generic.tpl:64
+#: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
 #: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 plugins/admin/fai/remove_branch.tpl:14
-#: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
-#: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
-#: plugins/admin/users/remove.tpl:14 plugins/admin/applications/remove.tpl:13
+#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/groups/mail.tpl:52
+#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:110 plugins/admin/groups/paste_mail.tpl:31
+#: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
+#: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/workstationStartup.tpl:62
-#: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
+#: plugins/admin/systems/workstationStartup.tpl:104
+#: plugins/admin/systems/workstationStartup.tpl:125
+#: plugins/admin/systems/terminal.tpl:101
+#: plugins/admin/systems/goNtpServer.tpl:14
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/goShareServer.tpl:12
+#: plugins/admin/systems/workstation.tpl:80
 #: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/class_termDNS.inc:474
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
-#: plugins/admin/systems/class_termDNS.inc:440
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_servDNSeditZone.inc:278
-#: plugins/admin/systems/class_servDNSeditZone.inc:474
-#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
+#: plugins/admin/ogroups/termgroup.tpl:25 plugins/admin/ogroups/generic.tpl:44
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13
+#: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr ""
 
+#: plugins/personal/mail/copypaste.tpl:55 plugins/personal/mail/generic.tpl:51
+#: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
+#: plugins/admin/systems/phonesettings.tpl:170
+#: plugins/admin/systems/phonesettings.tpl:185
+msgid "List of alternative mail addresses"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/servnfs.tpl:33
+#: plugins/admin/systems/class_systemManagement.inc:759
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:377
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:14
+msgid "Specify the mail server where the user will be hosted on"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
+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:485
+msgid "not defined"
+msgstr ""
+
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:67
 msgid "Mail options"
 msgstr ""
@@ -791,15 +869,6 @@ msgstr ""
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:119
-msgid "Forward messages to"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:130
-#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
-msgid "Add local"
-msgstr ""
-
 #: plugins/personal/mail/generic.tpl:140
 msgid "Advanced mail options"
 msgstr ""
@@ -820,197 +889,231 @@ msgstr ""
 msgid "disables all Mail options!"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
+#: plugins/personal/mail/class_mailAccount.inc:90
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
+#: plugins/personal/mail/class_mailAccount.inc:143
+#: plugins/admin/groups/class_groupMail.inc:173
+#, php-format
+msgid "Can't get quota information for '%s'."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/fai/faiProfileEntry.tpl:31
-#: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/servRepository.tpl:36
-#: plugins/admin/systems/glpiSelectUser.tpl:27
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
-msgid "Filters"
+#: plugins/personal/mail/class_mailAccount.inc:205
+msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:34
-#: plugins/gofax/faxaccount/locals.tpl:29
-#: 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/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
+#: plugins/personal/mail/class_mailAccount.inc:244
+msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
-msgid "Regular expression for matching addresses"
+#: plugins/personal/mail/class_mailAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:320
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
+#: plugins/personal/mail/class_mailAccount.inc:254
+#: plugins/admin/groups/class_groupMail.inc:321
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:176
-msgid "No DESC tag in vacation file:"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:256
+#: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
+#: plugins/personal/mail/class_mailAccount.inc:256
+#: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:276
+#: plugins/personal/mail/class_mailAccount.inc:307
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:282
-#: plugins/admin/groups/class_groupMail.inc:377
+#: plugins/personal/mail/class_mailAccount.inc:313
+#: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
+#: plugins/personal/mail/class_mailAccount.inc:351
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
+#: plugins/personal/mail/class_mailAccount.inc:366
+#: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:711
+#: plugins/personal/mail/class_mailAccount.inc:619
+msgid "Removing mail account failed"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:723
+msgid "Saving mail account failed"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:771
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:716
-#: plugins/admin/groups/class_groupMail.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:776
+#: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:720
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
+#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:784
+#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:730
-#: plugins/admin/groups/class_groupMail.inc:809
-#: plugins/admin/ogroups/class_mailogroup.inc:77
+#: plugins/personal/mail/class_mailAccount.inc:790
+#: plugins/admin/groups/class_groupMail.inc:812
+#: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:736
-#: plugins/admin/groups/class_groupMail.inc:815
+#: plugins/personal/mail/class_mailAccount.inc:796
+#: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:745
-#: plugins/admin/groups/class_groupMail.inc:824
+#: plugins/personal/mail/class_mailAccount.inc:805
+#: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:755
-#: plugins/admin/groups/class_groupMail.inc:832
+#: plugins/personal/mail/class_mailAccount.inc:815
+#: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:759
+#: plugins/personal/mail/class_mailAccount.inc:819
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
+#: plugins/personal/mail/class_mailAccount.inc:964
+msgid "Waiting for kolab to remove mail properties."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:966
+msgid ""
+"Please remove the mail account first, to allow kolab to call its remove "
+"methods."
+msgstr ""
+
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:21
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiPackageEntry.tpl:32
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/glpiAttachmentPool.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:29
+#: ihtml/themes/default/MultiSelectWindow.tpl:35
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
+msgid "Filters"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/personal/environment/selectPrinterDialog.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:29
+#: 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/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:45
+msgid "Regular expression for matching addresses"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:52
+msgid "Display addresses of user"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:55
+msgid "User name of which addresses are shown"
+msgstr ""
+
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:871
+#: plugins/personal/generic/paste_generic.tpl:32
+#: plugins/admin/systems/goKrbServer.tpl:12
 #: 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/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
+#: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_divListSystem.inc:195
+#: plugins/admin/systems/goFaxServer.tpl:8
+#: plugins/admin/systems/goLogDBServer.tpl:8
+#: plugins/admin/systems/goFonServer.tpl:8
+#: plugins/admin/systems/goGlpiServer.tpl:9
 #: ihtml/themes/default/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
 msgid "Password"
 msgstr ""
 
+#: plugins/personal/password/nochange.tpl:2
+msgid "Password change not allowed"
+msgstr ""
+
+#: plugins/personal/password/nochange.tpl:6
+msgid "You are not allowed to change your password at this time"
+msgstr ""
+
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/admin/users/class_divListUsers.inc:230
 msgid "Change password"
 msgstr ""
 
@@ -1046,7 +1149,6 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/personal/connectivity/opengw.tpl:49
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr ""
@@ -1065,21 +1167,16 @@ msgstr ""
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:45
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/admin/fai/faiNewBranch.tpl:47
-#: plugins/admin/departments/recursive_moce.tpl:10 include/functions.inc:1381
-#: 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
-#: ihtml/themes/altlinux/setup_finish.tpl:30
+#: plugins/admin/fai/faiNewBranch.tpl:50
+#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1470
+#: ihtml/themes/default/setup_finish.tpl:30
 #: 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_finish.tpl:30
 msgid "Back"
 msgstr ""
 
@@ -1094,14 +1191,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:271
+#: plugins/admin/users/class_userManagement.inc:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:276
+#: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1125,27 +1222,40 @@ msgstr ""
 msgid "Select groups to add"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/personal/posix/posix_groups.tpl:32
 msgid "Display groups of department"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:41
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:51
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+msgid "Ignore subtrees"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:53
 msgid "Display groups matching"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:44
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:57
+#: plugins/admin/groups/class_divListGroup.inc:71
+#: plugins/admin/departments/class_divListDepartment.inc:54
+#: plugins/admin/ogroups/class_divListOGroup.inc:78
 msgid "Regular expression for matching group names"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:75
+#: plugins/personal/posix/posix_groups.tpl:64
 msgid "Display groups of user"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:54
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/admin/groups/class_divListGroup.inc:72
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1158,6 +1268,42 @@ msgstr ""
 msgid "Password expires on"
 msgstr ""
 
+#: plugins/personal/posix/paste_generic.tpl:4
+msgid "Posix settings"
+msgstr ""
+
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:643
+msgid "Home directory"
+msgstr ""
+
+#: plugins/personal/posix/paste_generic.tpl:23
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr ""
+
+#: plugins/personal/posix/paste_generic.tpl:28
+#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/paste_generic.tpl:47
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/paste_generic.tpl:54
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+
 #: plugins/personal/posix/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr ""
@@ -1167,16 +1313,10 @@ msgid "Display systems of department"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:75
 msgid "Display systems matching"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:640
-msgid "Home directory"
-msgstr ""
-
 #: plugins/personal/posix/generic.tpl:13
 msgid "Shell"
 msgstr ""
@@ -1193,327 +1333,310 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
-msgid "UID"
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
+#: plugins/personal/posix/class_posixAccount.inc:16
+#: plugins/generic/references/class_reference.inc:22
+msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
+#: plugins/personal/posix/class_posixAccount.inc:125
+msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
+#: plugins/personal/posix/class_posixAccount.inc:127
+msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:91
-msgid "System trust"
+#: plugins/personal/posix/class_posixAccount.inc:130
+msgid "active, password not changable"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:92
-msgid "Trust mode"
+#: plugins/personal/posix/class_posixAccount.inc:132
+msgid "active, password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:16
-#: plugins/generic/references/class_reference.inc:22
-msgid "UNIX"
+#: plugins/personal/posix/class_posixAccount.inc:134
+msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:137
-#: plugins/personal/posix/class_posixAccount.inc:992
+#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:973
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:177
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
-#: plugins/admin/systems/class_workstationService.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:623
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
+#: plugins/personal/posix/class_posixAccount.inc:203
+#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_workstationStartup.inc:789
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:227
+#: plugins/personal/posix/class_posixAccount.inc:242
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:248
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:262
+#: plugins/personal/posix/class_posixAccount.inc:265
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:249
+#: plugins/personal/posix/class_posixAccount.inc:263
 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:252
+#: plugins/personal/posix/class_posixAccount.inc:266
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:255
+#: plugins/personal/posix/class_posixAccount.inc:269
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:256
+#: plugins/personal/posix/class_posixAccount.inc:270
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:455
+#: plugins/personal/posix/class_posixAccount.inc:443
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:457
+#: plugins/personal/posix/class_posixAccount.inc:445
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:459
+#: plugins/personal/posix/class_posixAccount.inc:447
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:449
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:473
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:473
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:473
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:473
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:474
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:474
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:474
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:474
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:474
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:475
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:475
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:475
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:569
-#: plugins/personal/samba/class_sambaAccount.inc:453
-#: plugins/admin/systems/class_terminalGeneric.inc:60
-#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: plugins/personal/posix/class_posixAccount.inc:557
+#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:569
+#: plugins/personal/posix/class_posixAccount.inc:557
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:570
+#: plugins/personal/posix/class_posixAccount.inc:558
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:742
+#: plugins/personal/posix/class_posixAccount.inc:604
+msgid "Removing UNIX account failed"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:737
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:906
+#: plugins/personal/posix/class_posixAccount.inc:826
+msgid "Saving UNIX account failed"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:887
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:909
+#: plugins/personal/posix/class_posixAccount.inc:890
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:917
+#: plugins/personal/posix/class_posixAccount.inc:898
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:920
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:924
-#: plugins/admin/groups/class_groupGeneric.inc:747
+#: plugins/personal/posix/class_posixAccount.inc:905
+#: plugins/admin/groups/class_groupGeneric.inc:774
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:927
-#: plugins/admin/groups/class_groupGeneric.inc:750
+#: plugins/personal/posix/class_posixAccount.inc:908
+#: plugins/admin/groups/class_groupGeneric.inc:777
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/personal/posix/class_posixAccount.inc:921
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:945
+#: plugins/personal/posix/class_posixAccount.inc:926
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:948
+#: plugins/personal/posix/class_posixAccount.inc:929
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:951
+#: plugins/personal/posix/class_posixAccount.inc:932
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:954
+#: plugins/personal/posix/class_posixAccount.inc:935
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:959
+#: plugins/personal/posix/class_posixAccount.inc:940
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:962
+#: plugins/personal/posix/class_posixAccount.inc:943
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:967
+#: plugins/personal/posix/class_posixAccount.inc:948
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1094
-#: plugins/admin/groups/class_groupGeneric.inc:786
+#: plugins/personal/posix/class_posixAccount.inc:1075
+#: plugins/admin/groups/class_groupGeneric.inc:813
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -1521,6 +1644,60 @@ msgstr ""
 msgid "Unix settings"
 msgstr ""
 
+#: plugins/personal/netatalk/class_netatalk.inc:37
+msgid "Manage netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+msgid "This account has no netatalk extensions."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid "Remove netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+msgid "Create netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:256
+msgid "Saving Netatalk account failed"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:316
+msgid "Removing Netatalk account failed"
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:121
+msgid "Netatalk settings"
+msgstr ""
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr ""
@@ -1531,7 +1708,7 @@ 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:641
+#: plugins/personal/samba/class_sambaAccount.inc:644
 msgid "Profile path"
 msgstr ""
 
@@ -1580,17 +1757,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:648
+#: plugins/personal/samba/class_sambaAccount.inc:651
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:652
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:650
+#: plugins/personal/samba/class_sambaAccount.inc:653
 msgid "IDLE"
 msgstr ""
 
@@ -1659,120 +1836,130 @@ msgstr ""
 msgid "Samba settings"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:196
+#: plugins/personal/samba/class_sambaAccount.inc:198
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaAccount.inc:207
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:206
+#: plugins/personal/samba/class_sambaAccount.inc:208
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:216
-#: plugins/personal/samba/class_sambaAccount.inc:219
+#: plugins/personal/samba/class_sambaAccount.inc:218
+#: plugins/personal/samba/class_sambaAccount.inc:221
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:220
+#: plugins/personal/samba/class_sambaAccount.inc:222
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:458
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:464
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/class_sambaAccount.inc:627
+msgid "Removing Samba account failed"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/class_sambaAccount.inc:656
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/class_sambaAccount.inc:662
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:843
+#: plugins/personal/samba/class_sambaAccount.inc:846
 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:867
+#: plugins/personal/samba/class_sambaAccount.inc:870
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:111
+#: plugins/personal/samba/class_sambaAccount.inc:974
+msgid "Saving Samba account failed"
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:114
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:117
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:123
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:128
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
 msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
 msgid "Please select a printer or press cancel."
 msgstr ""
 
@@ -1793,8 +1980,10 @@ msgid "Choose the department the search will be based    on"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/admin/fai/class_divListFai.inc:81
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/class_divListUsers.inc:72
+#: plugins/admin/applications/class_divListApplication.inc:58
 #: plugins/admin/systems/glpiSelectUser.tpl:35
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
@@ -1804,75 +1993,119 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:251
-#: plugins/personal/environment/class_environment.inc:288
-msgid "Remove environment extension"
+#: plugins/personal/environment/class_environment.inc:198
+msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:252
-#: plugins/personal/environment/class_environment.inc:289
-msgid "Environment extension enabled. You can disable it by clicking below."
+#: plugins/personal/environment/class_environment.inc:220
+#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:88
+#, 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:261
-#: plugins/personal/environment/class_environment.inc:266
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-msgid "Add environment extension"
+#: plugins/personal/environment/class_environment.inc:297
+#: plugins/personal/environment/class_environment.inc:334
+msgid "Remove environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:298
+#: plugins/personal/environment/class_environment.inc:335
+msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:262
-#: plugins/personal/environment/class_environment.inc:295
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:312
+#: plugins/personal/environment/class_environment.inc:340
+#: plugins/personal/environment/class_environment.inc:345
+msgid "Add environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:308
+#: plugins/personal/environment/class_environment.inc:341
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:267
-#: plugins/personal/environment/class_environment.inc:300
+#: plugins/personal/environment/class_environment.inc:313
+#: plugins/personal/environment/class_environment.inc:346
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:379
-msgid "auto"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:412
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/personal/environment/class_environment.inc:461
+#: plugins/personal/environment/class_environment.inc:770
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:508
-#: plugins/personal/environment/class_environment.inc:518
-#: plugins/admin/systems/class_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:503
+#: plugins/personal/environment/class_environment.inc:544
+#: plugins/personal/environment/class_environment.inc:555
+#: plugins/admin/systems/class_terminalStartup.inc:187
+#: plugins/admin/systems/class_workstationStartup.inc:613
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:753
+#: plugins/personal/environment/class_environment.inc:606
+#: plugins/personal/environment/class_environment.inc:607
+#: plugins/personal/environment/class_environment.inc:615
+#: plugins/personal/environment/class_environment.inc:616
+msgid "Reset password hash"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:620
+msgid "Delete share entry"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:773
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:825
+msgid "Removing environment information failed"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:760
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:797
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:891
+#: plugins/personal/environment/class_environment.inc:1017
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:962
+#: plugins/personal/environment/class_environment.inc:1087
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1076
-msgid "Admin"
+#: plugins/personal/environment/class_environment.inc:1157
+msgid "Adding environment information failed"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1170
+msgid "group share"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1202
+msgid "Administrator"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1207
+msgid "Default printer"
 msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
@@ -1898,7 +2131,7 @@ msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:102
+#: plugins/personal/environment/environment.tpl:103
 #: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr ""
@@ -1939,54 +2172,64 @@ msgstr ""
 msgid "Manage"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:81
-msgid "Resolution changeable on runtime"
+#: plugins/personal/environment/environment.tpl:82
+msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:86
+#: 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:105
+#: plugins/personal/environment/environment.tpl:106
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/servservice.tpl:11
-#: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/class_goShareServer.inc:148
 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
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
+msgid "Mount path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:121
+#: 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:206
-#: plugins/admin/fai/faiPackage.tpl:62
+#: plugins/admin/fai/faiPackage.tpl:72
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
-#: plugins/admin/groups/class_groupMail.inc:537
+#: plugins/admin/groups/class_groupMail.inc:544
 #: plugins/admin/applications/class_applicationParameters.inc:100
-#: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/printer.tpl:53
+#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/workstationStartup.tpl:144
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
+#: plugins/admin/systems/goMailServer.tpl:57
+#: plugins/admin/systems/goMailServer.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:168
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
 msgid "Remove"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:126
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:127
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
@@ -2001,9 +2244,8 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:367
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:167
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/admin/groups/class_divListGroup.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:96
 msgid "New"
 msgstr ""
 
@@ -2011,19 +2253,27 @@ msgstr ""
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:173
+#: plugins/personal/environment/environment.tpl:174
 msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:183
-msgid "Admin Toggle"
+#: plugins/personal/environment/environment.tpl:184
+msgid "Toggle admin"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:185
+msgid "Toggle default"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
 msgid "Specified name is invalid."
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
+#: plugins/personal/environment/class_logonManagementDialog.inc:101
+msgid "Please specify a valid script name."
+msgstr ""
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:105
 msgid "Specified description contains invalid characters."
 msgstr ""
 
@@ -2037,7 +2287,8 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/fai/faiPartitionTable.tpl:19
 #: plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
@@ -2050,14 +2301,13 @@ msgstr ""
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
-#: plugins/gofon/conference/generic.tpl:51
+#: plugins/admin/systems/printer.tpl:13 plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/wingeneric.tpl:25
+#: plugins/admin/systems/servnfs.tpl:17 plugins/admin/systems/phone.tpl:30
+#: 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
+#: html/getxls.php:230 ihtml/themes/default/snapshotdialog.tpl:86
 msgid "Description"
 msgstr ""
 
@@ -2083,19 +2333,28 @@ msgid "Logon script"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:88
 #: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:19
 #: 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/fai/faiNewBranch.tpl:19
+#: plugins/admin/groups/class_groupManagement.inc:333
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/applications/class_applicationManagement.inc:353
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/systems/class_systemManagement.inc:481
+#: plugins/admin/ogroups/class_ogroupManagement.inc:335
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
 msgid "Apply"
 msgstr ""
 
@@ -2121,27 +2380,6 @@ msgstr ""
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:1
-msgid "Create new hotplug entry"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:8
-msgid "Create new hotplug device"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:10
-#: plugins/admin/systems/component.tpl:6
-msgid "Device name"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:28
-msgid "Device ID"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-msgid "save"
-msgstr ""
-
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
@@ -2154,14 +2392,15 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:219
 #: plugins/admin/systems/glpi_edit_type.tpl:15
-#: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_os.tpl:15
+#: plugins/admin/systems/glpiManufacturer.tpl:13
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
-#: include/class_MultiSelectWindow.inc:45
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
+#: include/class_MultiSelectWindow.inc:79
 msgid "Close"
 msgstr ""
 
@@ -2169,288 +2408,367 @@ msgstr ""
 msgid "User environment settings"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+#: plugins/personal/environment/hotplugDialogNew.tpl:1
+msgid "Create new hotplug entry"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
+#: plugins/personal/environment/hotplugDialogNew.tpl:8
+msgid "Create new hotplug device"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
+#: plugins/personal/environment/hotplugDialogNew.tpl:10
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:28
+msgid "Vendor ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:33
+msgid "Product ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:40
+msgid "Device ID"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/personal/environment/hotplugDialogNew.tpl:51
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/addons/addressbook/address_edit.tpl:233
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:117
+#: plugins/admin/systems/goKrbServer.tpl:19
+#: plugins/admin/systems/goLdapServer.tpl:7
+#: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/goCupsServer.tpl:6
+#: plugins/admin/systems/goSyslogServer.tpl:6
+#: plugins/admin/systems/goTerminalServer.tpl:17
+#: plugins/admin/systems/servRepository.tpl:64
+#: plugins/admin/systems/servkolab.tpl:203
+#: plugins/admin/systems/goNtpServer.tpl:22
+#: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/servdnseditzone.tpl:119
+#: plugins/admin/systems/goFaxServer.tpl:16
+#: plugins/admin/systems/servdns.tpl:21 plugins/admin/systems/servnfs.tpl:120
+#: plugins/admin/systems/goLogDBServer.tpl:16
+#: plugins/admin/systems/goFonServer.tpl:24
+#: plugins/admin/systems/goMailServer.tpl:167
+#: plugins/admin/systems/goGlpiServer.tpl:24
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
-#: include/class_MultiSelectWindow.inc:44
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: include/class_MultiSelectWindow.inc:78
+#: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
+#: plugins/personal/generic/generic_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:50
+#: plugins/personal/generic/generic.tpl:19
+#: plugins/personal/generic/generic.tpl:32
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:25
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:19
-msgid "Last name"
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:30
-msgid "Template name"
+#: plugins/personal/generic/paste_generic.tpl:4
+msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:37
-#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/personal/generic/paste_generic.tpl:7
+#: plugins/personal/generic/generic.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
+msgid "Last name"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl:11
+#: plugins/personal/generic/generic.tpl:55
+#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:41 plugins/admin/users/template.tpl:28
+#: plugins/personal/generic/paste_generic.tpl:15
+#: plugins/personal/generic/generic.tpl:59 plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:49
-#: plugins/addons/addressbook/address_info.tpl:22
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl:35
+msgid "Clear password"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl:36
+msgid "Set new password"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:34
+msgid "Change picture"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:48
+msgid "Template name"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:67
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:57
+#: plugins/personal/generic/generic.tpl:75
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:65
+#: plugins/personal/generic/generic.tpl:83
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:82
-#: ihtml/themes/altlinux/sizelimit.tpl:14
+#: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:88 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/generic.tpl:116
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:109
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+#: plugins/personal/generic/generic.tpl:127
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:101
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:654
-#: plugins/admin/groups/class_groupManagement.inc:369
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/groups/class_divListGroup.inc:115
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:118
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:336
+#: plugins/admin/departments/class_divListDepartment.inc:93
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:302
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:771
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/terminal.tpl:17
+#: plugins/admin/systems/class_divListSystem.inc:120
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:374
+#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/servservice.tpl:61 plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_divListOGroup.inc:125
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/macro/class_divListMacros.inc:98
 #: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/gofon/conference/class_divListConferences.inc:99
 #: plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:113
+#: plugins/personal/generic/generic.tpl:131
 msgid "Choose subtree to place user in"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:116
-#: plugins/admin/groups/generic.tpl:26
-#: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
-#: plugins/admin/systems/workstation.tpl:32
+#: plugins/personal/generic/generic.tpl:135
+#: plugins/personal/generic/generic.tpl:137
+#: plugins/gofax/blocklists/generic.tpl:21
+#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
+#: plugins/admin/groups/generic.tpl:29
+#: plugins/admin/applications/generic.tpl:39
+#: plugins/admin/applications/generic.tpl:41
+#: plugins/admin/departments/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:36
+#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
+#: plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21 plugins/admin/systems/server.tpl:21
+#: plugins/admin/systems/server.tpl:23 plugins/admin/systems/terminal.tpl:23
+#: plugins/admin/systems/terminal.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:18
-#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/workstation.tpl:31 plugins/admin/systems/phone.tpl:19
+#: plugins/admin/systems/phone.tpl:21 plugins/admin/ogroups/generic.tpl:27
+#: plugins/admin/ogroups/generic.tpl:29 plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
+#: plugins/gofon/conference/generic.tpl:41
 msgid "Select a base"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:129
-#: plugins/personal/generic/generic.tpl:273
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
+#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:295
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
-#: plugins/admin/departments/generic.tpl:55
+#: 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
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:133
+#: plugins/personal/generic/generic.tpl:155
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:159
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:146
+#: plugins/personal/generic/generic.tpl:168
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:156
+#: plugins/personal/generic/generic.tpl:178
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:158
+#: plugins/personal/generic/generic.tpl:180
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:162
+#: plugins/personal/generic/generic.tpl:184
 msgid "Kerberos"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:163
+#: plugins/personal/generic/generic.tpl:185
 msgid "Edit properties"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:179
+#: plugins/personal/generic/generic.tpl:201
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:191 html/getxls.php:236
+#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:195
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/admin/groups/class_groupManagement.inc:420
-#: plugins/admin/users/class_userManagement.inc:697
-#: plugins/admin/applications/class_applicationManagement.inc:361
-#: plugins/admin/systems/class_systemManagement.inc:791
-#: plugins/admin/ogroups/class_ogroupManagement.inc:424
-#: plugins/admin/ogroups/class_ogroupManagement.inc:492
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/applications/class_divListApplication.inc:51
+#: plugins/admin/ogroups/class_ogroupManagement.inc:376
+#: plugins/gofon/macro/class_divListMacros.inc:52
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/generic.tpl:221
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:205
+#: plugins/personal/generic/generic.tpl:227
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:211
+#: plugins/personal/generic/generic.tpl:233
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:227
-#: plugins/personal/generic/generic.tpl:366
+#: plugins/personal/generic/generic.tpl:249
+#: plugins/personal/generic/generic.tpl:388
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:239
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:265
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/generic.tpl:51
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:287
+#: plugins/addons/godfs/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:269
-#: plugins/admin/departments/generic.tpl:47 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:291
+#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
 #: html/getxls.php:236
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:309
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:291
+#: plugins/personal/generic/generic.tpl:313
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:299
+#: plugins/personal/generic/generic.tpl:321
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/generic.tpl:329
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:314
+#: plugins/personal/generic/generic.tpl:336
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:326
+#: plugins/personal/generic/generic.tpl:348
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:356
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:341
+#: plugins/personal/generic/generic.tpl:363
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:347
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/generic.tpl:375
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/generic.tpl:397
 msgid "Please use the phone tab"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:410
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/personal/generic/generic.tpl:417
 msgid "Public visible"
 msgstr ""
 
@@ -2478,130 +2796,138 @@ msgstr ""
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:270
+#: plugins/personal/generic/class_user.inc:272
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:326
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:420
+#: plugins/personal/generic/class_user.inc:422
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:461
+#: plugins/personal/generic/class_user.inc:463
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:879
+#: plugins/personal/generic/class_user.inc:546
+msgid "Removing generic user account failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:835
+msgid "Saving generic user account failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:882
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:899
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:907
+#: plugins/personal/generic/class_user.inc:910
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:947
+#: plugins/personal/generic/class_user.inc:954
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:952
+#: plugins/personal/generic/class_user.inc:959
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:554
+#: plugins/personal/generic/class_user.inc:965
+#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:967
+#: plugins/personal/generic/class_user.inc:974
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:557
+#: plugins/personal/generic/class_user.inc:980
+#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:976
+#: plugins/personal/generic/class_user.inc:983
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:990
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:997
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:993
+#: plugins/personal/generic/class_user.inc:1000
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
+#: plugins/personal/generic/class_user.inc:1003
+#: plugins/personal/generic/class_user.inc:1028
+#: plugins/addons/addressbook/class_addressbook.inc:556
+#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/admin/departments/class_departmentGeneric.inc:251
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1006
+#: plugins/personal/generic/class_user.inc:1025
+#: plugins/addons/addressbook/class_addressbook.inc:559
+#: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
+#: plugins/personal/generic/class_user.inc:1011
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/addons/addressbook/class_addressbook.inc:567
+#: plugins/admin/departments/class_departmentGeneric.inc:254
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
+#: plugins/personal/generic/class_user.inc:1014
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/departments/class_departmentGeneric.inc:257
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/personal/generic/class_user.inc:1017
+#: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
+#: plugins/personal/generic/class_user.inc:1020
+#: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1140
+#: plugins/personal/generic/class_user.inc:1147
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -2645,6 +2971,14 @@ msgstr ""
 msgid "WebDAV"
 msgstr ""
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:68
+msgid "Removing webDAV account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:111
+msgid "Saving webDAV account failed"
+msgstr ""
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr ""
@@ -2685,8 +3019,8 @@ msgid "Future"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
+#: plugins/personal/connectivity/oxchange.tpl:26
+#: plugins/personal/connectivity/oxchange.tpl:30
 msgid "days"
 msgstr ""
 
@@ -2757,30 +3091,32 @@ msgid "Open-Xchange Account"
 msgstr ""
 
 #: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
+#: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:13
+#: plugins/personal/connectivity/oxchange.tpl:21
 msgid "Remember"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
+#: plugins/personal/connectivity/oxchange.tpl:25
 msgid "Appointment Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
+#: plugins/personal/connectivity/oxchange.tpl:29
 msgid "Task Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
+#: plugins/personal/connectivity/oxchange.tpl:41
 msgid "User Information"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:37
+#: plugins/personal/connectivity/oxchange.tpl:45
 msgid "User Timezone"
 msgstr ""
 
@@ -2790,6 +3126,9 @@ msgid "Proxy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/admin/systems/goMailServer.tpl:18
+#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr ""
 
@@ -2798,7 +3137,7 @@ msgid "GB"
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:299
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
@@ -2814,26 +3153,81 @@ msgstr ""
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:171
+#: plugins/personal/connectivity/class_proxyAccount.inc:156
+msgid "Removing proxy account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:172
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:174
+#: plugins/personal/connectivity/class_proxyAccount.inc:175
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:262
+msgid "Saving proxy account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_servGeneric.inc:44
+#: plugins/admin/systems/class_workstationGeneric.inc:103
+#: plugins/admin/ogroups/class_termgroup.inc:39
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr ""
 
+#: plugins/personal/connectivity/class_pptpAccount.inc:84
+msgid "Removing PPTP account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:127
+msgid "Saving PPTP account failed"
+msgstr ""
+
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
 msgid "Intranet"
 msgstr ""
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:102
+msgid "Removing intranet account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:157
+msgid "Saving intranet account failed"
+msgstr ""
+
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+msgid "Removing PHPgw account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+msgid "Saving PHPgw account failed"
+msgstr ""
+
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
 msgstr ""
@@ -2877,138 +3271,118 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:232
+#: plugins/personal/connectivity/class_kolabAccount.inc:233
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:237
+#: plugins/personal/connectivity/class_kolabAccount.inc:238
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:252
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:259
+#: plugins/personal/connectivity/class_kolabAccount.inc:260
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:325
+msgid "Saving Kolab account failed"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+msgid "Removing pureftpd account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
 msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
 msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
 msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+msgid "Saving pureftpd account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#, php-format
-msgid ""
-"This account has %s features disabled. Posix features are needed for "
-"openXchange accounts, enable them first."
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-msgid "OpenXchange"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-#, php-format
-msgid ""
-"This account has %s features disabled. Mail features are needed for "
-"openXchange accounts, enable them first."
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:699
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:796
-msgid "Couldn't connect to postgresql database!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:703
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:800
-msgid "Needed parameters for openexchange connectivity plugin are missing!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
+msgid "Removing of oxchange addressbook failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:707
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
-msgid "PHP4 module for postgresql database is missing!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+msgid "Removing oxchange account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:783
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:784
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+msgid "Saving of oxchange account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-msgid "PHPscheduleit"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+msgid "Creating oxchange addressbook tree failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:1
-msgid "Opengroupware"
+#: plugins/personal/connectivity/class_opengwAccount.inc:6
+msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:8
-msgid "Location team"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:21
-msgid "Template user"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:64
-msgid "Teams"
-msgstr ""
-
-#: plugins/personal/connectivity/class_opengwAccount.inc:6
-msgid "Opengroupware account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
-msgid ""
-"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
-"perform any database queries."
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
+msgid ""
+"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
+"perform any database queries."
 msgstr ""
 
 #: plugins/personal/connectivity/class_opengwAccount.inc:144
@@ -3023,257 +3397,380 @@ msgid ""
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+msgid "PHPscheduleit"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+msgid "Removing PHPscheduleit account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+msgid "Saving PHPscheduleit account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_connectivity.inc:65
+msgid "This account has no connectivity extensions."
+msgstr ""
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:229
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:172
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:241
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:189
 msgid "You have no permission to remove this blocklist."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:251
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:204
 msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "send"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "receive"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:406
+msgid "Removing blocklist object failed"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:443
+msgid "You have no permissions to create a blocklist on this 'Base'."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:449
+#: plugins/admin/departments/class_departmentGeneric.inc:240
+msgid "Required field 'Name' is not set."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
+msgid "Required field 'Name' contains invalid characters"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+msgid "Specified name is already used."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+msgid "No permission to create a blocklist on this base."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:514
+msgid "Saving blocklist object failed"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:31
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:32
+msgid "List of blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:36
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
+msgid "Blocklist name"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:53
+#: plugins/addons/addressbook/contents.tpl:42
+#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/applications/class_divListApplication.inc:52
+#: plugins/admin/departments/class_divListDepartment.inc:48
+#: plugins/admin/systems/class_divListSystemService.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:59
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/conference/class_divListConferences.inc:55
+msgid "Actions"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
+msgid "Select to see send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
+msgid "Show send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Select to see receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Show receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:51
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+msgid "Select to search within subtrees"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:63
+msgid "Regular expression for matching list names"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:75
+#: plugins/admin/systems/class_divListSystem.inc:94
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Go up one department"
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+msgid "Go to root department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiProfile.inc:303
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:75
+#: plugins/admin/systems/class_divListSystem.inc:94
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_servDNSeditZone.inc:275
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+msgid "Root"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:622
-#: plugins/admin/groups/class_groupManagement.inc:364
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:331
-#: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_divListSystem.inc:96
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Go to root department"
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+msgid "Go up one department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:622
-#: plugins/admin/groups/class_groupManagement.inc:364
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:331
-#: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_divListSystem.inc:96
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-msgid "Root"
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/groups/class_groupManagement.inc:365
-#: plugins/admin/users/class_userManagement.inc:679
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:98
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
 msgid "Go to users department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:625
-#: plugins/admin/groups/class_groupManagement.inc:365
-#: plugins/admin/users/class_userManagement.inc:679
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/departments/class_divListDepartment.inc:79
+#: plugins/admin/systems/class_divListSystem.inc:98
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
 msgid "Home"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/departments/class_divListDepartment.inc:81
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:87
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/fai/class_divListFai.inc:126
+#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/groups/class_divListGroup.inc:116
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/applications/class_divListApplication.inc:120
+#: plugins/admin/departments/class_divListDepartment.inc:81
+#: plugins/admin/departments/class_divListDepartment.inc:95
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:123
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/ogroups/class_divListOGroup.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:101
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:94
+#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:111
+#: plugins/admin/applications/class_divListApplication.inc:110
+#: plugins/admin/departments/class_divListDepartment.inc:86
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:91
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Restore snapshopts of already deleted objects"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:94
+#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:111
+#: plugins/admin/applications/class_divListApplication.inc:110
+#: plugins/admin/departments/class_divListDepartment.inc:86
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:91
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Restore"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:99
 msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:99
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:655
-#: plugins/admin/groups/class_groupManagement.inc:370
-#: plugins/admin/users/class_userManagement.inc:685
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:375
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:116
+#: plugins/admin/users/class_divListUsers.inc:123
+#: plugins/admin/applications/class_divListApplication.inc:120
+#: plugins/admin/departments/class_divListDepartment.inc:95
+#: plugins/admin/systems/class_divListSystem.inc:123
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/ogroups/class_divListOGroup.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/admin/fai/class_faiManagement.inc:655
-#: plugins/admin/groups/class_groupManagement.inc:370
-#: plugins/admin/users/class_userManagement.inc:685
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/class_systemManagement.inc:774
-#: plugins/admin/systems/class_glpiSelectUser.inc:168
-#: plugins/admin/ogroups/class_ogroupManagement.inc:375
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:673
-#: plugins/admin/fai/class_faiManagement.inc:773
-#: plugins/admin/fai/class_faiManagement.inc:778
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:688
-#: plugins/admin/applications/class_applicationManagement.inc:341
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/systems/class_systemManagement.inc:780
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:131
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_divListFai.inc:228
+#: plugins/admin/fai/class_divListFai.inc:233
+#: plugins/admin/groups/class_divListGroup.inc:176
+#: plugins/admin/users/class_divListUsers.inc:227
+#: plugins/admin/applications/class_divListApplication.inc:168
+#: plugins/admin/departments/class_divListDepartment.inc:129
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
+#: plugins/admin/systems/class_divListSystem.inc:163
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/ogroups/class_divListOGroup.inc:168
+#: plugins/gofon/macro/class_divListMacros.inc:115
+#: plugins/gofon/macro/class_divListMacros.inc:135
+#: plugins/gofon/conference/class_divListConferences.inc:131
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
-#: plugins/admin/users/class_userManagement.inc:688
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:131
+#: plugins/admin/users/class_divListUsers.inc:228
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:674
-#: plugins/admin/fai/class_faiManagement.inc:780
-#: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/admin/applications/class_applicationManagement.inc:342
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
+#: plugins/admin/fai/class_faiHook.inc:256
+#: plugins/admin/fai/class_divListFai.inc:235
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:231
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_divListSystem.inc:164
+#: plugins/admin/ogroups/class_divListOGroup.inc:170
+#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/conference/class_divListConferences.inc:133
+#: plugins/gofon/conference/class_divListConferences.inc:135
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
+#: plugins/admin/users/class_divListUsers.inc:232
 msgid "Delete user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
-msgid "Blocklist name"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:670
-#: plugins/admin/groups/class_groupManagement.inc:422
-#: plugins/admin/users/class_userManagement.inc:699
-#: plugins/admin/applications/class_applicationManagement.inc:362
-#: plugins/admin/departments/class_departmentManagement.inc:318
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:401
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
-msgid "Actions"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:327
-msgid "This table displays faxblocklists for the selected tree."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
-msgid "send"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
-msgid "receive"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:199
-msgid "Required field 'Name' is not set."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:551
-msgid "Required field 'Name' contains invalid characters"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:558
-msgid "Specified name is already used."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
-msgid "No permission to create a blocklist on this base."
-msgstr ""
-
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
 msgstr ""
@@ -3286,34 +3783,35 @@ msgstr ""
 msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/admin/fai/class_faiSummaryTab.inc:326
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/servnfs.tpl:47
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:34
+#: plugins/gofax/blocklists/generic.tpl:39
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:43
+#: plugins/gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:56
+#: plugins/gofax/blocklists/generic.tpl:61
 msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:72
+#: plugins/gofax/blocklists/generic.tpl:77
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
@@ -3322,11 +3820,11 @@ 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.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.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:236 html/index.php:296 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/default/islocked.tpl:6
+#: html/index.php:49 html/index.php:331 html/index.php:337
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 msgid "Warning"
 msgstr ""
 
@@ -3345,45 +3843,11 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
 msgid "Blocklist management"
 msgstr ""
 
+#: plugins/gofax/faxaccount/paste_generic.tpl:13
 #: plugins/gofax/faxaccount/generic.tpl:12
 msgid "Fax number for GOfax to trigger on"
 msgstr ""
@@ -3483,8 +3947,8 @@ msgid "FAX settings"
 msgstr ""
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr ""
@@ -3520,11 +3984,15 @@ msgstr ""
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:515
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
+#: plugins/admin/groups/class_groupApplication.inc:632
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
+msgid "Removing FAX account failed"
+msgstr ""
+
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr ""
@@ -3547,6 +4015,10 @@ msgid ""
 "correct your choice."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
+msgid "Saving FAX account failed"
+msgstr ""
+
 #: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr ""
@@ -3562,8 +4034,8 @@ msgstr ""
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:671
-#: plugins/admin/ogroups/class_ogroupManagement.inc:489
+#: plugins/admin/systems/class_printGeneric.inc:758
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
 msgid "User"
 msgstr ""
 
@@ -3604,38 +4076,34 @@ msgstr ""
 msgid "FAX Reports"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: plugins/gofax/faxreports/class_faxreport.inc:106
+#: plugins/gofax/faxreports/class_faxreport.inc:116
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/gofax/faxreports/class_faxreport.inc:109
 #: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
+#: plugins/gofon/fonreports/class_fonreport.inc:160
 msgid "There is no mysql extension available, please check your php setup."
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
+#: plugins/gofax/faxreports/class_faxreport.inc:120
+#: plugins/gofax/faxreports/class_faxreport.inc:125
 msgid "Can't select fax database for report generation!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:148
+#: plugins/gofax/faxreports/class_faxreport.inc:266
 msgid "Query for fax database failed!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:185
+#: plugins/gofax/faxreports/class_faxreport.inc:157
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: plugins/gofon/fonreports/class_fonreport.inc:202
 msgid "Y-M-D"
 msgstr ""
 
@@ -3686,6 +4154,7 @@ msgstr ""
 #: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
+#: ihtml/themes/default/snapshotdialog.tpl:78
 msgid "Date"
 msgstr ""
 
@@ -3704,7 +4173,7 @@ msgstr ""
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/faxreports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:18
 msgid "FAX reports"
 msgstr ""
 
@@ -3720,20 +4189,65 @@ msgstr ""
 msgid "Dial"
 msgstr ""
 
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr ""
+
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/class_faiSummaryTab.inc:321
 #: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
 #: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: 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/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
 #: plugins/admin/systems/glpi_devices.tpl:146
@@ -3747,17 +4261,15 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/servnfs.tpl:9
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:66
-msgid "Private"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr ""
@@ -3774,7 +4286,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:597
+#: plugins/admin/groups/class_groupApplication.inc:714
 msgid "Edit entry"
 msgstr ""
 
@@ -3821,7 +4333,7 @@ msgid ""
 "back."
 msgstr ""
 
-#: plugins/addons/addressbook/main.inc:23
+#: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
 msgstr ""
 
@@ -3840,12 +4352,16 @@ msgid ""
 "perform direct dials."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:186
-#: plugins/addons/addressbook/class_addressbook.inc:287
+#: plugins/addons/addressbook/class_addressbook.inc:180
+msgid "Removing addressbook entry failed"
+msgstr ""
+
+#: plugins/addons/addressbook/class_addressbook.inc:187
+#: plugins/addons/addressbook/class_addressbook.inc:288
 msgid "You are not allowed to delete this entry!"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:281
+#: plugins/addons/addressbook/class_addressbook.inc:282
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr ""
@@ -3878,8 +4394,8 @@ msgid "Creating new entry in"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/mailqueue/class_mailqueue.inc:281
-#: plugins/addons/mailqueue/class_mailqueue.inc:346
+#: plugins/addons/mailqueue/class_mailqueue.inc:305
+#: plugins/addons/mailqueue/class_mailqueue.inc:370
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
 msgid "All"
@@ -3908,109 +4424,178 @@ msgstr ""
 msgid "User ID"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/addons/addressbook/class_addressbook.inc:597
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:604
+#: plugins/addons/addressbook/class_addressbook.inc:605
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
+#: plugins/addons/addressbook/class_addressbook.inc:650
+msgid "Saving addressbook entry failed"
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+msgid "DFS Managment"
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+msgid "Removing DFS share failed"
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+msgid "Go up one dfsshare"
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
 msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+msgid "Create new dfsshare"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:102
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+msgid "Dfs share already exists."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:117
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:120
+msgid "Required Field \"Description\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:123
+msgid "Required Field \"Fileserver\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:126
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:129
+msgid "Required Field \"Location\" is not set."
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:4
+msgid "DFS Properties"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:8
+msgid "Name of dfs Share"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:16
+msgid "Fileserver"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:20
+msgid "Share on Fileserver"
+msgstr ""
+
+#: plugins/addons/godfs/generic.tpl:30
+msgid "DFS Location"
+msgstr ""
+
+#: plugins/addons/godfs/contents.tpl:8
+msgid "DFS Shares"
+msgstr ""
+
+#: plugins/addons/godfs/contents.tpl:26
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+
+#: plugins/addons/godfs/contents.tpl:40
+msgid "Display dfs shares matching"
+msgstr ""
+
+#: plugins/addons/godfs/contents.tpl:44
+msgid "Regular expression for matching dfs share names"
+msgstr ""
+
+#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
+msgid "Distributed File System Administration"
 msgstr ""
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
-#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/main.inc:38
 msgid "Mail queue"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:53
+#: plugins/addons/mailqueue/class_mailqueue.inc:58
 msgid ""
-"Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
-"specified."
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:88
-#: plugins/addons/mailqueue/class_mailqueue.inc:107
-#: plugins/addons/mailqueue/class_mailqueue.inc:116
+#: plugins/addons/mailqueue/class_mailqueue.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:112
 #: plugins/addons/mailqueue/class_mailqueue.inc:171
 #: plugins/addons/mailqueue/class_mailqueue.inc:198
 #, php-format
+msgid ""
+"You do not have permission to execute the command '%s' on the mailqueue."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:93
+#: plugins/addons/mailqueue/class_mailqueue.inc:121
+#: plugins/addons/mailqueue/class_mailqueue.inc:181
+#: plugins/addons/mailqueue/class_mailqueue.inc:213
+#, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:251
+#: plugins/addons/mailqueue/class_mailqueue.inc:225
+msgid "There are no mail server specified."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:275
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:253
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
 msgid "down"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:296
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
 msgid "hours"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:347
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:348
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:349
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 #: plugins/addons/mailqueue/contents.tpl:76
 msgid "Active"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:350
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr ""
 
@@ -4227,14 +4812,18 @@ msgid "Import LDIF File"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentimport.tpl:24
-msgid "Modify existing attributes"
+msgid "Modify existing objects, keep untouched attributes"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentimport.tpl:25
+msgid "Overwrite existing objects, all not listed attributes will be removed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:33
-msgid "Overwrite existing entry"
+#: plugins/addons/ldapmanager/contentimport.tpl:34
+msgid "Remove existing entries first"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
+#: plugins/addons/ldapmanager/contentimport.tpl:41
 msgid "Import successful"
 msgstr ""
 
@@ -4312,7 +4901,7 @@ msgid "Click here to save the LDAP Export "
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/main.inc:40
 msgid "LDAP manager"
 msgstr ""
 
@@ -4407,25 +4996,55 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:23
+#: plugins/addons/logview/main.inc:33
 msgid "System log view"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr ""
 
+#: plugins/admin/fai/class_faiScript.inc:303
+msgid "Removing FAI script base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:354
+msgid "Creating FAI script base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:424
+msgid "Removing FAI script failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:443
+msgid "Saving FAI script failed"
+msgstr ""
+
 #: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
 #: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
 #: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
 #: plugins/admin/fai/tabsTemplate.inc:34
-#: plugins/admin/departments/tabs_department.inc:31
+#: plugins/admin/departments/tabs_department.inc:30
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
+#: plugins/admin/fai/class_faiTemplate.inc:325
+msgid "Saving FAI template base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:386
+msgid "Removing FAI template base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:391
+#: plugins/admin/fai/class_faiTemplate.inc:404
+msgid "Saving FAI template failed"
+msgstr ""
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 msgid "FAI"
 msgstr ""
@@ -4434,168 +5053,57 @@ msgstr ""
 msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:228
+#: plugins/admin/fai/class_faiManagement.inc:153
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:234
-#: plugins/admin/fai/class_faiManagement.inc:272
-#: plugins/admin/systems/class_systemManagement.inc:532
-#: plugins/admin/systems/class_systemManagement.inc:603
+#: plugins/admin/fai/class_faiManagement.inc:159
+#: plugins/admin/fai/class_faiManagement.inc:202
+#: plugins/admin/systems/class_systemManagement.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:373
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:324
+#: plugins/admin/fai/class_faiManagement.inc:255
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:327
+#: plugins/admin/fai/class_faiManagement.inc:258
 msgid "You are not allowed to delete this release!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:382
+#: plugins/admin/fai/class_faiManagement.inc:313
 msgid "Specified branch name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:384
+#: plugins/admin/fai/class_faiManagement.inc:315
 msgid "Specified freeze name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_servRepository.inc:208
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+#: plugins/admin/fai/class_faiManagement.inc:322
+#: plugins/admin/systems/class_servRepository.inc:204
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:351
 msgid "This name is already in use."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:589
-#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: plugins/admin/fai/class_faiManagement.inc:392
+#: plugins/admin/fai/class_faiManagement.inc:552
+#: plugins/admin/fai/faiPackageNew.tpl:50 plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:418
+#: plugins/admin/departments/class_departmentGeneric.inc:503
+#: plugins/admin/systems/ServiceAddDialog.tpl:29
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: 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/snapshotdialog.tpl:48
+#: ihtml/themes/default/snapshotdialog.tpl:95
 msgid "Continue"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:625
-#: plugins/admin/departments/class_departmentManagement.inc:298
-msgid "Go to users home department"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:630
-msgid "New profile"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:630
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "P"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:635
-msgid "New partition table"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:635
-msgid "PT"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:638
-msgid "New scripts"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:638
-msgid "S"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:641
-msgid "New hooks"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:641
-msgid "H"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:644
-msgid "New variables"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:644
-msgid "V"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:647
-msgid "New templates"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:647
-msgid "T"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:650
-msgid "New package list"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:650
-msgid "PK"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:664
-#: plugins/admin/systems/class_systemManagement.inc:787
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:668
-msgid "Name of FAI class"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:669
-msgid "Class type"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:673
-#: plugins/admin/fai/class_faiManagement.inc:774
-#: plugins/admin/fai/class_faiManagement.inc:779
-msgid "Edit class"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:674
-#: plugins/admin/fai/class_faiManagement.inc:781
-msgid "Delete class"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:694
-#: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:334
-msgid "department"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:715
-#: plugins/admin/fai/class_faiManagement.inc:716
-#: plugins/admin/fai/class_faiProfile.inc:297
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
-msgid "Partition table"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:722
-#: plugins/admin/fai/class_faiManagement.inc:723
-msgid "Package list"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:729
-#: plugins/admin/fai/class_faiManagement.inc:730
-msgid "Scripts"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:750
-#: plugins/admin/fai/class_faiManagement.inc:751
-msgid "Profile"
-msgstr ""
-
 #: plugins/admin/fai/class_faiPackageEntry.inc:35
 msgid "Please enter your search string here"
 msgstr ""
@@ -4612,7 +5120,29 @@ msgid ""
 "200 entries are shown, to keep the memory usage low."
 msgstr ""
 
-#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/applications/release_select.tpl:3
+msgid "Branches"
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/applications/release_select.tpl:9
+msgid "Current release"
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:21
+msgid "Create new branch"
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:25
+msgid "Create new locked branch"
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:30
+msgid "Delete current release"
+msgstr ""
+
+#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
 msgid "Fully Automatic Installation"
 msgstr ""
 
@@ -4668,17 +5198,17 @@ msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
-#: plugins/admin/fai/faiPackageEntry.tpl:42 plugins/admin/fai/headpage.tpl:82
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
+#: plugins/admin/fai/faiPackageEntry.tpl:42
 #: plugins/admin/systems/servRepository.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:59
-#: plugins/admin/fai/faiPackageEntry.tpl:46 plugins/admin/fai/headpage.tpl:86
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
+#: plugins/admin/fai/faiPackageEntry.tpl:46
 #: plugins/admin/systems/servRepository.tpl:50
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr ""
@@ -4687,6 +5217,51 @@ msgstr ""
 msgid "Package"
 msgstr ""
 
+#: plugins/admin/fai/class_faiSummaryTab.inc:39
+msgid "Scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:43
+#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfileEntry.inc:124
+msgid "Partition table"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
+msgid "Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:201
+msgid "This object has no FAI classes assigned."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:213
+msgid "Open"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:320
+msgid "No."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:322
+msgid "FS options"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:323
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+msgid "Mount options"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:324
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+msgid "Size in MB"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:325
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+msgid "Mount point"
+msgstr ""
+
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
 msgid "Please select a valid file."
@@ -4697,14 +5272,14 @@ msgstr ""
 msgid "Selected file is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:132
-#: plugins/admin/fai/class_faiVariableEntry.inc:101
-#: plugins/admin/fai/class_faiHookEntry.inc:145
-#: plugins/admin/fai/class_faiTemplateEntry.inc:178
+#: 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
 msgid "Please enter a name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:136
+#: plugins/admin/fai/class_faiScriptEntry.inc:137
 msgid "Please enter a script."
 msgstr ""
 
@@ -4717,12 +5292,12 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:421
-#: plugins/admin/users/class_userManagement.inc:698
+#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/users/class_divListUsers.inc:57
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:400
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
@@ -4741,47 +5316,95 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:325
+#: plugins/admin/fai/class_faiPackage.inc:340
+msgid "Removing FAI package base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:369
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:329
+#: plugins/admin/fai/class_faiPackage.inc:373
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:350
+#: plugins/admin/fai/class_faiPackage.inc:394
 msgid "package is configured"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:374
+#: plugins/admin/fai/class_faiPackage.inc:400
+msgid "Package marked for removal"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:425
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
-#: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/fai/class_faiPackage.inc:484
+msgid "Saving FAI package base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:529
+msgid "Saving FAI package entry failed"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:29
+#: plugins/admin/systems/servRepositorySetup.tpl:1
+msgid "Repository"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:45
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/servRepositorySetup.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:244
 msgid "Release"
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:319
+#: plugins/admin/systems/class_printerPPDDialog.inc:413
 msgid "Section"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:55
+#: plugins/admin/fai/faiPackage.tpl:49
+msgid "Install method"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:65
 msgid "Used packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:57
+#: plugins/admin/fai/faiPackage.tpl:67
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:63 include/functions.inc:595
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
 msgid "Configure"
 msgstr ""
 
+#: plugins/admin/fai/faiPackage.tpl:74
+msgid "Toggle remove flag"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:332
+msgid "Removing FAI hook base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:383
+msgid "Saving FAI hook base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:451
+msgid "Removing FAI hook failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:457
+#: plugins/admin/fai/class_faiHook.inc:467
+msgid "Saving FAI hook failed"
+msgstr ""
+
 #: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
@@ -4816,23 +5439,31 @@ msgid "Remove class from profile"
 msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:381
+#: plugins/admin/fai/class_faiProfile.inc:359
+msgid "Removing FAI profile failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:383
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:385
+#: plugins/admin/fai/class_faiProfile.inc:387
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:395
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
+#: plugins/admin/fai/class_faiProfile.inc:429
+msgid "Saving FAI profile failed"
+msgstr ""
+
 #: plugins/admin/fai/faiProfile.tpl:32
 msgid "FAI classes"
 msgstr ""
@@ -4841,65 +5472,53 @@ msgstr ""
 msgid "FS type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-msgid "Mount point"
-msgstr ""
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
-msgid "Size in MB"
-msgstr ""
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-msgid "Mount options"
-msgstr ""
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
-msgid "FS option"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+msgid "FS option"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "Preserve"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:355
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:360
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:365
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:375
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:379
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:385
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:407
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -4921,10 +5540,6 @@ msgstr ""
 msgid "List of scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:42
-msgid "Choose a script to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiPackageNew.tpl:1
 msgid "Repository settings"
 msgstr ""
@@ -4953,23 +5568,65 @@ msgid ""
 "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:21
-msgid "Following releases are available"
+#: plugins/admin/fai/faiPackageNew.tpl:26
+msgid "please choose a release..."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:31
-msgid "Sections for this release"
+#: 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:35
-#: plugins/admin/systems/workstationStartup.tpl:47
-msgid "set"
+#: plugins/admin/fai/faiPackageNew.tpl:37
+msgid "Sections for this release"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:97
+#: 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:11
+msgid "Please enter a name for the branch"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/dep_iframe.tpl:1
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/dep_iframe.tpl:8
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Initiate operation"
+msgstr ""
+
 #: plugins/admin/fai/faiVariableEntry.tpl:29
 msgid "Variable attributes"
 msgstr ""
@@ -4982,10 +5639,6 @@ msgstr ""
 msgid "List of template files"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-msgid "Choose a template to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiPackageEntry.tpl:6
 msgid "List of available packages"
 msgstr ""
@@ -4996,89 +5649,203 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: plugins/admin/fai/class_divListFai.inc:43
+msgid "List of FAI classes"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:6
-msgid "List of FAI classes"
+#: plugins/admin/fai/class_divListFai.inc:44
+msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:24
+#: plugins/admin/fai/class_divListFai.inc:48
 msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:29
-msgid "Branches"
+#: plugins/admin/fai/class_divListFai.inc:64
+msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:35
-msgid "Current release"
+#: plugins/admin/fai/class_divListFai.inc:65
+msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Display FAI profile objects"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Show profiles"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:56
-msgid "Delete current release"
+#: plugins/admin/fai/class_divListFai.inc:69
+msgid "Display FAI template objects"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:71
-msgid "Show profiles"
+#: plugins/admin/fai/class_divListFai.inc:69
+#: plugins/admin/users/class_divListUsers.inc:60
+msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:72 plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
+#: plugins/admin/fai/class_divListFai.inc:70
+msgid "Display FAI scripts"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:73
+#: plugins/admin/fai/class_divListFai.inc:70
 msgid "Show scripts"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:74
+#: plugins/admin/fai/class_divListFai.inc:71
+msgid "Display FAI hooks"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:71
 msgid "Show hooks"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:75
+#: plugins/admin/fai/class_divListFai.inc:72
+msgid "Display FAI variables"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:72
 msgid "Show variables"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:76
+#: plugins/admin/fai/class_divListFai.inc:73
+msgid "Display FAI packages"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:73
 msgid "Show packages"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:77
+#: plugins/admin/fai/class_divListFai.inc:74
+msgid "Display FAI partitions"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:74
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:263
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/departments/class_divListDepartment.inc:79
+msgid "Go to users home department"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:131
+msgid "New profile"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:131
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "P"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "New partition table"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "PT"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "New scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "S"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:148
+msgid "New hooks"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:148
+msgid "H"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:151
+msgid "New variables"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:151
+msgid "V"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:154
+msgid "New templates"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:154
+msgid "T"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:157
+msgid "New package list"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:157
+msgid "PK"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:229
+#: plugins/admin/fai/class_divListFai.inc:234
+msgid "Edit class"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:236
+msgid "Delete class"
+msgstr ""
+
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
+#: plugins/admin/fai/class_faiPartitionTable.inc:275
 #, php-format
 msgid "%s partition"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:265
 #: plugins/admin/fai/class_faiPartitionTable.inc:271
+#: plugins/admin/fai/class_faiPartitionTable.inc:277
 #, php-format
 msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHookEntry.inc:141
+#: plugins/admin/fai/class_faiPartitionTable.inc:348
+msgid "Saving FAI partition table base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:390
+msgid "Removing FAI partition table failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:398
+#: plugins/admin/fai/class_faiPartitionTable.inc:407
+msgid "Saving FAI partition table failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:455
+msgid "Removing FAI partition table entry failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:464
+#: plugins/admin/fai/class_faiPartitionTable.inc:472
+msgid "Saving FAI partition table entry failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr ""
 
@@ -5103,48 +5870,61 @@ msgstr ""
 msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:42
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_faiVariable.inc:294
+msgid "Saving FAI variable base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariable.inc:356
+msgid "Removing FAI variable failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariable.inc:363
+#: plugins/admin/fai/class_faiVariable.inc:375
+msgid "Saving FAI variable failed"
+msgstr ""
+
+#: plugins/admin/fai/class_askClassName.inc:81
 msgid "Create new FAI object - partition table."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:78
+#: plugins/admin/fai/class_askClassName.inc:82
 msgid "Create new FAI object - package bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:79
+#: plugins/admin/fai/class_askClassName.inc:83
 msgid "Create new FAI object - script bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:80
+#: plugins/admin/fai/class_askClassName.inc:84
 msgid "Create new FAI object - variable bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:81
+#: plugins/admin/fai/class_askClassName.inc:85
 msgid "Create new FAI object - hook bundle."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:82
+#: plugins/admin/fai/class_askClassName.inc:86
 msgid "Create new FAI object - profile."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:83
+#: plugins/admin/fai/class_askClassName.inc:87
 msgid "Create new FAI object - template."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:84
+#: plugins/admin/fai/class_askClassName.inc:88
 msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:137
+#: plugins/admin/fai/class_askClassName.inc:142
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:141
+#: plugins/admin/fai/class_askClassName.inc:146
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -5176,13 +5956,12 @@ msgid "Choose class name"
 msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:39
 msgid "Use"
 msgstr ""
 
@@ -5190,39 +5969,54 @@ msgstr ""
 msgid "A new class name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:81
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:83
+#: plugins/admin/fai/class_faiTemplateEntry.inc:93
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:170
+#: plugins/admin/fai/class_faiTemplateEntry.inc:184
 msgid "Please specify a value for attribute 'file'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:174
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 msgid "Please specify a value for attribute 'path'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:182
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a user."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:185
+#: plugins/admin/fai/class_faiTemplateEntry.inc:199
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:189
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a group."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiTemplateEntry.inc:206
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr ""
 
+#: plugins/admin/fai/faiSummary.tpl:4
+msgid "FAI object tree"
+msgstr ""
+
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
+msgstr ""
+
 #: plugins/admin/fai/faiTemplateEntry.tpl:21
 msgid "Template attributes"
 msgstr ""
@@ -5237,7 +6031,7 @@ msgid "Save template"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
-#: plugins/admin/applications/generic.tpl:95
+#: plugins/admin/applications/generic.tpl:102
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 msgid "Upload"
@@ -5248,15 +6042,15 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:666
-#: plugins/admin/systems/class_printGeneric.inc:668
-#: plugins/admin/ogroups/class_ogroupManagement.inc:490
+#: plugins/admin/systems/class_printGeneric.inc:753
+#: plugins/admin/systems/class_printGeneric.inc:755
+#: plugins/admin/ogroups/class_ogroupManagement.inc:374
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
@@ -5266,7 +6060,7 @@ msgid "Access"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
-#: plugins/admin/systems/class_servDNS.inc:266
+#: plugins/admin/systems/class_servDNS.inc:167
 msgid "Class"
 msgstr ""
 
@@ -5280,9 +6074,11 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/server.tpl:49 plugins/admin/systems/terminal.tpl:110
-#: plugins/admin/systems/workstation.tpl:89
-#: plugins/admin/ogroups/termgroup.tpl:13
+#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/systems/server.tpl:60 plugins/admin/systems/terminal.tpl:125
+#: plugins/admin/systems/workstation.tpl:103
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/ogroups/termgroup.tpl:85
 msgid "Execute"
 msgstr ""
 
@@ -5310,53 +6106,7 @@ msgstr ""
 msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:42
-msgid "Choose a hook to delete or edit"
-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:11
-msgid "Please enter a name for the branch"
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_moce.tpl:1
-msgid ""
-"Processing requested operation, the status of this operation will be "
-"displayed in an iframe below."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:38
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid "Perform requested operation."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid "Initiate operation"
-msgstr ""
-
-#: plugins/admin/fai/remove_branch.tpl:6
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
-msgstr ""
-
-#: plugins/admin/groups/mail.tpl:11
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
 msgstr ""
 
@@ -5376,242 +6126,283 @@ msgstr ""
 msgid "Member permission"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:88
+#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
 msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:97
+#: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:288
+#: plugins/admin/groups/class_groupManagement.inc:245
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:294
-#: plugins/admin/groups/class_groupManagement.inc:320
+#: plugins/admin/groups/class_groupManagement.inc:251
+#: plugins/admin/groups/class_groupManagement.inc:282
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:367
-msgid "Create new group"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/applications/class_applicationManagement.inc:341
-#: plugins/admin/departments/class_departmentManagement.inc:310
-#: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-msgid "Edit this entry"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/applications/class_applicationManagement.inc:342
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-msgid "Delete this entry"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:396
-#: plugins/admin/users/class_userManagement.inc:735
-msgid "Posix"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:405
-#: plugins/admin/applications/class_applicationManagement.inc:352
-#: plugins/admin/ogroups/class_ogroupManagement.inc:491
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:420
-msgid "Groupname"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:425
-#: plugins/admin/applications/class_applicationManagement.inc:366
-#: plugins/admin/ogroups/class_ogroupManagement.inc:405
-msgid "This table displays all groups, in the selected tree."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:118
+#: plugins/admin/groups/class_groupGeneric.inc:123
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:174
+#: plugins/admin/groups/class_groupGeneric.inc:177
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:324
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:324
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:324
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:325
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:330
+#: plugins/admin/groups/class_groupGeneric.inc:323
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:440
-#, php-format
-msgid ""
+#: plugins/admin/groups/class_groupGeneric.inc:435
+msgid "! unknown id"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:467
+#, php-format
+msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:457
-msgid "! unknown id"
+#: plugins/admin/groups/class_groupGeneric.inc:496
+msgid "Removing group failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:593
+#: plugins/admin/groups/class_groupGeneric.inc:603
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:598
+#: plugins/admin/groups/class_groupGeneric.inc:608
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:711
-#: plugins/admin/ogroups/class_ogroup.inc:655
+#: plugins/admin/groups/class_groupGeneric.inc:693
+msgid "Saving group failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:722
+#: plugins/admin/ogroups/class_ogroup.inc:656
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:721
+#: plugins/admin/groups/class_groupGeneric.inc:732
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:732
-#: plugins/admin/groups/class_groupGeneric.inc:739
+#: plugins/admin/groups/class_groupGeneric.inc:744
+#: plugins/admin/groups/class_groupGeneric.inc:758
+#: plugins/admin/groups/class_groupGeneric.inc:765
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. 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/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+#: plugins/admin/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
 msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/admin/groups/class_divListGroup.inc:41
 msgid ""
 "This menu allows you to add, edit and remove selected groups. You may want "
 "to use the range selector on top of the group listbox, when working with a "
 "large number of groups."
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:41
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Groupname / Department"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:60
 msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:42
+#: plugins/admin/groups/class_divListGroup.inc:60
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:46
+#: plugins/admin/groups/class_divListGroup.inc:61
 msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/admin/groups/class_divListGroup.inc:61
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/class_divListGroup.inc:62
 msgid "Select to see groups that have applications configured"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/class_divListGroup.inc:62
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:54
+#: plugins/admin/groups/class_divListGroup.inc:63
 msgid "Select to see groups that have mail settings"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:55
+#: plugins/admin/groups/class_divListGroup.inc:63
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:58
+#: plugins/admin/groups/class_divListGroup.inc:64
 msgid "Select to see normal groups that have only functional aspects"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:59
+#: plugins/admin/groups/class_divListGroup.inc:64
 msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:278
+#: plugins/admin/groups/class_divListGroup.inc:112
+msgid "Create new group"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:146
+#: plugins/admin/users/class_divListUsers.inc:167
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/applications/class_divListApplication.inc:144
+#: plugins/admin/ogroups/class_ogroupManagement.inc:375
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:171
+#: plugins/admin/users/class_divListUsers.inc:223
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
+msgid "cut"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:171
+#: plugins/admin/users/class_divListUsers.inc:223
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
+msgid "Cut this entry"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:173
+#: plugins/admin/users/class_divListUsers.inc:225
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
+msgid "copy"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:173
+#: plugins/admin/users/class_divListUsers.inc:225
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
+msgid "Copy this entry"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:176
+#: plugins/admin/applications/class_divListApplication.inc:168
+#: plugins/admin/departments/class_divListDepartment.inc:129
+#: plugins/admin/ogroups/class_divListOGroup.inc:168
+#: plugins/gofon/conference/class_divListConferences.inc:131
+msgid "Edit this entry"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:170
+#: plugins/gofon/conference/class_divListConferences.inc:133
+#: plugins/gofon/conference/class_divListConferences.inc:135
+msgid "Delete this entry"
+msgstr ""
+
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. 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/groups/main.inc:40 plugins/admin/groups/main.inc:44
+msgid "Group administration"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:284
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:279
+#: plugins/admin/groups/class_groupMail.inc:285
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:280
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:281
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:282
+#: plugins/admin/groups/class_groupMail.inc:288
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:306
+#: plugins/admin/groups/class_groupMail.inc:312
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:371
+#: plugins/admin/groups/class_groupMail.inc:377
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:372
+#: plugins/admin/groups/class_groupMail.inc:378
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:803
+#: plugins/admin/groups/class_groupMail.inc:613
+msgid "Removing group mail settings failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:777
+msgid "Saving group mail settings failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:806
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:836
+#: plugins/admin/groups/class_groupMail.inc:839
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:840
+#: plugins/admin/groups/class_groupMail.inc:843
 msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:484
+#: include/class_ldap.inc:455 ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Object"
 msgstr ""
 
@@ -5624,15 +6415,23 @@ msgstr ""
 msgid "Apply this acl only for users own entries"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:4
+#: plugins/admin/groups/application.tpl:3
+msgid "Release focus"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:5
+msgid "Select release name"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:16
 msgid "Used applications"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:7
+#: plugins/admin/groups/application.tpl:19
 msgid "Add category"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:12
+#: plugins/admin/groups/application.tpl:24
 msgid "Available applications"
 msgstr ""
 
@@ -5641,7 +6440,7 @@ msgid "Select users to add"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:62
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
@@ -5655,64 +6454,80 @@ msgid "Display users of department"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:47
-#: plugins/admin/users/headpage.tpl:49
 #: plugins/admin/systems/glpiSelectUser.tpl:37
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:59
-msgid "This 'dn' is no acl container."
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:207
-msgid "All fields are writeable"
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
+#: plugins/admin/groups/paste_generic.tpl:5 plugins/admin/groups/generic.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:9
+#: plugins/admin/groups/paste_generic.tpl:8 plugins/admin/groups/generic.tpl:9
 msgid "Posix name of the group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
-msgid "Descriptive text for this group"
+#: plugins/admin/groups/paste_generic.tpl:13
+#: plugins/admin/groups/generic.tpl:41
+msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
-msgid "Choose subtree to place group in"
+#: plugins/admin/groups/paste_generic.tpl:15
+#: plugins/admin/groups/generic.tpl:41
+msgid "Force GID"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:37
-msgid "Normally IDs are autogenerated, select to specify manually"
+#: plugins/admin/groups/paste_generic.tpl:18
+#: plugins/admin/groups/generic.tpl:43
+msgid "Forced ID number"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:37
-msgid "Force GID"
+#: plugins/admin/groups/class_groupAcl.inc:59
+msgid "This 'dn' is no acl container."
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:39
-msgid "Forced ID number"
+#: plugins/admin/groups/class_groupAcl.inc:100
+msgid "Removing ACL information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:196
+msgid "Saving ACL information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:206
+msgid "All fields are writeable"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
+msgid "Descriptive text for this group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+msgid "Choose subtree to place group in"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:46
+#: plugins/admin/groups/generic.tpl:50
 msgid "Select to create a samba conform group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:51
+#: plugins/admin/groups/generic.tpl:55
 msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:72
 msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:81
+#: plugins/admin/groups/generic.tpl:85
 msgid "Members are in a nagios group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:97
+#: plugins/admin/groups/generic.tpl:101
 msgid "Group members"
 msgstr ""
 
@@ -5724,7 +6539,7 @@ msgstr ""
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:1
+#: plugins/admin/groups/application_options.tpl:2
 msgid "Application options"
 msgstr ""
 
@@ -5736,69 +6551,106 @@ msgstr ""
 msgid "Display addresses matching"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:295
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:303
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:304
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:306
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:307
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:319
+#: plugins/admin/groups/class_groupApplication.inc:417
 msgid "Invalid character in category name."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:327
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "The specified category already exists."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:393
+#: plugins/admin/groups/class_groupApplication.inc:520
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:429
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:529
+#: plugins/admin/groups/class_groupApplication.inc:638
+#: plugins/admin/departments/class_divListDepartment.inc:146
+msgid "department"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:646
 msgid "application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:560
-#: plugins/admin/groups/class_groupApplication.inc:596
+#: plugins/admin/groups/class_groupApplication.inc:677
+#: plugins/admin/groups/class_groupApplication.inc:713
 msgid "Delete entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:564
-#: plugins/admin/groups/class_groupApplication.inc:594
+#: plugins/admin/groups/class_groupApplication.inc:681
+#: plugins/admin/groups/class_groupApplication.inc:711
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:565
-#: plugins/admin/groups/class_groupApplication.inc:595
+#: plugins/admin/groups/class_groupApplication.inc:682
+#: plugins/admin/groups/class_groupApplication.inc:712
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:592
+#: plugins/admin/groups/class_groupApplication.inc:709
 msgid "Insert seperator"
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:737
+msgid "This application is no longer available."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:740
+#, php-format
+msgid "This application is not available in any release named %s."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:744
+msgid "Check parameter"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:746
+msgid "This application has changed parameters."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:832
+msgid "Removing application information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:877
+msgid "Saving application information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:919
+#, php-format
+msgid ""
+"Can't resolve the release name '%s', setting release name to '%s'. Possibly "
+"the objects base has changed."
+msgstr ""
+
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -5806,202 +6658,231 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:66
+#: plugins/admin/users/class_userManagement.inc:28
+#: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
 #: html/getxls.php:70 html/getxls.php:243
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:254
-#: plugins/admin/users/class_userManagement.inc:324
+#: plugins/admin/users/class_userManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:273
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:312
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:394
+#: plugins/admin/users/class_userManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:345
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:495
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
+#: plugins/admin/users/class_userManagement.inc:453
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/ogroups/class_ogroup.inc:277
+#: ihtml/themes/default/snapshotdialog.tpl:35
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:566
+#: plugins/admin/users/class_userManagement.inc:531
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:681
-msgid "Create new user"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:681
-msgid "New user"
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
-msgid "Create new template"
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:752
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
-msgid "New template"
+#: plugins/admin/users/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:689
-msgid "password"
+#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+msgid "User administration"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:35
+#: plugins/admin/users/class_divListUsers.inc:36
+#: plugins/admin/systems/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:40
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:697
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: plugins/admin/users/class_divListUsers.inc:56
 #: ihtml/themes/default/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:702
-msgid "This table displays all users, in the selected tree."
+#: plugins/admin/users/class_divListUsers.inc:60
+msgid "Select to see template pseudo users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:733
-msgid "GOsa"
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Select to see users that have only a GOsa object"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:734
-msgid "Edit generic properties"
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Show functional users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:736
-msgid "Edit UNIX properties"
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Select to see users that have posix settings"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:738
-msgid "Edit environment properties"
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Show unix users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:740
-msgid "Edit mail properties"
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Select to see users that have mail settings"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
-msgid "Edit phone properties"
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Show mail users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:744
-msgid "Edit fax properies"
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Select to see users that have samba settings"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:746
-msgid "Edit samba properties"
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Show samba users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:747
-msgid "Create user from template"
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Select to see users that have proxy settings"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:748
-msgid "Create user with this template"
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:807
-msgid "Online"
+#: plugins/admin/users/class_divListUsers.inc:116
+msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:814
-msgid "Offline"
+#: plugins/admin/users/class_divListUsers.inc:116
+msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1041
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "Template"
+#: plugins/admin/users/class_divListUsers.inc:118
+msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: plugins/admin/users/class_divListUsers.inc:118
+msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-#: plugins/admin/systems/glpiSelectUser.tpl:6
-msgid "List of users"
+#: plugins/admin/users/class_divListUsers.inc:165
+msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:24
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+#: plugins/admin/users/class_divListUsers.inc:166
+msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
+#: plugins/admin/users/class_divListUsers.inc:168
+msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
+#: plugins/admin/users/class_divListUsers.inc:170
+msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
+#: plugins/admin/users/class_divListUsers.inc:172
+msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
+#: plugins/admin/users/class_divListUsers.inc:174
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
+#: plugins/admin/users/class_divListUsers.inc:176
+msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
+#: plugins/admin/users/class_divListUsers.inc:178
+msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
+#: plugins/admin/users/class_divListUsers.inc:180
+msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
+#: plugins/admin/users/class_divListUsers.inc:181
+msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
+#: plugins/admin/users/class_divListUsers.inc:182
+msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
+#: plugins/admin/users/class_divListUsers.inc:229
+msgid "password"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
+#: plugins/admin/users/class_divListUsers.inc:251
+msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
+#: plugins/admin/users/class_divListUsers.inc:258
+msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
+#: plugins/admin/applications/class_divListApplication.inc:31
+msgid "List of Applications"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:6
+#: plugins/admin/applications/class_divListApplication.inc:32
+msgid "This table displays all applications in the selected tree."
+msgstr ""
+
+#: plugins/admin/applications/class_divListApplication.inc:36
 msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+
+#: plugins/admin/applications/class_divListApplication.inc:51
+#: plugins/admin/applications/generic.tpl:7
+#: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationGeneric.inc:446
+msgid "Application name"
+msgstr ""
+
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
+msgid "new"
+msgstr ""
+
+#: plugins/admin/applications/class_divListApplication.inc:115
+msgid "Create new application"
 msgstr ""
 
 #: plugins/admin/applications/class_applicationParameters.inc:52
@@ -6034,15 +6915,17 @@ msgstr ""
 msgid "Add option"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:158
+#: plugins/admin/applications/class_applicationParameters.inc:128
+msgid "Removing application parameters failed"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:159
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:361
-msgid "Application name"
+#: plugins/admin/applications/class_applicationParameters.inc:190
+msgid "Saving applications parameters failed"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:11
@@ -6051,6 +6934,7 @@ msgid "Display name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:451
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
@@ -6062,35 +6946,35 @@ msgstr ""
 msgid "Choose subtree to place application in"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:48
+#: plugins/admin/applications/generic.tpl:55
 msgid "Icon"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
 msgid "Update"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
 msgid "Reload picture from LDAP"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:77
 msgid "Only executable for members"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:72
+#: plugins/admin/applications/generic.tpl:79
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:76
+#: plugins/admin/applications/generic.tpl:83
 msgid "Place icon on members desktop"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/generic.tpl:86
 msgid "Place entry in members startmenu"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:82
+#: plugins/admin/applications/generic.tpl:89
 msgid "Place entry in members launch bar"
 msgstr ""
 
@@ -6100,79 +6984,106 @@ msgid ""
 "to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/applications/main.inc:39
+#: plugins/admin/applications/main.inc:41
+msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/applications/class_applicationGeneric.inc:96
+msgid "no example"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:38
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationGeneric.inc:116
+msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationGeneric.inc:199
+msgid "Removing application failed"
 msgstr ""
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
+#: plugins/admin/applications/class_applicationGeneric.inc:211
+#, php-format
+msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:87
-msgid "no example"
+#: plugins/admin/applications/class_applicationGeneric.inc:218
+#, php-format
+msgid "Removing application from group '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:107
-msgid "This 'dn' is no application."
+#: plugins/admin/applications/class_applicationGeneric.inc:260
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:215
-msgid "The specified picture has not been uploaded correctly."
+#: plugins/admin/applications/class_applicationGeneric.inc:336
+msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:296
+#: plugins/admin/applications/class_applicationGeneric.inc:350
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:301
+#: plugins/admin/applications/class_applicationGeneric.inc:355
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:305
+#: plugins/admin/applications/class_applicationGeneric.inc:359
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:309
+#: plugins/admin/applications/class_applicationGeneric.inc:363
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:318
+#: plugins/admin/applications/class_applicationGeneric.inc:378
+#: plugins/admin/applications/class_applicationGeneric.inc:386
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:254
-#, php-format
-msgid "You're about to delete the application '%s'."
+#: plugins/admin/applications/class_applicationGeneric.inc:417
+msgid "Saving application failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:260
-#: plugins/admin/applications/class_applicationManagement.inc:286
+#: plugins/admin/applications/class_applicationGeneric.inc:442
+msgid "Application settings"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:289
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:295
+#: plugins/admin/applications/class_applicationManagement.inc:324
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:334
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-msgid "new"
+#: plugins/admin/departments/class_divListDepartment.inc:27
+#: plugins/admin/departments/class_divListDepartment.inc:28
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:334
-msgid "Create new application"
+#: plugins/admin/departments/class_divListDepartment.inc:33
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on   top "
+"of the department list."
+msgstr ""
+
+#: plugins/admin/departments/class_divListDepartment.inc:47
+msgid "Department name"
+msgstr ""
+
+#: plugins/admin/departments/class_divListDepartment.inc:91
+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/generic.tpl:8
@@ -6184,7 +7095,7 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:61
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -6197,30 +7108,38 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:122
+#: plugins/gofon/conference/generic.tpl:127
 msgid "Choose subtree to place department in"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:48
+#: plugins/admin/departments/generic.tpl:52
 msgid "State where this subtree is located"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:52
+#: plugins/admin/departments/generic.tpl:56
 msgid "Location of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:56
+#: plugins/admin/departments/generic.tpl:60
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:60
+#: plugins/admin/departments/generic.tpl:64
 msgid "Base telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:64
+#: plugins/admin/departments/generic.tpl:68
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
+#: plugins/admin/departments/generic.tpl:81
+msgid "Administrative settings"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl:83
+msgid "Tag department as an independent administrative unit"
+msgstr ""
+
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
 msgid ""
@@ -6229,10 +7148,6 @@ msgid ""
 "your data back."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr ""
-
 #: plugins/admin/departments/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
@@ -6248,98 +7163,218 @@ msgstr ""
 msgid "Regular expression for matching department names"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
+#: plugins/admin/departments/class_departmentGeneric.inc:170
+msgid "Removing department failed"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:226
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
+#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:202
+#: plugins/admin/departments/class_departmentGeneric.inc:243
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/departments/class_departmentGeneric.inc:247
+#, php-format
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:291
+msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
+#: plugins/admin/departments/class_departmentGeneric.inc:333
+msgid "Saving department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:274
+#: plugins/admin/departments/class_departmentGeneric.inc:371
 #, php-format
-msgid "Moving %s in %s"
+msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:313
+#: plugins/admin/departments/class_departmentGeneric.inc:448
 #, php-format
-msgid "FAILED to copy %s, aborting operation"
+msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-msgid "Complete"
+#: plugins/admin/departments/class_departmentGeneric.inc:487
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:399
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:186
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
+#: plugins/admin/departments/class_departmentManagement.inc:181
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:300
-msgid "Create new department"
+#: plugins/admin/departments/class_departmentManagement.inc:345
+msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:308
-msgid "This table displays all departments, in the selected tree."
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:317
-msgid "Department name"
+#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:411
-msgid ".."
+#: plugins/admin/systems/class_terminalService.inc:72
+#: plugins/admin/systems/class_terminalService.inc:100
+#: plugins/admin/systems/class_terminalService.inc:106
+#: plugins/admin/systems/class_terminalService.inc:116
+#: plugins/admin/systems/class_terminalService.inc:117
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:123
+#: plugins/admin/systems/class_terminalService.inc:214
+#: 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_terminalStartup.inc:39
+#: plugins/admin/systems/class_terminalStartup.inc:111
+#: plugins/admin/systems/class_terminalStartup.inc:131
+#: 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_workstationStartup.inc:266
+#: plugins/admin/systems/class_workstationStartup.inc:284
+#: plugins/admin/systems/class_workstationStartup.inc:288
+#: plugins/admin/systems/class_workstationStartup.inc:788
+#: plugins/admin/systems/class_workstationGeneric.inc:118
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_terminalGeneric.inc:280
+msgid "inherited"
 msgstr ""
 
-#: plugins/admin/departments/recursive_moce.tpl:3
-msgid ""
-"Your browser isn't able to display this iframe ... use the link below intead"
+#: plugins/admin/systems/class_terminalService.inc:101
+#: 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_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+msgid "bit"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
-msgid "present"
+#: plugins/admin/systems/class_terminalService.inc:155
+msgid "default"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
+msgid "show chooser"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
+msgid "direct"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
+msgid "load balanced"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
+msgid "Windows RDP"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
+msgid "ICA client"
 msgstr ""
 
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_workstationService.inc:204
+msgid "Bit"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:252
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_workstationService.inc:151
-#: plugins/admin/systems/class_workstationStartup.inc:372
-#: plugins/admin/systems/class_terminalGeneric.inc:153
+#: plugins/admin/systems/class_terminalStartup.inc:151
+#: plugins/admin/systems/class_workstationService.inc:241
+#: plugins/admin/systems/class_workstationStartup.inc:481
+#: plugins/admin/systems/class_terminalGeneric.inc:230
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_workstationService.inc:291
+msgid "Choose the phone located at the current terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:365
+#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:354
+#: plugins/admin/systems/class_workstationService.inc:359
+msgid "Please specify a valid VSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:380
+#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:369
+#: plugins/admin/systems/class_workstationService.inc:374
+msgid "Please specify a valid HSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:416
+msgid "Saving terminal service information failed"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:1 plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:4 plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:8 plugins/admin/systems/servdb.tpl:14
+#: plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/goImapServer.tpl:19
+msgid "Admin user"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:199
+msgid "present"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalInfo.inc:74
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
@@ -6369,298 +7404,993 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network\tsettings"
+#: plugins/admin/systems/class_goLdapServer.inc:27
+#: plugins/admin/systems/goLdapServer.tpl:1
+msgid "LDAP service"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:9
-msgid "IP-address"
+#: plugins/admin/systems/class_goLdapServer.inc:47
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:13
-msgid "MAC-address"
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:29
-msgid "Enable DNS for this device"
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFaxServer.inc:185
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:353
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:30
-#: plugins/admin/systems/servdnseditzone.tpl:63
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
+#: plugins/admin/systems/ServiceAddDialog.tpl:3
+msgid "Adding a new service to the current server"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:34
-msgid "Zone"
+#: plugins/admin/systems/ServiceAddDialog.tpl:7
+msgid ""
+"This dialog allows you to add new services to the currenty edited server "
+"object. The box below shows all available but not already used services."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:265
-#: plugins/admin/systems/servdnseditzone.tpl:81
-msgid "TTL"
+#: plugins/admin/systems/ServiceAddDialog.tpl:13
+msgid "Service to add"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:47
-msgid "Dns records"
+#: plugins/admin/systems/ServiceAddDialog.tpl:20
+msgid "All available services are already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/ogroups/class_termgroup.inc:38
+msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/class_servGeneric.inc:67
+msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:523
-#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_workstationGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:154
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:80
+#: plugins/admin/systems/class_workstationGeneric.inc:144
+#: plugins/admin/systems/class_terminalGeneric.inc:171
+#: plugins/admin/systems/class_terminalGeneric.inc:183
+#: plugins/admin/systems/class_terminalGeneric.inc:195
+#: plugins/admin/ogroups/class_termgroup.inc:158
 #, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/systems/class_terminalGeneric.inc:262
+#: plugins/admin/ogroups/class_termgroup.inc:204
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/systems/class_terminalGeneric.inc:263
+#: plugins/admin/ogroups/class_termgroup.inc:205
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
+#: plugins/admin/systems/class_servGeneric.inc:162
+#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/ogroups/class_termgroup.inc:206
+msgid "Instant update"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
+#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:171
+#: plugins/admin/systems/class_workstationGeneric.inc:248
+#: plugins/admin/systems/class_workstationGeneric.inc:256
+#: plugins/admin/ogroups/class_termgroup.inc:207
+msgid "Scheduled update"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
+#: plugins/admin/systems/class_servGeneric.inc:164
+#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_workstationGeneric.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/ogroups/class_termgroup.inc:208
+msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
+#: plugins/admin/systems/class_servGeneric.inc:165
+#: plugins/admin/systems/class_workstationGeneric.inc:250
+#: plugins/admin/ogroups/class_termgroup.inc:209
+msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
+#: plugins/admin/systems/class_servGeneric.inc:166
+#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_workstationGeneric.inc:257
+#: plugins/admin/systems/class_terminalGeneric.inc:264
+#: plugins/admin/systems/class_terminalGeneric.inc:268
+#: plugins/admin/ogroups/class_termgroup.inc:40
+msgid "Memory test"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
+#: plugins/admin/systems/class_servGeneric.inc:167
+#: plugins/admin/systems/class_servGeneric.inc:173
+#: plugins/admin/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_workstationGeneric.inc:258
+#: plugins/admin/systems/class_terminalGeneric.inc:265
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/ogroups/class_termgroup.inc:41
+msgid "System analysis"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
+#: plugins/admin/systems/class_servGeneric.inc:169
+#: plugins/admin/systems/class_workstationGeneric.inc:254
+#: plugins/admin/systems/class_terminalGeneric.inc:267
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
+#: plugins/admin/systems/class_servGeneric.inc:188
+msgid "Removing server failed"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
+#: plugins/admin/systems/class_servGeneric.inc:224
+msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:64
-msgid "Floppy device"
+#: plugins/admin/systems/class_servGeneric.inc:231
+msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:68
-msgid "CDROM device"
+#: plugins/admin/systems/class_servGeneric.inc:242
+#: plugins/admin/systems/class_workstationGeneric.inc:361
+#: plugins/admin/systems/class_terminalGeneric.inc:391
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_printGeneric.inc:618
+#: 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/info.tpl:73
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
+#: plugins/admin/systems/class_servGeneric.inc:300
+msgid "Saving server failed"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:77
-msgid "Audio device"
+#: plugins/admin/systems/network.tpl:1
+msgid "Network\tsettings"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:93
-msgid "Up since"
+#: plugins/admin/systems/network.tpl:9
+msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:96
-msgid "CPU load"
+#: plugins/admin/systems/network.tpl:13
+msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:99
-msgid "Memory usage"
+#: plugins/admin/systems/network.tpl:19
+msgid "Autodetect"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:102
-msgid "Swap usage"
+#: plugins/admin/systems/network.tpl:41
+msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:116
-msgid "SSH service"
+#: plugins/admin/systems/network.tpl:50
+msgid "Zone"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:119
-msgid "Print service"
+#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/servdnseditzone.tpl:85
+msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:122
-msgid "Scan service"
+#: plugins/admin/systems/network.tpl:63
+msgid "Dns records"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:125
-msgid "Sound service"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
-msgid "default"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
-msgid "show chooser"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
-msgid "direct"
+#: plugins/admin/systems/class_servDNS.inc:32
+msgid "Domain name system service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
-msgid "load balanced"
+#: plugins/admin/systems/class_servDNS.inc:73
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
-msgid "Windows RDP"
+#: plugins/admin/systems/class_servDNS.inc:74
+#: plugins/admin/systems/class_inventory.inc:37
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "ICA client"
+#: plugins/admin/systems/class_servDNS.inc:76
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
-msgid "Choose the phone located at the current terminal"
+#: plugins/admin/systems/class_servDNS.inc:77
+#: plugins/admin/systems/class_inventory.inc:40
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-msgid "Please specify a valid VSync range."
+#: plugins/admin/systems/class_servDNS.inc:165
+msgid "Reverse zone"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-msgid "Please specify a valid HSync range."
+#: 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:288
+msgid "Updating DNS service failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:297
+msgid "Removing DNS entries failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:318
+msgid "Saving DNS entries failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:357
+msgid "DNS service"
+msgstr ""
+
+#: plugins/admin/systems/class_goSyslogServer.inc:26
+msgid "Logging service"
+msgstr ""
+
+#: plugins/admin/systems/class_goSyslogServer.inc:46
+msgid "Syslog service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:29
+msgid "FAX service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+msgid "FAX database configuration"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:134
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+msgid "The attribute user is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:137
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, php-format
+msgid "The attribute password is empty or contains invalid characters."
+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:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:63
+#: 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/glpiAttachmentEdit.tpl:18
+#: 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/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:64
+msgid "Floppy device"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:68
+msgid "CDROM device"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:77
+msgid "Audio device"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:93
+msgid "Up since"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:96
+msgid "CPU load"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:99
+msgid "Memory usage"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:102
+msgid "Swap usage"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:116
+msgid "SSH service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:119
+#: plugins/admin/systems/class_goCupsServer.inc:26
+#: plugins/admin/systems/class_goCupsServer.inc:46
+msgid "Print service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:122
+msgid "Scan service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:125
+msgid "Sound service"
+msgstr ""
+
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:22 plugins/admin/systems/component.tpl:15
+#: plugins/admin/systems/server.tpl:17 plugins/admin/systems/terminal.tpl:19
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/workstation.tpl:25 plugins/admin/systems/phone.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:39
+msgid "Printer location"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:51
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:63
+msgid "Permissions"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:70
+msgid "Users which are allowed to use this printer"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+msgid "Add user"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+msgid "Add group"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:86
+msgid "Users which are allowed to administrate this printer"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:87
+msgid "Admins"
 msgstr ""
 
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:30 plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_goFonServer.inc:52
+msgid "Asterisk management"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:46 plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:54
+#: plugins/admin/systems/goFonServer.tpl:12
+msgid "Country dial prefix"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:58
+#: plugins/admin/systems/goFonServer.tpl:16
+msgid "Local dial prefix"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/goImapServer.tpl:7
+msgid "Server identifier"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/goImapServer.tpl:13
+msgid "Connect URL"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:91
+#: plugins/admin/systems/goImapServer.tpl:31
+msgid "Sieve port"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/class_goLogDBServer.inc:29
+#: plugins/admin/systems/class_goLogDBServer.inc:49
+msgid "Logging database"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+#: plugins/admin/systems/goLogDBServer.tpl:4
+#: plugins/admin/systems/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/goGlpiServer.tpl:14
+msgid "Database"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:46
+msgid "Parallel"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_workstationStartup.inc:309
+#, php-format
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:386
+msgid "Saving terminal startup settings failed"
+msgstr ""
+
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr ""
+
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+msgid "Rename"
+msgstr ""
+
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:44
+msgid "Start IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:51
+msgid "Start IMAP SSL service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:58
+msgid "Start POP3 service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:65
+msgid "Start POP3 SSL service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:76
+#: plugins/admin/systems/goMailServer.tpl:149
+msgid "The server must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:78
+#: plugins/admin/systems/goMailServer.tpl:151
+msgid "The service must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:81
+#: plugins/admin/systems/goMailServer.tpl:154
+msgid "Set new status"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/systems/goMailServer.tpl:160
+msgid "Set status"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:17
+#: plugins/admin/systems/class_divListSystemService.inc:18
+msgid "Installed services"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:22
+msgid ""
+"This menu allows you to add, remove and configure the properties of a "
+"specific service."
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:30
+msgid "Service name"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+msgid "Add service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+msgid "Add new service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all services"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#: plugins/admin/systems/class_divListSystemService.inc:106
+msgid "Stop service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+msgid "Stop all services"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#: plugins/admin/systems/class_divListSystemService.inc:112
+msgid "Restart service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:58
+msgid "Restart all services"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:86
+msgid "Stopped"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:87
+msgid "Started"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:88
+msgid "Restarting"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:89
+msgid "User status"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:100
+msgid "Start service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:118
+msgid "Edit service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:124
+msgid "Remove service"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:415
+msgid "Saving workstation services failed"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, 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
+msgid "Cartridges"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/server.tpl:50 plugins/admin/systems/terminal.tpl:115
+#: plugins/admin/systems/workstation.tpl:93
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
+msgid "Action"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "New monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "M"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Add/Edit monitor"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+msgid "Yes"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+msgid "No"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:97
+msgid "Add/Edit other device"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:249
+msgid "Add/Edit controller"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/glpi_devices.tpl:371
+msgid "Add/Edit harddisk"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/glpi_devices.tpl:443
+msgid "Add/Edit memory"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:109
-msgid "Mail server"
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
+#: plugins/admin/systems/glpi_devices.tpl:507
+msgid "Add/Edit sound card"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
+#: plugins/admin/systems/glpi_devices.tpl:553
+msgid "Add/Edit network interface"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
+#: plugins/admin/systems/glpi_devices.tpl:607
+msgid "Add/Edit processor"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
+#: plugins/admin/systems/glpi_devices.tpl:649
+msgid "Default frequence"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
+#: plugins/admin/systems/glpi_devices.tpl:696
+msgid "Chipset"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
+#: plugins/admin/systems/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
 msgstr ""
 
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
+#: plugins/admin/systems/glpi_devices.tpl:742
+msgid "format"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:4
@@ -6669,9 +8399,9 @@ msgid "Keyboard"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
 msgid "Model"
 msgstr ""
 
@@ -6722,23 +8452,19 @@ msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:66
 #: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
 #: plugins/gofon/phoneaccount/generic.tpl:24
 msgid "Telephone hardware"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:69
 #: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
 #: plugins/gofon/phoneaccount/generic.tpl:26
 #: plugins/gofon/phoneaccount/generic.tpl:28
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -6764,10 +8490,6 @@ msgstr ""
 msgid "Display device"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:126
 msgid "Automatic modelines"
 msgstr ""
@@ -6807,46 +8529,114 @@ msgstr ""
 msgid "Provide scan services"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
+#: plugins/admin/systems/class_glpiAccount.inc:144
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+msgid "There is no server with valid glpi database service."
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-msgid "Display members of department"
+#: plugins/admin/systems/class_glpiAccount.inc:154
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-msgid "Display members matching"
+#: plugins/admin/systems/class_glpiAccount.inc:164
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+msgid "Can't connect to glpi database, check configuration twice."
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-msgid "Regular expression for matching member names"
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, 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
+msgid "Rename failed, this system type name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:379
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, 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
+msgid "Updating operating system failed, specifed name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+msgid "Remove inventory"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:566
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+msgid "Add inventory"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:569
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
+msgid "N/A"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:667
+msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:313
+#: plugins/admin/systems/class_workstationStartup.inc:416
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:354
+#: plugins/admin/systems/class_workstationStartup.inc:461
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:410
+#: plugins/admin/systems/class_workstationStartup.inc:519
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:691
+#: plugins/admin/systems/class_workstationStartup.inc:859
 #, 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:702
+#: plugins/admin/systems/class_workstationStartup.inc:870
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -6855,198 +8645,168 @@ msgid ""
 "be saved."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
+#: plugins/admin/systems/class_workstationStartup.inc:1037
+msgid "Saving workstation startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "yes"
+#: plugins/admin/systems/class_workstationStartup.inc:1087
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "no"
+#: plugins/admin/systems/class_workstationStartup.inc:1089
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
+#, php-format
+msgid ""
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "Networksettings"
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
+msgid "Can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
 #, 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:294
-msgid "The required field 'Phone name' is not set."
+"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_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
+msgid "Please specify a valid ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
+#: plugins/admin/systems/class_printerPPDDialog.inc:186
+#, php-format
+msgid "Can't select PPD file '%s', the file is not readable"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/class_printerPPDDialog.inc:203
+#: plugins/admin/systems/class_printerPPDDialog.inc:275
 #, php-format
-msgid "Can't open '%s', ppd settings resetted."
+msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
 #, php-format
-msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
+msgid "Can't create file '%s' to store modifed ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
+#: plugins/admin/systems/class_printerPPDDialog.inc:235
+#, php-format
+msgid "Can't add new ppd file, the source file '%s' is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#: plugins/admin/systems/class_printerPPDDialog.inc:253
 #, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
+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:138
+#: plugins/admin/systems/class_printerPPDDialog.inc:267
 #, php-format
 msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
 #, php-format
 msgid "Can't save file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-msgid "Please specify a valid ppd file."
-msgstr ""
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-msgid "Please select a valid ppd."
+#: plugins/admin/systems/class_printerPPDDialog.inc:292
+msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
 msgid "True"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
 msgid "False"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr ""
-
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr ""
-
-#: plugins/admin/systems/server.tpl:43
-msgid "Select action to execute for this server"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
+#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/servservice.tpl:99
+msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
+#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/goSyslogServer.tpl:1
+msgid "enabled"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
+#: plugins/admin/systems/server.tpl:32 plugins/admin/systems/terminal.tpl:34
+#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/ogroups/termgroup.tpl:38
+msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-msgid "No REBOOTCMD definition found in your gosa.conf"
+#: plugins/admin/systems/server.tpl:34 plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:41
+#: plugins/admin/ogroups/termgroup.tpl:40
+msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-msgid "No HALTCMD definition found in your gosa.conf"
+#: plugins/admin/systems/server.tpl:54
+msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/servservice.tpl:91
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+msgid "Inventory database"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
+#: plugins/admin/systems/class_goFonServer.inc:32
+msgid "VoIP service"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
+#: plugins/admin/systems/class_goFonServer.inc:137
+#, php-format
+msgid "The attribute DB user is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-msgid "Select"
+#: plugins/admin/systems/class_goFonServer.inc:143
+#, php-format
+msgid ""
+"The attribute local dial prefix is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
+#: plugins/admin/systems/class_goFonServer.inc:146
+#, php-format
+msgid ""
+"The attribute country dial prefix is empty or contains invalid characters."
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:4
@@ -7056,967 +8816,952 @@ msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr ""
-
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
+msgid "Boot kernel"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
+msgid "Custom options"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:19
 #: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
-msgstr ""
-
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
-msgstr ""
-
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:37
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "LDAP server"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/systems/workstationStartup.tpl:71
 msgid "FAI server"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:54
+#: plugins/admin/systems/workstationStartup.tpl:63
+#: plugins/admin/systems/workstationStartup.tpl:95
 msgid "Assigned FAI classes"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/workstationStartup.tpl:85
+msgid "set"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:116
 #: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/workstationStartup.tpl:118
 #: plugins/admin/systems/terminalStartup.tpl:55
 msgid "Add additional modules to load on startup"
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr ""
-
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
+#: plugins/admin/systems/workstationStartup.tpl:142
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-msgid "The required field 'Server name' is not set."
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:21
-msgid "Mode"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
-msgid "Select terminal mode"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:53
-msgid "Root server"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:55
-msgid "Select NFS root filesystem to use"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Swap server"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
+msgid "since"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:63
-msgid "Choose NFS filesystem to place swap files on"
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+msgid "Terminal service"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
+#: plugins/admin/systems/goTerminalServer.tpl:6
+#: plugins/admin/systems/servservice.tpl:75
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/goTerminalServer.tpl:9
+#: plugins/admin/systems/servservice.tpl:78
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
-msgid "NTP server"
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Choose server to use for synchronizing time"
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:47
+msgid "Syslog server"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
+#: plugins/admin/systems/terminal.tpl:44
+#: plugins/admin/systems/workstation.tpl:49
+#: plugins/admin/ogroups/termgroup.tpl:49
+msgid "Choose server to use for logging"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/terminal.tpl:59
+msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/terminal.tpl:67
+msgid "Swap server"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
+#: plugins/admin/systems/terminal.tpl:90
+#: plugins/admin/systems/workstation.tpl:69
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-msgid "Can't connect to glpi database, check configuration twice."
+#: plugins/admin/systems/terminal.tpl:92
+#: plugins/admin/systems/workstation.tpl:71
+#: plugins/admin/ogroups/termgroup.tpl:16
+msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
+#: plugins/admin/systems/terminal.tpl:119
+#: plugins/admin/systems/workstation.tpl:97
+#: plugins/admin/ogroups/termgroup.tpl:79
+msgid "Select action to execute for this terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
-#, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
-msgid "Rename failed, this system type name is already used."
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
-msgid "Adding new operating system failed, specifed name is already used."
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
-#, php-format
-msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+#: plugins/admin/systems/servkolab.tpl:9
+msgid "Postfix mydomain"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-msgid "Updating operating system failed, specifed name is already used."
+#: plugins/admin/systems/servkolab.tpl:16
+msgid "Postfix mydestination"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:564
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-msgid "Remove inventory"
+#: plugins/admin/systems/servkolab.tpl:33
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:565
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/servkolab.tpl:41
+msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:567
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-msgid "Add inventory"
+#: plugins/admin/systems/servkolab.tpl:49
+msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/systems/servkolab.tpl:57
+msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
+#: plugins/admin/systems/servkolab.tpl:65
+msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
+#: plugins/admin/systems/servkolab.tpl:73
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
+#: plugins/admin/systems/servkolab.tpl:89
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
-msgid "No ACTIONCMD definition found in your gosa.conf"
+#: plugins/admin/systems/servkolab.tpl:100
+msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
+#: plugins/admin/systems/servkolab.tpl:116
+msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
+#: plugins/admin/systems/servkolab.tpl:121
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
+#: plugins/admin/systems/servkolab.tpl:136
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
+#: plugins/admin/systems/servkolab.tpl:141
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/servkolab.tpl:157
+msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
+#: plugins/admin/systems/servkolab.tpl:168
+msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
+#: plugins/admin/systems/servkolab.tpl:182
+msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/servkolab.tpl:188
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:526
-#, php-format
-msgid "You're about to delete all information about the component at '%s'."
+#: plugins/admin/systems/class_goKrbServer.inc:29
+msgid "Kerberos service"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-msgid "New Terminal template"
+#: plugins/admin/systems/class_goKrbServer.inc:49
+msgid "Kerberos kadmin access informations"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "New Terminal"
+#: plugins/admin/systems/class_goKrbServer.inc:135
+#: plugins/admin/systems/class_servDB.inc:167
+#, php-format
+msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-msgid "New Workstation template"
+#: plugins/admin/systems/class_goKrbServer.inc:138
+#, php-format
+msgid "The specified kerberos admin is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Workstation"
+#: plugins/admin/systems/class_goKrbServer.inc:141
+#, php-format
+msgid "The specified kerberos realm is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:764
-msgid "New Server"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:765
-#: plugins/admin/systems/class_systemManagement.inc:766
-msgid "New Printer"
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
-#: plugins/admin/systems/class_systemManagement.inc:768
-msgid "New Phone"
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:769
-#: plugins/admin/systems/class_systemManagement.inc:770
-msgid "New Component"
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:780
-msgid "Edit system"
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Delete system"
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:791
-msgid "System"
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:829
-msgid "Cups Server"
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Log Db"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Syslog Server"
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Mail Server"
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Imap Server"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Nfs Server"
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Kerberos Server"
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Asterisk Server"
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Fax Server"
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Ldap Server"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:871
-msgid "Set root password"
+#: plugins/admin/systems/class_servService.inc:321
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:916
-msgid "New System from incoming"
+#: plugins/admin/systems/class_servService.inc:380
+msgid "Saving server service object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:918
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:496
-msgid "Terminal"
+#: plugins/admin/systems/class_servService.inc:411
+#: plugins/admin/systems/class_goShareServer.inc:287
+msgid "Creating mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:495
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
+#: plugins/admin/systems/class_servService.inc:425
+#: plugins/admin/systems/class_goShareServer.inc:301
+msgid "Removing mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:922
-msgid "Winstation"
+#: plugins/admin/systems/class_servService.inc:437
+#: plugins/admin/systems/class_goShareServer.inc:313
+msgid "Saving mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-msgid "Network Device"
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1146
-msgid "New terminal"
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1148
-msgid "New workstation"
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1150
-msgid "New Device"
+#: plugins/admin/systems/servdnseditzone.tpl:27
+msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1167
-msgid "Terminal template for"
+#: plugins/admin/systems/servdnseditzone.tpl:39
+msgid "SOA record"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1179
-msgid "Workstation template for"
+#: plugins/admin/systems/servdnseditzone.tpl:45
+msgid "Primary dns server for this zone"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
-msgid "Printer location"
+#: plugins/admin/systems/servdnseditzone.tpl:100
+msgid "MxRecords"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
+#: plugins/admin/systems/servdnseditzone.tpl:112
+msgid "Global zone records"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
+#: plugins/admin/systems/class_workstationGeneric.inc:184
+msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:65
-msgid "Users which are allowed to use this printer"
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+msgid "Removing workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-msgid "Add user"
+#: plugins/admin/systems/class_workstationGeneric.inc:344
+#: plugins/admin/ogroups/class_termgroup.inc:106
+msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-msgid "Add group"
+#: plugins/admin/systems/class_workstationGeneric.inc:348
+msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:81
-msgid "Users which are allowed to administrate this printer"
+#: plugins/admin/systems/class_workstationGeneric.inc:371
+#: plugins/admin/systems/class_terminalGeneric.inc:401
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:82
-msgid "Admins"
+#: plugins/admin/systems/class_workstationGeneric.inc:438
+#: plugins/admin/systems/class_workstationGeneric.inc:456
+#: plugins/admin/ogroups/class_termgroup.inc:298
+msgid "Saving workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:169
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+msgid "Parent server"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:170
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#: plugins/admin/systems/class_servRepository.inc:245
+#: plugins/admin/systems/class_servRepository.inc:266
+msgid "Sections"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:172
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:173
-#: plugins/admin/systems/class_inventory.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:42
 msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:240
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
+#: plugins/admin/systems/class_divListSystem.inc:58
+msgid "System / Department"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:264
-msgid "Reverse zone"
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, php-format
-msgid "The specified kerberos password is empty."
+#: plugins/admin/systems/class_divListSystem.inc:64
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#: plugins/admin/systems/class_divListSystem.inc:67
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:125
-msgid "Please specify a valid path for your setup."
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
+#: plugins/admin/systems/class_divListSystem.inc:76
+msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:139
-msgid "Description contains invalid characters."
+#: plugins/admin/systems/class_divListSystem.inc:109
+msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:143
-msgid "Path contains invalid characters."
+#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_systemManagement.inc:765
+msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:147
-msgid "Option contains invalid characters."
+#: plugins/admin/systems/class_divListSystem.inc:111
+msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_systemManagement.inc:766
+msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:113
+msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/class_divListSystem.inc:115
+msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
+#: plugins/admin/systems/class_divListSystem.inc:116
+#: plugins/admin/systems/class_divListSystem.inc:117
+msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
+#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:119
+msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
+#: plugins/admin/systems/class_divListSystem.inc:137
+msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
+#: plugins/admin/systems/class_divListSystem.inc:138
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
+#: plugins/admin/systems/class_divListSystem.inc:139
+msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
+#: plugins/admin/systems/class_divListSystem.inc:140
+msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
+#: plugins/admin/systems/class_divListSystem.inc:141
+msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
+#: plugins/admin/systems/class_divListSystem.inc:142
+msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
+#: plugins/admin/systems/class_divListSystem.inc:143
+msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
+#: plugins/admin/systems/class_divListSystem.inc:144
+msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
+#: plugins/admin/systems/class_divListSystem.inc:145
+msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
+#: plugins/admin/systems/class_divListSystem.inc:146
+msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
+#: plugins/admin/systems/class_divListSystem.inc:163
+msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
+#: plugins/admin/systems/class_divListSystem.inc:164
+msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
+#: plugins/admin/systems/class_divListSystem.inc:195
+msgid "Set root       password"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: 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
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
-msgid "Codepage"
+#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_goImapServer.inc:182
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:59
-msgid "Option"
+#: plugins/admin/systems/class_servDB.inc:156
+#: plugins/admin/systems/class_goImapServer.inc:186
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/class_servDB.inc:191
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_servDB.inc:245
+msgid "Saving server db settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:152
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes all system and setup informations. Please double check if your "
+"really want to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/class_servNfs.inc:46
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/class_servNfs.inc:49
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/class_servNfs.inc:179
+msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
+#: plugins/admin/systems/class_servNfs.inc:185
+msgid "Please specify a valid name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/class_servNfs.inc:188
+msgid "Please specify a name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:175
-#: plugins/admin/systems/class_printGeneric.inc:182
-#: plugins/admin/systems/class_printGeneric.inc:217
-#: plugins/admin/systems/class_printGeneric.inc:238
-#: plugins/admin/systems/class_printGeneric.inc:241
-msgid "Add printer extension"
+#: plugins/admin/systems/class_servNfs.inc:193
+msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:176
-msgid "This is a workstation template, printer tab is disabled."
+#: plugins/admin/systems/class_servNfs.inc:197
+msgid "Volume contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:183
-msgid "This is a terminal template, printer tab is disabled."
+#: plugins/admin/systems/class_servNfs.inc:201
+msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:218
-msgid ""
-"This workstation 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"
+#: plugins/admin/systems/class_servNfs.inc:205
+msgid "Option contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:230
-#: plugins/admin/systems/class_printGeneric.inc:233
-msgid "Remove printer extension"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:231
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
+#: plugins/admin/systems/servservice.tpl:70
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:234
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+#: plugins/admin/systems/servservice.tpl:107
+msgid "Mail server"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:239
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:242
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:413
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:421
-msgid "can't get ppd informations."
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:433
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:435
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:513
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Volume"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/servnfs.tpl:104
+msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/class_servKolab.inc:99
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servKolab.inc:105
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/class_servKolab.inc:191
+msgid "Removing kolab host entry failed"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: plugins/admin/systems/class_servKolab.inc:207
+msgid "Removing server from kolab object failed"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/class_servKolab.inc:246
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_servKolab.inc:248
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
+#: plugins/admin/systems/class_servKolab.inc:252
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
+#: plugins/admin/systems/class_servKolab.inc:254
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-msgid "Choose a phone type"
+#: plugins/admin/systems/class_servKolab.inc:256
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: plugins/admin/systems/class_servKolab.inc:260
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
+#: plugins/admin/systems/class_servKolab.inc:332
+msgid "Saving server to kolab object failed"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
+#: plugins/admin/systems/class_servKolab.inc:354
+msgid "Kolab mail service"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
+#: plugins/admin/systems/class_terminalGeneric.inc:98
+msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_terminalGeneric.inc:99
+msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_terminalGeneric.inc:167
+msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
+#: plugins/admin/systems/class_terminalGeneric.inc:179
+msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
+#: plugins/admin/systems/class_terminalGeneric.inc:191
+msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/systems/class_terminalGeneric.inc:319
+msgid "Removing terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/systems/class_terminalGeneric.inc:374
+msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: plugins/admin/systems/class_terminalGeneric.inc:378
+msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_terminalGeneric.inc:476
+msgid "Saving terminal failed"
 msgstr ""
 
 #: plugins/admin/systems/terminalService.tpl:141
@@ -8071,1178 +9816,1262 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
+#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:50
+msgid "This 'dn' has no network features."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:126
+msgid "Removing Samba workstation failed"
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:164
+#: plugins/admin/systems/class_componentGeneric.inc:155
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:224
+msgid "Saving Samba workstation failed"
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:101
+msgid "Removing generic component failed"
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:139
+msgid "The required field 'Component name' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
+msgid "The required field IP address is empty."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
+msgid "The field IP address contains an invalid address."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:223
+msgid "Saving generic component failed"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/goMailServer.tpl:7
+msgid "Visible full qualified hostname"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/goMailServer.tpl:10
+msgid "The full qualified host name."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
+#: plugins/admin/systems/goMailServer.tpl:14
+msgid "Max mail header size"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
+#: plugins/admin/systems/goMailServer.tpl:18
+msgid "This value specifies the maximal header size."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/goMailServer.tpl:22
+msgid "Max mailbox size"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
+#: plugins/admin/systems/goMailServer.tpl:26
+msgid "Defines the maximal size of mail box."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
+#: plugins/admin/systems/goMailServer.tpl:30
+msgid "Max message size"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/goMailServer.tpl:34
+msgid "Specify the maximal size of a message."
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/goMailServer.tpl:38
+msgid "Relay host"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
+#: plugins/admin/systems/goMailServer.tpl:42
+msgid "Relay messages to following host:"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
+#: plugins/admin/systems/goMailServer.tpl:51
+msgid "Local networks"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
+#: plugins/admin/systems/goMailServer.tpl:52
+msgid "Postfix networks"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
+#: plugins/admin/systems/goMailServer.tpl:66
+msgid "Domains and routing"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
+#: plugins/admin/systems/goMailServer.tpl:74
+msgid "Domains to accept mail for"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/goMailServer.tpl:75
+msgid "Postfix is responsible for the following domains:"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:89
+msgid "Transports"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:92
+msgid "Select a transport protocol."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:105
+msgid "Restrictions"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:113
+msgid "Restrictions for sender"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:116
+#: plugins/admin/systems/goMailServer.tpl:132
+msgid "Restriction filter"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:129
+msgid "Restrictions for recipient"
+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/SelectDeviceType.tpl:3
 msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+"This is a new system which currently has no system type defined. Please "
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/SelectDeviceType.tpl:9
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/SelectDeviceType.tpl:21
+msgid "Choose a system type"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-msgid "Printer ppd selection."
+#: plugins/admin/systems/SelectDeviceType.tpl:32
+msgid "Choose an object group as template"
 msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
-msgid "Parent server"
+#: plugins/admin/systems/SelectDeviceType.tpl:33
+msgid "Choose an object group"
 msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-msgid "Sections"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
-msgid "Please enter a value for 'release'."
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
-msgid "Please specify a valid value for 'url'."
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr ""
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:132
+#, php-format
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:298
+msgid "The required field 'IP-address' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:305
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
+#: plugins/admin/systems/class_termDNS.inc:312
+msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/class_termDNS.inc:319
 msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
+"':'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
+#: plugins/admin/systems/class_termDNS.inc:339
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:101
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/systems/class_termDNS.inc:347
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:144
+#: plugins/admin/systems/class_termDNS.inc:358
 #, 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."
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:176
+#: plugins/admin/systems/class_termDNS.inc:365
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
 #, php-format
-msgid ""
-"Be carefull editing this release, it is still used by these workstations [%"
-"s]."
+msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
+#: plugins/admin/systems/class_termDNS.inc:448
+msgid "Saving terminal to DNS object failed"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:11
-msgid "Add repository"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+msgid "The selected name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#: plugins/admin/systems/remove_glpi.tpl:10
 msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+"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_glpiPrinterAccount.inc:203
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
-msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
+#: plugins/admin/systems/class_goNtpServer.inc:70
+msgid "NTP service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
+#: plugins/admin/systems/class_servRepository.inc:35
+#: plugins/admin/systems/class_servRepository.inc:392
+msgid "Repository service"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-msgid "Manage System-types"
+#: plugins/admin/systems/class_servRepository.inc:137
+#, 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/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-msgid "Rename"
+#: plugins/admin/systems/class_servRepository.inc:171
+#, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-msgid "Please enter a new name"
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
 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/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
-msgid "Comments"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: 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/glpiAttachmentEdit.tpl:18
-msgid "Comment"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
 msgstr ""
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:296
-msgid "The required field 'IP-address' is not set."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:302
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:308
-msgid "The required field 'MAC-address' is not set."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:314
-msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:325
-#, php-format
-msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:331
-#: plugins/admin/systems/class_servDNSeditZone.inc:390
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
+msgid "You have to specify a valid name for this device."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
+msgid "This device name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+msgid "Other"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-msgid "The selected name is already in use."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "New entry"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
+#, 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/glpi.tpl:19
-msgid "Operating system"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#, php-format
+msgid "Entry name '%s' contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#, php-format
+msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-msgid "Contact person"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#, php-format
+msgid "Can not create '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#, php-format
+msgid "The name '%s' is used more than once."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#, php-format
+msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#, php-format
+msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-msgid "Attachments"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone entries"
+#: plugins/admin/systems/class_systemManagement.inc:236
+msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-msgid "SOA record"
+#: plugins/admin/systems/class_systemManagement.inc:253
+msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
-msgid "Primary dns server for this zone"
+#: plugins/admin/systems/class_systemManagement.inc:307
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/class_systemManagement.inc:632
+msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
+#: plugins/admin/systems/class_systemManagement.inc:634
+msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
-msgid "Expire"
+#: plugins/admin/systems/class_systemManagement.inc:636
+msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
-msgid "MxRecords"
+#: plugins/admin/systems/class_systemManagement.inc:651
+msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
-msgid "Zone records"
+#: plugins/admin/systems/class_systemManagement.inc:663
+msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
+#: plugins/admin/systems/class_systemManagement.inc:751
+msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
+#: plugins/admin/systems/class_systemManagement.inc:754
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:379
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
+#: plugins/admin/systems/class_systemManagement.inc:755
+msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
-#, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
+#: plugins/admin/systems/class_systemManagement.inc:756
+msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
-#, php-format
-msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/class_systemManagement.inc:757
+msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
-msgid "There is no valid file uploaded."
+#: plugins/admin/systems/class_systemManagement.inc:760
+msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
-msgid "Upload wasn't successfull."
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/class_systemManagement.inc:762
+msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-msgid "There is already a file with the same name uploaded."
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
-#, php-format
-msgid "Can't create file '%s'."
+#: plugins/admin/systems/class_systemManagement.inc:764
+msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
+msgid ""
+"Be careful editing record types with this dialog. All changes will be saved "
+"immediately when using the save button."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
-msgid "Currently no file uploaded."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+msgid ""
+"This dialog can't be used until the currently edited zone was saved or the "
+"zone entry exists in the ldap database."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
-msgid "Mime"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "Create a new DNS zone entry"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-msgid "empty"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-msgid "Create new attachment"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:691
+#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-msgid "New Attachment"
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
+msgid "This zoneName is already in use"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-msgid "Please specify a valid name for this attachment."
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
+msgid "This reverse zone is already in use"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
 #, php-format
-msgid "Internal Error can't create device of type '%s'"
+msgid "Please choose a valid zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
 #, php-format
-msgid "You're about to delete the glpi device '%s'."
+msgid "Please choose a valid reverse zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
+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
 msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-msgid "devices"
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
+msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "New monitor"
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
+msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-msgid "M"
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
+msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-msgid "New mainbord"
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
+msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "New processor"
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
+msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "New case"
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
+msgid "Please specify a numeric value for retry."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
+#: plugins/admin/systems/class_printGeneric.inc:103
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "New network interface"
+#: plugins/admin/systems/class_printGeneric.inc:234
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:247
+#: plugins/admin/systems/class_printGeneric.inc:286
+#: plugins/admin/systems/class_printGeneric.inc:302
+#: plugins/admin/systems/class_printGeneric.inc:305
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "NI"
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "New ram"
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: plugins/admin/systems/class_printGeneric.inc:248
+msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "New hard disk"
+#: plugins/admin/systems/class_printGeneric.inc:279
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
+#: plugins/admin/systems/class_printGeneric.inc:287
+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_glpiDeviceManagement.inc:239
-msgid "New drive"
+#: plugins/admin/systems/class_printGeneric.inc:294
+#: plugins/admin/systems/class_printGeneric.inc:297
+msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "D"
+#: plugins/admin/systems/class_printGeneric.inc:295
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "New controller"
+#: plugins/admin/systems/class_printGeneric.inc:298
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
+#: plugins/admin/systems/class_printGeneric.inc:303
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
+#: plugins/admin/systems/class_printGeneric.inc:306
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
+#: plugins/admin/systems/class_printGeneric.inc:480
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "New sound card"
+#: plugins/admin/systems/class_printGeneric.inc:488
+msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
+#: plugins/admin/systems/class_printGeneric.inc:501
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
+#: plugins/admin/systems/class_printGeneric.inc:503
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
+#: plugins/admin/systems/class_printGeneric.inc:554
+msgid "Removing printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "New misc device"
+#: plugins/admin/systems/class_printGeneric.inc:736
+msgid "Saving printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
+msgid "Choose a base"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-msgid "You have to specify a valid name for this device."
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-msgid "This device name is already in use."
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-msgid "Other"
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
+#, php-format
+msgid "Select this base"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-msgid "Supported interfaces"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+msgid "There is no valid file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+msgid "There is already a file with the same name uploaded."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, php-format
+msgid "Can't create file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+msgid "Mime"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-msgid "Add/Edit monitor"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-msgid "Monitor size"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+msgid "empty"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-msgid "Inch"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
-msgid "Yes"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
+msgid "Please specify a valid name for this attachment."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-msgid "No"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Serial number"
+#: plugins/admin/systems/class_goMailServer.inc:44
+msgid "Mail service (SMTP)"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-msgid "Additional serial number"
+#: plugins/admin/systems/class_goMailServer.inc:482
+msgid "Postfix"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-msgid "Add/Edit other device"
+#: plugins/admin/systems/class_goMailServer.inc:619
+msgid "Please specify a numeric value for header size limit."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
+#: plugins/admin/systems/class_goMailServer.inc:623
+msgid "Please specify a numeric value for mailbox size limit."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/class_goMailServer.inc:627
+msgid "Please specify a numeric value for message size limit."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-msgid "Power"
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
+msgid "Please enter a value for 'release'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
+msgid "Please specify a valid value for 'url'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-msgid "Ram"
+#: plugins/admin/systems/class_goImapServer.inc:48
+msgid "IMAP/POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-msgid "Add/Edit controller"
+#: plugins/admin/systems/class_goImapServer.inc:53
+msgid "Repair database"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
+#: plugins/admin/systems/class_goImapServer.inc:83
+msgid "Cyrus service"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
+#: plugins/admin/systems/class_goImapServer.inc:168
+msgid "Please specify a server identifier."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-msgid "Writeable"
+#: plugins/admin/systems/class_goImapServer.inc:171
+msgid "Please specify a connect url."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-msgid "Add/Edit harddisk"
+#: plugins/admin/systems/class_goImapServer.inc:174
+msgid "Please specify an admin user."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
+#: plugins/admin/systems/class_goImapServer.inc:177
+msgid "Please specify a password for the admin user."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-msgid "Cache"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-msgid "Add/Edit memory"
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:122
+msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-msgid "Frequenz"
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:123
+msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-msgid "Add/Edit sound card"
+#: plugins/admin/systems/class_phoneGeneric.inc:225
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-msgid "Add/Edit network interface"
+#: plugins/admin/systems/class_phoneGeneric.inc:225
+msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-msgid "MAC address"
+#: 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/glpi_devices.tpl:607
-msgid "Add/Edit processor"
+#: plugins/admin/systems/class_phoneGeneric.inc:247
+msgid "Removing phone failed"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-msgid "Frequence"
+#: plugins/admin/systems/class_phoneGeneric.inc:292
+msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-msgid "Default frequence"
+#: plugins/admin/systems/class_phoneGeneric.inc:295
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
+#: plugins/admin/systems/class_phoneGeneric.inc:302
+msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-msgid "Chipset"
+#: plugins/admin/systems/class_phoneGeneric.inc:397
+msgid "Saving phone failed"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-msgid "format"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member names"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:340
-msgid "This zoneName is already in use"
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:343
-msgid "This reverse zone is already in use"
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#, php-format
+msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-msgid "Your specified mail address must end with '.' to be a valid record."
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+msgid "Printer ppd selection."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+#: plugins/admin/systems/class_goShareServer.inc:31
+msgid "File service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/ogroups/tabs_ogroups.inc:61
+#: plugins/admin/ogroups/tabs_ogroups.inc:168
+msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
-msgid "Please specify a numeric value for serial number."
+#: plugins/admin/ogroups/tabs_ogroups.inc:87
+msgid "System"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
-msgid "Please specify a numeric value for refresh."
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
+msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
-msgid "Please specify a numeric value for ttl."
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
-msgid "Please specify a numeric value for expire."
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:384
-msgid "Please specify a numeric value for retry."
+#: plugins/admin/ogroups/class_termgroup.inc:111
+msgid "There must be at least one NTP server selected."
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:3
-msgid ""
-"This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:21
-msgid "Choose a system type"
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Select to see GOsa accounts"
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Show people"
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Select to see GOsa groups"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:138
-#, php-format
-msgid "Settings for '%s'"
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Show groups"
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Select to see applications"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
-msgid "Choose a base"
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Show applications"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-msgid ""
-"Step in the prefered tree and click save to use the current subtree as base. "
-"Or click the image at the end of each entry."
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Select to see workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:50
-msgid "Filter entries with this syntax"
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Select to see terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:114
-#, php-format
-msgid "Select this base"
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Select to see printers"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:58
-#: plugins/admin/ogroups/tabs_ogroups.inc:150
-msgid "Phone queue"
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Show printers"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:83
-#: plugins/admin/ogroups/tabs_ogroups.inc:130
-msgid "Terminals"
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Select to see phones"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: plugins/admin/ogroups/termgroup.tpl:2
+msgid ""
+"Actions you choose here influence all systems in this object group. "
+"Additionally, all values editable here can be inherited by the clients "
+"assigned to this object group."
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
+msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#, php-format
+msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
+#: 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/ogroup_objects.tpl:28
-msgid "Show people"
+#: plugins/admin/ogroups/class_divListOGroup.inc:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:39
+msgid "List of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
+#: plugins/admin/ogroups/class_divListOGroup.inc:44
+msgid ""
+"This menu allows you to add, edit or remove selected groups. You may want to "
+"use the range selector on top of the group listbox, when working with  a "
+"large number of groups."
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show groups"
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
+msgid "Name of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Select to see applications"
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Select to see groups containing users"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Show applications"
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Show groups containing users"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Select to see groups containing groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Select to see terminals"
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Show groups containing groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Select to see printers"
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Select to see groups containing applications"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Show printers"
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Show groups containing applications"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Select to see phones"
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Select to see groups containing departments"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Show groups containing departments"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Select to see groups containing servers"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Show groups containing servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Select to see groups containing workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Show groups containing workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45 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"
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Select to see groups containing terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Show groups containing terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Select to see groups containing printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:225
-#, php-format
-msgid "You're about to delete the object group '%s'."
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Show groups containing printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:231
-#: plugins/admin/ogroups/class_ogroupManagement.inc:257
-msgid "You are not allowed to delete this object group!"
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Select to see groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-msgid "Create new object group"
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Show groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:399
-msgid "Name of object groups"
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
+msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:448
+#: plugins/admin/ogroups/class_divListOGroup.inc:184
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
@@ -9296,22 +11125,30 @@ msgid "and"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
+msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:648
+#: plugins/admin/ogroups/class_ogroup.inc:649
 msgid "There is already an object with this cn."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
+#: plugins/admin/ogroups/class_ogroup.inc:666
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
+#: plugins/admin/ogroups/class_ogroup.inc:715
+msgid "Saving object group failed"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:728
+msgid "Removing object group failed"
+msgstr ""
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:33
+#: plugins/admin/ogroups/generic.tpl:37
 msgid "Member objects"
 msgstr ""
 
@@ -9325,6 +11162,14 @@ msgid ""
 "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
+#: plugins/admin/ogroups/class_mailogroup.inc:98
+msgid "Saving mail objectgroup settings failed"
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:131
+msgid "Removing mail objectgroup settings failed"
+msgstr ""
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr ""
@@ -9368,134 +11213,101 @@ msgid ""
 "clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:199
+#: plugins/admin/ogroups/class_phonequeue.inc:201
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:204
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:207
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:210
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:213
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:227
 msgid ""
 "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:238
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
+#: 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."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:248
-#: plugins/admin/ogroups/class_phonequeue.inc:624
-#: plugins/gofon/macro/class_gofonMacro.inc:216
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: 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:87
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1049
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:281
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:397
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:279
-#: plugins/admin/ogroups/class_phonequeue.inc:493
-#: plugins/admin/ogroups/class_phonequeue.inc:660
+#: plugins/admin/ogroups/class_phonequeue.inc:281
+#: plugins/admin/ogroups/class_phonequeue.inc:495
+#: plugins/admin/ogroups/class_phonequeue.inc:661
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:523
 #: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1146
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
+#: plugins/admin/ogroups/class_phonequeue.inc:527
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1156
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:437
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:439
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:614
-#: plugins/gofon/macro/class_gofonMacro.inc:205
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1034
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
+#: plugins/admin/ogroups/class_phonequeue.inc:587
+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:80
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:386
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
+#: plugins/admin/ogroups/class_phonequeue.inc:684
+msgid "Removing phone queue failed"
+msgstr ""
+
 #: 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/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr ""
-
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Display object groups matching"
-msgstr ""
-
 #: plugins/admin/ogroups/phonequeue.tpl:1
 msgid "Queue Settings"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/paste_generic.tpl:2
+#: plugins/gofon/phoneaccount/paste_generic.tpl:6
 #: plugins/gofon/phoneaccount/generic.tpl:1
 #: plugins/gofon/phoneaccount/generic.tpl:4
 msgid "Phone numbers"
@@ -9606,48 +11418,114 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/gofon/fonreports/class_fonreport.inc:157
+#: plugins/gofon/fonreports/class_fonreport.inc:167
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-msgid "You are not allowed to delete this macro!"
+#: plugins/gofon/fonreports/class_fonreport.inc:171
+msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
+#: plugins/gofon/fonreports/class_fonreport.inc:189
+msgid "Query for phone database failed!"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr ""
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr ""
+
+#: plugins/gofon/fonreports/main.inc:21
+msgid "Phone reports"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:31
+#: plugins/gofon/macro/class_divListMacros.inc:32
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:36
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:52
+msgid "macro name"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_divListMacros.inc:53
 msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/macro/class_divListMacros.inc:60
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:96
+msgid "Create new phone macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:136
+msgid "Edit macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:118
+#: plugins/gofon/macro/class_divListMacros.inc:138
+msgid "Delete macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_divListMacros.inc:121
 msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_divListMacros.inc:122
 msgid "visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_divListMacros.inc:123
 msgid "invisible"
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
+#, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
+msgid "You are not allowed to delete this macro!"
+msgstr ""
+
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:646
+#: 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 "
@@ -9659,65 +11537,77 @@ msgstr ""
 msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:159
+#: 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:191
+#: plugins/gofon/macro/class_gofonMacro.inc:194
+msgid "Removing phone macro failed"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:208
+msgid "Removing phone macro reverences failed"
+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."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:261
+#: plugins/gofon/macro/class_gofonMacro.inc:291
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:279
+#: plugins/gofon/macro/class_gofonMacro.inc:309
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:288
-#: plugins/gofon/macro/class_gofonMacro.inc:296
+#: plugins/gofon/macro/class_gofonMacro.inc:318
+#: plugins/gofon/macro/class_gofonMacro.inc:326
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:310
+#: plugins/gofon/macro/class_gofonMacro.inc:340
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:357
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:362
+#: plugins/gofon/macro/class_gofonMacro.inc:393
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:366
+#: plugins/gofon/macro/class_gofonMacro.inc:397
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:371
+#: plugins/gofon/macro/class_gofonMacro.inc:402
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:377
+#: plugins/gofon/macro/class_gofonMacro.inc:408
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:382
+#: plugins/gofon/macro/class_gofonMacro.inc:413
 msgid "Please choose a valid  base."
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacro.inc:456
+msgid "Saving phone macro failed"
+msgstr ""
+
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 msgid "Macro name"
 msgstr ""
@@ -9730,11 +11620,11 @@ msgstr ""
 msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/generic.tpl:48
 msgid "Visible for user"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/macro/generic.tpl:57
 msgid "Macro text"
 msgstr ""
 
@@ -9754,38 +11644,31 @@ msgstr ""
 msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:914
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:916
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+msgid "Saving phone macro parameters failed"
 msgstr ""
 
 #: plugins/gofon/macro/headpage.tpl:38
@@ -9796,11 +11679,7 @@ msgstr ""
 msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
-msgstr ""
-
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 msgid "Phone macro management"
 msgstr ""
 
@@ -9812,108 +11691,125 @@ msgstr ""
 msgid "type"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:135
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:136
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:256
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:257
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:561
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:615
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:749
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:752
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:753
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:800
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:888
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:891
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:894
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:899
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:907
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:909
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
-msgid "Stop"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:964
+msgid "Saving phone account failed"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
+msgid ""
+"Can't remove phone account, the mysql extension is not present in php "
+"configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1110
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
+msgid "Removing phone account failed"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+#: plugins/gofon/phoneaccount/main.inc:122
+msgid "Phone settings"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
 #: plugins/gofon/phoneaccount/generic.tpl:33
 msgid "Voicemail PIN"
 msgstr ""
 
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
 #: plugins/gofon/phoneaccount/generic.tpl:41
 msgid "Phone PIN"
 msgstr ""
@@ -9923,41 +11819,51 @@ msgstr ""
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:122
-msgid "Phone settings"
+#: plugins/gofon/conference/class_divListConferences.inc:31
+#: plugins/gofon/conference/class_divListConferences.inc:32
+#: plugins/gofon/conference/headpage.tpl:6
+msgid "List of conference rooms"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
+#: plugins/gofon/conference/class_divListConferences.inc:36
+#: plugins/gofon/conference/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
+#: plugins/gofon/conference/class_divListConferences.inc:52
+msgid "Name - Number"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "Create new conference"
+#: plugins/gofon/conference/class_divListConferences.inc:54
+#: plugins/gofon/conference/generic.tpl:112
+msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-msgid "New conference"
+#: plugins/gofon/conference/class_divListConferences.inc:61
+msgid "Regular expression for matching conference names"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
+#: plugins/gofon/conference/class_divListConferences.inc:90
+msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-msgid "Name - Number"
+#: plugins/gofon/conference/class_divListConferences.inc:90
+msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
+#: plugins/gofon/conference/class_divListConferences.inc:160
+msgid "Conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-msgid "Conference"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:13
@@ -9973,121 +11879,77 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:66
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:99
+#: plugins/gofon/conference/generic.tpl:104
 msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:113
+#: plugins/gofon/conference/generic.tpl:118
 msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:121
+#: plugins/gofon/conference/generic.tpl:126
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:138
+#: plugins/gofon/conference/generic.tpl:143
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:144
+#: plugins/gofon/conference/generic.tpl:149
 msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:150
-msgid "Announce users joining or leaving the conference"
-msgstr ""
-
-#: plugins/gofon/conference/generic.tpl:156
-msgid "Count users"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
-msgid ""
-"You have specified a conference 'without PIN' ... please leave the PIN "
-"fields empty."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
-msgid "Please enter a PIN."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
-msgid "Please enter a name for the conference."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
-msgid "Only numeric chars are allowed in Number field."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
-msgid "Only numbers are allowed in Lifetime."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
-msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
-msgstr ""
-
-#: plugins/gofon/conference/headpage.tpl:6
-msgid "List of conference rooms"
-msgstr ""
-
-#: plugins/gofon/conference/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-
-#: plugins/gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
+#: plugins/gofon/conference/generic.tpl:155
+msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
-msgid "Conference management"
+#: plugins/gofon/conference/generic.tpl:161
+msgid "Count users"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:215
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-msgid "Can't connect to phone database, no reports can be shown!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:219
+msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-msgid "Can't select phone database for report generation!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:223
+msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
+msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:231
+msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:261
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
+msgid ""
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:509
+msgid "Saving phone conference failed"
 msgstr ""
 
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
 msgstr ""
 
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
+msgid "Conference management"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:46
@@ -10108,7 +11970,7 @@ msgstr ""
 
 #: plugins/generic/welcome/welcome.tpl:4
 msgid ""
-"This is the GOsa main screen. You can select your tasks from the menu on the "
+"This is the GOsa main menu. You can select your tasks from the menu on the "
 "left, or by choosing one of the pictograms below. All changes apply directly "
 "to your companies LDAP server."
 msgstr ""
@@ -10128,455 +11990,592 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
-#: include/class_plugin.inc:465
+#: include/class_mail-methods-cyrus.inc:39
+msgid "Warning: Account has an invalid mailserver string!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:52
+msgid ""
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:129
+#, php-format
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:148
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:174
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:192
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:214
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:242
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:255
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:326
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:330
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_debconfTemplate.inc:260
+msgid "This package has no debconf options."
+msgstr ""
+
+#: include/class_plugin.inc:401
+#, php-format
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_plugin.inc:547
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:493 include/class_password-methods.inc:181
+#: include/class_plugin.inc:581 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:615
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions_setup.inc:98
-msgid "Can't bind to LDAP. No schema check possible!"
+#: include/class_plugin.inc:921
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: include/class_plugin.inc:928
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:942 include/class_plugin.inc:971
+msgid "Handle object tagging failed"
+msgstr ""
+
+#: include/class_plugin.inc:958
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:1025 include/class_plugin.inc:1149
+#: include/class_plugin.inc:1205 include/class_plugin.inc:1269
+msgid "Snapshot failed."
+msgstr ""
+
+#: include/class_plugin.inc:1072 include/class_plugin.inc:1073
+msgid "Create snapshot failed."
+msgstr ""
+
+#: include/class_plugin.inc:1105
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable '%s' is not "
+"configured in your gosa.conf."
+msgstr ""
+
+#: include/class_plugin.inc:1117
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable(s) '%s' is "
+"not configured in your gosa.conf."
+msgstr ""
+
+#: include/class_plugin.inc:1283
+msgid "Restore snapshot failed."
+msgstr ""
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/functions_setup.inc:107 include/functions_setup.inc:116
+#: include/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions_setup.inc:136
+#: include/functions_setup.inc:99
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
 "setup"
 msgstr ""
 
-#: include/functions_setup.inc:140
+#: include/functions_setup.inc:103
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 
-#: include/functions_setup.inc:145
+#: include/functions_setup.inc:108
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr ""
 
-#: include/functions_setup.inc:155
+#: include/functions_setup.inc:118
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 
-#: include/functions_setup.inc:159
+#: include/functions_setup.inc:122
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions_setup.inc:170
+#: include/functions_setup.inc:133
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:175
+#: include/functions_setup.inc:138
 msgid "SAMBA 3 support enabled"
 msgstr ""
 
-#: include/functions_setup.inc:180
+#: include/functions_setup.inc:143
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:185
+#: include/functions_setup.inc:148
 msgid "SAMBA 2 support enabled"
 msgstr ""
 
-#: include/functions_setup.inc:191
+#: include/functions_setup.inc:154
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:196
+#: include/functions_setup.inc:159
 msgid "Support for pureftp enabled"
 msgstr ""
 
-#: include/functions_setup.inc:201
+#: include/functions_setup.inc:164
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:206
+#: include/functions_setup.inc:169
 msgid "Support for WebDAV enabled"
 msgstr ""
 
-#: include/functions_setup.inc:211
+#: include/functions_setup.inc:174
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:216
+#: include/functions_setup.inc:179
 msgid "Support for phpgroupware enabled"
 msgstr ""
 
-#: include/functions_setup.inc:221
+#: include/functions_setup.inc:184
 msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:226
+#: include/functions_setup.inc:189
 msgid "Support for trustAccount enabled"
 msgstr ""
 
-#: include/functions_setup.inc:231
+#: include/functions_setup.inc:194
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:236
+#: include/functions_setup.inc:199
 msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:204
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:209
 msgid "Support for nagios enabled"
 msgstr ""
 
-#: include/functions_setup.inc:256
+#: include/functions_setup.inc:214
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+
+#: include/functions_setup.inc:219
+msgid "Support for netatalk enabled"
+msgstr ""
+
+#: include/functions_setup.inc:229
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
 msgstr ""
 
-#: include/functions_setup.inc:263
+#: include/functions_setup.inc:236
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:254 include/functions.inc:1084
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:257
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:259
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:276
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:278
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
-#: include/functions_setup.inc:305
+#: 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."
 msgstr ""
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:282
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: 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."
 msgstr ""
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:286
+msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
+msgstr ""
+
+#: include/functions_setup.inc:287
+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."
+msgstr ""
+
+#: include/functions_setup.inc:290
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:291
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:294
 msgid "Checking for XML functions"
 msgstr ""
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:295
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:298
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:299
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:302
 msgid "Checking for iconv support"
 msgstr ""
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:303
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:306
 msgid "Checking for mhash module"
 msgstr ""
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:307
 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."
 msgstr ""
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:310
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:311
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:336
+#: include/functions_setup.inc:314
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:337
+#: 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."
 msgstr ""
 
-#: include/functions_setup.inc:340
+#: include/functions_setup.inc:318
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:319
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:344
+#: include/functions_setup.inc:322
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:345
+#: 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."
 msgstr ""
 
-#: include/functions_setup.inc:348
+#: include/functions_setup.inc:326
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:327
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:330
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:331
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:367
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:371
 #, php-format
 msgid "Checking for function %s"
 msgstr ""
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:372
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:383
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:392
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:393
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:396
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:397
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:426
+#: include/functions_setup.inc:404
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:405
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:420
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:443
+#: include/functions_setup.inc:421
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:456
+#: include/functions_setup.inc:434
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:435
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:438
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:439
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:446
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:447
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:454
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:455
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:459
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:460
 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 ""
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:464
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:465
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:732
+#: include/functions_setup.inc:711
 msgid "You've to specify an ldap server before continuing!"
 msgstr ""
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:720 include/functions_setup.inc:803
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:734 include/functions_setup.inc:808
+#: include/functions_setup.inc:813
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:823
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all information twice"
 msgstr ""
 
-#: include/functions_setup.inc:900
+#: include/functions_setup.inc:879
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:910
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:940
+#: include/functions_setup.inc:919
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:181
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
+#: include/functions_setup.inc:1061 html/index.php:244
 #: 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 ""
 
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
 
-#: include/class_password-methods.inc:202
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
 msgstr ""
 
 #: include/functions_helpviewer.inc:43
@@ -10584,79 +12583,93 @@ msgstr ""
 msgid "XML error in guide.xml: %s at line %d"
 msgstr ""
 
-#: include/functions_helpviewer.inc:86
+#: include/functions_helpviewer.inc:84
 msgid "No help available for this plugin."
 msgstr ""
 
-#: include/functions_helpviewer.inc:95
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
 msgid "previous"
 msgstr ""
 
-#: include/functions_helpviewer.inc:99
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
 msgid "next"
 msgstr ""
 
-#: include/functions_helpviewer.inc:387
+#: include/functions_helpviewer.inc:385
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid "%s results for your search with the keyword %s"
 msgstr ""
 
-#: include/functions_helpviewer.inc:462
+#: include/functions_helpviewer.inc:459
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
-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:52
-msgid "Kerberos database communication failed!"
+#: include/class_ppdManager.inc:13
+#, php-format
+msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
+#: include/class_ppdManager.inc:144
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
 msgstr ""
 
-#: include/class_ppdManager.inc:13
+#: include/class_ppdManager.inc:146
 #, php-format
-msgid "PPD manager : The specified path '%s' doesn't exists."
+msgid "The required tmp file file '%s' can't be opened for writing."
 msgstr ""
 
-#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#: 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:137
+#: include/class_ppdManager.inc:178
 msgid "Nested groups are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:141
+#: include/class_ppdManager.inc:182
 msgid "Group name not unique!"
 msgstr ""
 
-#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
+#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:171
+#: include/class_ppdManager.inc:212
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:196
+#: include/class_ppdManager.inc:237
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:268
+#: include/class_ppdManager.inc:318
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
+#: include/class_MultiSelectWindow.inc:393
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:494
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:494
+msgid "Create a new snapshot from this object"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:498
+msgid "Restore snapshot"
+msgstr ""
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -10685,7 +12698,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:362
+#: include/php_setup.inc:71 html/main.php:380
 msgid "Toggle information"
 msgstr ""
 
@@ -10721,110 +12734,153 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/functions.inc:290
+#: include/functions.inc:298
 #, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:311
+#: include/functions.inc:315
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:330
+#: include/functions.inc:336
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:368
+#: include/functions.inc:468
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:378
+#: include/functions.inc:478
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:393
+#: include/functions.inc:493
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:419
+#: include/functions.inc:519
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:449
+#: include/functions.inc:549
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:459
+#: include/functions.inc:559
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
 msgstr ""
 
-#: include/functions.inc:467
+#: include/functions.inc:567
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:581
+#: include/functions.inc:653
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:583
+#: include/functions.inc:655
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:600
+#: include/functions.inc:672
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1001
-#, php-format
-msgid "Last message repeated %s times."
+#: include/functions.inc:1062 include/functions.inc:1251
+msgid "LDAP error:"
+msgstr ""
+
+#: include/functions.inc:1063
+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:1071
+msgid ""
+"Please check your input and fix the error. Press 'OK' to close this message "
+"box."
+msgstr ""
+
+#: include/functions.inc:1080
+msgid "An error occured while processing your request"
+msgstr ""
+
+#: include/functions.inc:1145
+msgid "Continue anyway"
+msgstr ""
+
+#: include/functions.inc:1147
+msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1067
+#: include/functions.inc:1149
 #, 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:1166
-msgid "LDAP error:"
-msgstr ""
-
-#: include/functions.inc:1344
+#: include/functions.inc:1433
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1372
+#: include/functions.inc:1461
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1646
+#: include/functions.inc:1735
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1689
+#: include/functions.inc:1778
 #, 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."
+msgstr ""
+
+#: include/functions_dns.inc:171
+#, php-format
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr ""
+
+#: include/functions_dns.inc:363
+#, php-format
+msgid ""
+"Found more than one dns zone which contains an entry named '%s'. Aborting "
+"getting dns informations for this device."
+msgstr ""
+
+#: include/class_tabs.inc:182
+#, php-format
+msgid "Delete process has been canceled by plugin '%s': %s"
+msgstr ""
+
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
@@ -10835,126 +12891,111 @@ msgid ""
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: 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/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?"
 msgstr ""
 
-#: include/class_config.inc:69
+#: include/class_CopyPasteHandler.inc:152
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "You are going to copy the entry '%s'."
 msgstr ""
 
-#: include/class_config.inc:195 html/index.php:141
-msgid "Can't bind to LDAP. Please contact the system administrator."
+#: include/class_CopyPasteHandler.inc:216
+msgid "Paste"
 msgstr ""
 
-#: include/class_config.inc:450
-msgid "SID and/or RIDBASE missing in your configuration!"
+#: include/class_CopyPasteHandler.inc:218
+msgid "Can't paste"
 msgstr ""
 
-#: include/class_ldap.inc:407
+#: include/class_config.inc:70
 #, php-format
-msgid "Creating duplicate of %s in %s"
-msgstr ""
-
-#: include/class_ldap.inc:410
-msgid "Processing"
+msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_ldap.inc:505
-#, php-format
-msgid "Unknown FAIstate %s"
+#: include/class_config.inc:197 html/index.php:203
+msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_ldap.inc:547
-msgid "Successfully finished"
+#: include/class_config.inc:461
+msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
-#: include/class_ldap.inc:624
+#: include/class_ldap.inc:196
 #, php-format
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:886
+#: include/class_ldap.inc:228
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:899
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:915
+#: include/class_ldap.inc:448
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-
-#: include/class_debconfTemplate.inc:251
-msgid "This package has no debconf options."
+msgid "Creating copy of %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
+#: include/class_ldap.inc:451
+msgid "Processing"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
+#: include/class_ldap.inc:491
+msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:115
+#: include/class_ldap.inc:554
 #, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
+msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:131
+#: include/class_ldap.inc:702
 #, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+#: include/class_ldap.inc:771
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_ldap.inc:773
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:222
+#: include/class_ldap.inc:995
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:235
+#: include/class_ldap.inc:1024
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:306
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
+#: include/class_ldap.inc:1146
+msgid "Ldap import failed"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:310
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+#: include/class_SnapShotDialog.inc:79
+msgid "Please specify a valid description for this snapshot."
 msgstr ""
 
 #: html/getvcard.php:36
@@ -11000,6 +13041,11 @@ msgstr ""
 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"
@@ -11072,52 +13118,66 @@ msgstr ""
 msgid "Computers of %s on %s"
 msgstr ""
 
-#: html/index.php:49
+#: html/index.php:49 html/index.php:331
+msgid "Session will not be encrypted."
+msgstr ""
+
+#: html/index.php:49 html/index.php:331
+msgid "Enter SSL session"
+msgstr ""
+
+#: html/index.php:113
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:71
+#: html/index.php:134
 #, php-format
-msgid "Directory '%s' specified as compile directory is not accessable!"
+msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:154
+#: html/index.php:215
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:162
+#: html/index.php:224
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:189
+#: html/index.php:252
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:191
+#: html/index.php:254
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:198
+#: html/index.php:261
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:236 html/index.php:296
-msgid "Session will not be encrypted."
+#: html/index.php:285
+msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:236 html/index.php:296
-msgid "Enter SSL session"
+#: html/index.php:337
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
+msgstr ""
+
+#: html/helpviewer.php:67
+msgid "Help browser"
 msgstr ""
 
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
+#: html/helpviewer.php:118
+msgid "There is no helpfile specified for this class"
 msgstr ""
 
-#: html/helpviewer.php:226
+#: html/helpviewer.php:265
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -11134,37 +13194,41 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
-#: html/main.php:151
+#: 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/main.php:164
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
 msgstr ""
 
-#: html/main.php:194
+#: html/main.php:206
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:334
+#: html/main.php:341
 #, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr ""
+
+#: html/main.php:356
+msgid "Your password is about to expire, please change your password"
 msgstr ""
 
-#: html/main.php:362
+#: html/main.php:380
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
 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/get_attachment.php:47
 msgid ""
 "Can't connect to glpi database, there is no mysl extension available in your "
@@ -11185,49 +13249,122 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
-msgid "Session conflict detected"
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/copyPasteDialog.tpl:4
 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 <b>Logout</b> button will close this session."
+"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:21
+msgid "Operation complete"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+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/framework.tpl:15
+msgid "Main"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl:20
+msgid "Help"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl:25
+msgid "Sign out"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl:33
+msgid "Signed in:"
+msgstr ""
+
+#: ihtml/themes/default/setup_finish.tpl:1
+msgid "Setup finished"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/default/setup_finish.tpl:3
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"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/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
-msgid "Logout"
+#: ihtml/themes/default/setup_finish.tpl:7
+msgid "Schema Configuration"
+msgstr ""
+
+#: ihtml/themes/default/setup_finish.tpl:12
+msgid "Configuration File"
+msgstr ""
+
+#: 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/default/setup_finish.tpl:17
+msgid "Download configuration"
+msgstr ""
+
+#: 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/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
+#: 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 informations for your LDAP "
+"needed programms and after you've provided basic information for your LDAP "
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: 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/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 "
@@ -11236,24 +13373,38 @@ msgid ""
 "create the missing entries."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
+#: ihtml/themes/default/login.tpl:14
+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
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+#: ihtml/themes/default/login.tpl:57
 msgid "Sign in"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+#: ihtml/themes/default/login.tpl:58
 msgid "Click here to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: 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/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 "
@@ -11261,69 +13412,59 @@ msgid ""
 "filters to get the entries you are looking for."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/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
+#: 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/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
-msgid "Main"
+#: 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/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
-msgid "Help"
+#: 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/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
-msgid "Sign out"
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
-msgid "Signed in:"
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+msgid "Old Password"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+msgid "New Password"
 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 <i>Remove</i> button."
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+msgid "Verify Password"
 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..."
+#: ihtml/themes/default/accountexpired.tpl:51
+msgid "Change Password"
 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."
+#: ihtml/themes/default/accountexpired.tpl:52
+msgid "Click here to Change your password"
 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 "
@@ -11333,31 +13474,26 @@ msgid ""
 "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 "
-"<i>(Example: ldap://your.server:389).</i>"
+"(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
 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 "
@@ -11365,17 +13501,14 @@ msgid ""
 "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
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
 #: ihtml/themes/default/setup_step4.tpl:27
 msgid "Admin password"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -11383,32 +13516,26 @@ msgid ""
 "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
 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
 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
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
@@ -11416,12 +13543,10 @@ msgid ""
 "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 "
@@ -11429,139 +13554,80 @@ msgid ""
 "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
 msgid "Mail method"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: 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. "
-"(But it  could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
 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
-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:"
+#: ihtml/themes/default/conflict.tpl:2
+msgid "Session conflict detected"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/default/conflict.tpl:6
 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."
+"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:17
+#: ihtml/themes/default/conflict.tpl:10
 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"
+"Ignoring this message will change/destroy the data you're currently editing, "
+"so please close multiple windows and log in again."
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: ihtml/themes/default/conflict.tpl:14
+msgid "Logout"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/snapshotdialog.tpl:3
+msgid "Restoring an object snapshot"
 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 <i>Edit anyway</i> button."
+#: ihtml/themes/default/snapshotdialog.tpl:6
+#: ihtml/themes/default/snapshotdialog.tpl:57
+msgid "This procedure will create a working snapshot of the selected object."
 msgstr ""
 
-#: ihtml/themes/default/islocked.tpl:13
-msgid "Edit anyway"
+#: ihtml/themes/default/snapshotdialog.tpl:13
+#: ihtml/themes/default/snapshotdialog.tpl:62
+msgid "You will be able to restore from"
 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."
+#: ihtml/themes/default/snapshotdialog.tpl:15
+msgid "There are no available snapshots."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
+#: ihtml/themes/default/snapshotdialog.tpl:25
+msgid "There is no snapshot available that could be restored."
 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."
+#: ihtml/themes/default/snapshotdialog.tpl:27
+msgid "Choose a snapshot and click continue, to restore the snapshot."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
+#: ihtml/themes/default/snapshotdialog.tpl:54
+msgid "Creating an object snapshot"
 msgstr ""