Code

Fixed problem with ._ in share names
[gosa.git] / locale / messages.po
index 56d5c37fb1a49979aa8679fb324c56b807cc869a..cf41c176734315d1fd1b968afc5f646d533f92d0 100644 (file)
 msgid "My account"
 msgstr ""
 
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr ""
 
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr ""
 
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:74 contrib/gosa.conf:87 contrib/gosa.conf:96
-#: contrib/gosa.conf:102 contrib/gosa.conf:107 contrib/gosa.conf:113
-#: contrib/gosa.conf:122 contrib/gosa.conf:138 contrib/gosa.conf:147
-#: contrib/gosa.conf:152 contrib/gosa.conf:157 contrib/gosa.conf:162
-#: contrib/gosa.conf:167 contrib/gosa.conf:172
+#: contrib/gosa.conf: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/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/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
+#: plugins/gofax/faxaccount/paste_generic.tpl:4
+#: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
+#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: 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/systems/glpi.tpl:6
 #: plugins/admin/systems/glpiPrinter.tpl:6
 #: 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/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/servdnseditzone.tpl:1
+#: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
+#: plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr ""
 
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:515
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/groups/class_divListGroup.inc:156
+#: plugins/admin/users/class_divListUsers.inc:169
 msgid "Environment"
 msgstr ""
 
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:503
-#: plugins/admin/users/class_userManagement.inc:861
-#: plugins/admin/ogroups/tabs_ogroups.inc:72
-#: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: 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 ""
 
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:506
-#: plugins/admin/users/class_userManagement.inc:867
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: 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 ""
 
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:79 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 ""
 
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
-#: plugins/personal/generic/generic.tpl:398
+#: 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/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:865
-#: 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 ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:388
-#: plugins/addons/addressbook/contents.tpl:14
+#: 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/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_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:512
-#: plugins/admin/users/class_userManagement.inc:863
-#: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:921
+#: 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/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
+#: 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 ""
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:98
-#: contrib/gosa.conf:103 contrib/gosa.conf:109 contrib/gosa.conf:118
-#: contrib/gosa.conf:134 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:153 contrib/gosa.conf:158 contrib/gosa.conf:163
-#: contrib/gosa.conf:168 contrib/gosa.conf:173
+#: 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 ""
 
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/applications/class_applicationManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr ""
 
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr ""
 
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/class_servRepository.inc:244
+#: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:73
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/printerPPDDialog.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:246
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:87
+#: plugins/gofon/conference/generic.tpl:92
 msgid "Options"
 msgstr ""
 
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:653
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
 msgstr ""
 
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
-#: 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 ""
 
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
-#: 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 ""
 
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
-#: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:927
-#: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:591
+#: 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 ""
 
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
-#: 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/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/departments/headpage.tpl:20
+#: 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/glpiPrinter.tpl:104
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
-#: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/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 ""
 
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:123
-msgid "Databases"
-msgstr ""
-
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:26
 msgid "Services"
 msgstr ""
 
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
-#: 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 ""
 
 msgstr ""
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:199
 msgid "OGo"
 msgstr ""
 
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 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
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -205,275 +204,308 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:211
 msgid "Excel Export"
 msgstr ""
 
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:212 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: 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/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 ""
 
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:213
 msgid "CSV Import"
 msgstr ""
 
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:217
 msgid "Partitions"
 msgstr ""
 
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:206 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/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 ""
 
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
-#: plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:225 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
-#: plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:229 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
-#: plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:233 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:222 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 ""
 
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:238 plugins/admin/ogroups/tabs_ogroups.inc:107
+msgid "Summary"
+msgstr ""
+
+#: contrib/gosa.conf:242
 msgid "Packages"
 msgstr ""
 
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:264
 msgid "{LOCATIONNAME}"
 msgstr ""
 
 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 ""
 
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:285
 msgid "Russian"
 msgstr ""
 
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:286
 msgid "Spanish"
 msgstr ""
 
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:287
 msgid "French"
 msgstr ""
 
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:288
 msgid "Dutch"
 msgstr ""
 
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:289
 msgid "English"
 msgstr ""
 
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:290
 msgid "Italian"
 msgstr ""
 
 msgid "Italian"
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:4
-msgid "Nagios Account"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:7
-msgid "Alias"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-msgid "Mail address"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:17
-msgid "Host notification period"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:25
-msgid "Service notification period"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:32
-msgid "Service notification options"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:41
-msgid "Host notification options"
+#: contrib/gosa.conf:291
+msgid "Polish"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: 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/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
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: 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: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
+msgid "This does something"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:53
-msgid "Service notification commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+msgid "This account has no nagios extensions."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:57
-msgid "Host notification commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
+msgid "Remove nagios account"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:66
-msgid "Nagios authentification"
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:69
-msgid "view system informations"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid "Create nagios account"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:72
-msgid "view configuration information"
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
+msgid "Saving nagios account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:78
-msgid "view all services"
+#: plugins/personal/nagios/class_nagiosAccount.inc:167
+msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
+msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/nagios/nagios.tpl:86
-msgid "trigger all host commands"
+#: 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
 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/environment/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
 #: plugins/personal/connectivity/main.inc:118
 #: 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/gofax/faxaccount/main.inc:89
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/fai/class_faiManagement.inc:605
-#: plugins/admin/groups/class_groupManagement.inc:412
-#: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:430
-#: plugins/admin/departments/class_departmentManagement.inc:367
-#: plugins/admin/systems/class_systemManagement.inc:720
-#: plugins/admin/ogroups/class_ogroupManagement.inc:400
-#: 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/phoneaccount/main.inc:105
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
-#: ihtml/themes/default/copyPasteDialog.tpl:20
-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
 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:81
 #: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:67
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/posix/main.inc:112 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/environment/main.inc:106
+#: 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/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:35
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:120
 #: plugins/personal/generic/password.tpl:19
 #: 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/address_edit.tpl:234
 #: plugins/addons/addressbook/remove.tpl:16
 #: 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/address_edit.tpl:234
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/addons/godfs/class_dfsManagment.inc:219
-#: plugins/admin/fai/class_faiManagement.inc:607
-#: plugins/admin/fai/class_faiManagement.inc:612
-#: plugins/admin/fai/faiPackageConfiguration.tpl:7
+#: 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/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiPackageConfiguration.tpl:7
+#: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
-#: 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/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiPackageEntry.tpl:57
+#: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiHookEntry.tpl:71
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/fai/faiHookEntry.tpl:71
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:336
 #: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:432
+#: 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:356
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:369
+#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/systems/glpiSelectUser.tpl:51
+#: 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/glpi_edit_type.tpl:29
+#: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/servnfs.tpl:76
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
-#: plugins/admin/systems/servdnseditzone.tpl:118
-#: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
 #: plugins/admin/systems/glpi_devices.tpl:761
+#: 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/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/glpi_edit_os.tpl:29
-#: plugins/admin/systems/printerPPDDialog.tpl:23
+#: 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/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: 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/goGlpiServer.tpl:26
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/remove.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/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:41
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:402
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16
 #: 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/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
 #: plugins/gofon/conference/remove.tpl:16
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/copyPasteDialog.tpl:13
-#: ihtml/themes/lhs/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
 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
 #: plugins/personal/environment/main.inc:114
 #: plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
@@ -483,28 +515,28 @@ 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
 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/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/environment/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
-#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
+#: 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/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/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/servdns.tpl:7
+#: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/servdnseditzone.tpl:27
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
@@ -513,352 +545,277 @@ msgstr ""
 msgid "Nagios settings"
 msgstr ""
 
 msgid "Nagios settings"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: 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/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/addons/godfs/class_dfsManagment.inc:17
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: 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
-msgid "This does something"
+#: plugins/personal/nagios/nagios.tpl:4
+msgid "Nagios Account"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid "This account has no nagios extensions."
+#: plugins/personal/nagios/nagios.tpl:7
+msgid "Alias"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
-msgid "Remove nagios account"
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+msgid "Mail address"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host notification period"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid "Create nagios account"
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service notification period"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service notification options"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
-msgid "The required field 'NagiosAlias' is not set."
+#: plugins/personal/nagios/nagios.tpl:41
+msgid "Host notification options"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
-msgid "The required field 'NagiosMail' is not set."
+#: plugins/personal/nagios/nagios.tpl:48
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
-msgid "Please enter a valid email address in 'NagiosMail' field."
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service notification commands"
 msgstr ""
 
 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."
+#: plugins/personal/nagios/nagios.tpl:57
+msgid "Host notification commands"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:176
-msgid "No DESC tag in vacation file:"
+#: plugins/personal/nagios/nagios.tpl:66
+msgid "Nagios authentification"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
+#: plugins/personal/nagios/nagios.tpl:69
+msgid "view system informations"
 msgstr ""
 
 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"
+#: plugins/personal/nagios/nagios.tpl:72
+msgid "view configuration information"
 msgstr ""
 
 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."
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
+#: plugins/personal/nagios/nagios.tpl:78
+msgid "view all services"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:276
-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
-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
-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
-msgid "The address you're trying to add is already used by user"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:714
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:798
-msgid "The required field 'Primary address' is not set."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-msgid "The primary address you've entered is already in use."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:739
-#: plugins/admin/groups/class_groupMail.inc:813
-msgid "Value in 'Quota size' is not valid."
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:748
-#: plugins/admin/groups/class_groupMail.inc:822
-msgid "Please specify a vaild mail size for mails to be rejected."
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:758
-#: plugins/admin/groups/class_groupMail.inc:830
-msgid "You need to set the maximum mail size in order to reject anything."
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:762
-msgid "You specified Spam settings, but there is no Folder specified."
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
+#: 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/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:11
-#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:922
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
-#: 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:170
-#: plugins/admin/systems/class_printGeneric.inc:424
-msgid "not defined"
-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 ""
 
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:35
+#: 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/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:38
-#: 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: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/mail/mail_locals.tpl:41
-#: plugins/personal/mail/copypaste.tpl:21
-#: plugins/personal/mail/copypaste.tpl:44
+#: plugins/personal/posix/posix_groups.tpl:79
+#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
 #: plugins/personal/samba/samba3.tpl:330
 #: 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/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/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
+#: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:71 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/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/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:540
+#: plugins/admin/groups/application.tpl:27
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/group_objects.tpl:55
-#: plugins/admin/groups/generic.tpl:104
-#: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
+#: 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/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:61
-#: plugins/admin/systems/workstationStartup.tpl:81
-#: plugins/admin/systems/workstationStartup.tpl:100
-#: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/terminalStartup.tpl:61
-#: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:461
-#: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/servdnseditzone.tpl:102
+#: 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/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/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/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_cartridge_type.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:478
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: 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/admin/ogroups/phonequeue.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:18
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:13
-#: plugins/gofon/phoneaccount/paste_generic.tpl:14
 msgid "Add"
 msgstr ""
 
 msgid "Add"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
-#: plugins/personal/mail/copypaste.tpl:23
+#: 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: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/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: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/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/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/faiVariable.tpl:46
-#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
-#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
-#: 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/groups/paste_mail.tpl:31
+#: plugins/admin/fai/faiPartitionTable.tpl:45
+#: 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/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/printer.tpl:76 plugins/admin/systems/printer.tpl:92
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
-#: plugins/admin/systems/workstationStartup.tpl:62
-#: plugins/admin/systems/workstationStartup.tpl:82
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: 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/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/class_termDNS.inc:474
 #: plugins/admin/systems/remove_glpi.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: 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/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:279
-#: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
+#: 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/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
-#: plugins/gofon/phoneaccount/paste_generic.tpl:15
+#: 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/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 ""
 #: plugins/personal/mail/generic.tpl:67
 msgid "Mail options"
 msgstr ""
@@ -912,18 +869,6 @@ msgstr ""
 msgid "Vacation message"
 msgstr ""
 
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:119
-#: plugins/personal/mail/copypaste.tpl:13
-msgid "Forward messages to"
-msgstr ""
-
-#: plugins/personal/mail/generic.tpl:130
-#: plugins/personal/mail/copypaste.tpl:22
-#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
-#: plugins/admin/groups/paste_mail.tpl:42
-msgid "Add local"
-msgstr ""
-
 #: plugins/personal/mail/generic.tpl:140
 msgid "Advanced mail options"
 msgstr ""
 #: plugins/personal/mail/generic.tpl:140
 msgid "Advanced mail options"
 msgstr ""
@@ -944,6 +889,135 @@ msgstr ""
 msgid "disables all Mail options!"
 msgstr ""
 
 msgid "disables all Mail options!"
 msgstr ""
 
+#: 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/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/class_mailAccount.inc:205
+msgid "No DESC tag in vacation file:"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:244
+msgid "This account has no mail extensions."
+msgstr ""
+
+#: 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/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/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: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:307
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+
+#: 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: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: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: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:776
+#: plugins/admin/groups/class_groupMail.inc:803
+msgid "The required field 'Primary address' is not set."
+msgstr ""
+
+#: 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: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:796
+#: plugins/admin/groups/class_groupMail.inc:818
+msgid "Value in 'Quota size' is not valid."
+msgstr ""
+
+#: 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: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: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/main.inc:124
 msgid "User mail settings"
 msgstr ""
@@ -954,40 +1028,36 @@ msgid "Select addresses to add"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:20
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.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/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/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: 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/fai/headpage.tpl:64
-#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/admin/groups/group_objects.tpl:20
 #: 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:47
+#: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/departments/headpage.tpl:29
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
+#: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/servRepository.tpl:36
-#: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:35
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
 msgid "Filters"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:27
 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/posix/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -1016,27 +1086,34 @@ msgstr ""
 msgid "User name of which addresses are shown"
 msgstr ""
 
 msgid "User name of which addresses are shown"
 msgstr ""
 
-#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-msgid "Mail settings"
-msgstr ""
-
 #: plugins/personal/password/class_password.inc:5
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:872
+#: 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
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: 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:37 ihtml/themes/default/login.tpl:41
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
-#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
-#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
 msgid "Password"
 msgstr ""
 
 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/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
+#: plugins/admin/users/class_divListUsers.inc:230
 msgid "Change password"
 msgstr ""
 
 msgid "Change password"
 msgstr ""
 
@@ -1090,24 +1167,16 @@ msgstr ""
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: 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:50
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/admin/fai/faiNewBranch.tpl:50
-#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
-#: 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/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_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
-#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
-#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
-#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr ""
 
 msgid "Back"
 msgstr ""
 
@@ -1122,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
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:351
+#: 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
 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:356
+#: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1149,44 +1218,44 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
+#: plugins/personal/posix/posix_groups.tpl:6
+msgid "Select groups to add"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
+#: plugins/personal/posix/posix_groups.tpl:32
+msgid "Display groups of department"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:6
-msgid "Select groups to add"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:29
-msgid "Display groups of department"
+#: 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 ""
 
 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:53
 msgid "Display groups matching"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1199,52 +1268,71 @@ msgstr ""
 msgid "Password expires on"
 msgstr ""
 
 msgid "Password expires on"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:640
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
+#: plugins/personal/posix/paste_generic.tpl:4
+msgid "Posix settings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:29
-#: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/contents.tpl:32
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
-#: plugins/gofon/fonreports/contents.tpl:35
-msgid "Status"
+#: 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 ""
 
 msgstr ""
 
+#: plugins/personal/posix/paste_generic.tpl:23
 #: plugins/personal/posix/generic.tpl:39
 #: plugins/personal/posix/generic.tpl:39
-#: plugins/personal/posix/paste_generic.tpl:21
 msgid "Force UID/GID"
 msgstr ""
 
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:43
-#: plugins/personal/posix/paste_generic.tpl:26 html/getxls.php:230
+#: plugins/personal/posix/paste_generic.tpl:28
+#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
 msgid "UID"
 msgstr ""
 
 msgid "UID"
 msgstr ""
 
+#: plugins/personal/posix/paste_generic.tpl:37
 #: plugins/personal/posix/generic.tpl:52
 #: plugins/personal/posix/generic.tpl:52
-#: plugins/personal/posix/paste_generic.tpl:35
 msgid "GID"
 msgstr ""
 
 msgid "GID"
 msgstr ""
 
+#: plugins/personal/posix/paste_generic.tpl:47
 #: plugins/personal/posix/generic.tpl:64
 msgid "Group membership"
 msgstr ""
 
 #: 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/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 ""
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr ""
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:75
+msgid "Display systems matching"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:29
+#: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/contents.tpl:32
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
+#: plugins/gofon/fonreports/contents.tpl:35
+msgid "Status"
+msgstr ""
+
 #: plugins/personal/posix/generic.tpl:84
 msgid "Account"
 msgstr ""
 #: plugins/personal/posix/generic.tpl:84
 msgid "Account"
 msgstr ""
@@ -1257,304 +1345,357 @@ msgstr ""
 msgid "Trust mode"
 msgstr ""
 
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr ""
-
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:137
-#: plugins/personal/posix/class_posixAccount.inc:993
+#: plugins/personal/posix/class_posixAccount.inc:125
+msgid "expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:127
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:130
+msgid "active, password not changable"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:132
+msgid "active, password expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+msgid "active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:973
 msgid "Group of user"
 msgstr ""
 
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:177
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "unconfigured"
 msgstr ""
 
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_workstationService.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:623
-#: plugins/admin/systems/class_terminalService.inc:141
-#: 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr ""
 
 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/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr ""
 
 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/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr ""
 
 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/personal/generic/class_user.inc:245
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr ""
 
 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/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr ""
 
 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/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr ""
 
 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/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr ""
 
 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/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr ""
 
 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/personal/generic/class_user.inc:246
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr ""
 
 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/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr ""
 
 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/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr ""
 
 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/personal/generic/class_user.inc:247
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr ""
 
 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
-#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/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 ""
 
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:569
+#: plugins/personal/posix/class_posixAccount.inc:557
 msgid "full access"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: 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 ""
 
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:890
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:898
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:921
+#: plugins/personal/posix/class_posixAccount.inc:901
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:925
-#: plugins/admin/groups/class_groupGeneric.inc:768
+#: plugins/personal/posix/class_posixAccount.inc:905
+#: plugins/admin/groups/class_groupGeneric.inc:774
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:928
-#: plugins/admin/groups/class_groupGeneric.inc:771
+#: plugins/personal/posix/class_posixAccount.inc:908
+#: plugins/admin/groups/class_groupGeneric.inc:777
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:936
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:941
+#: plugins/personal/posix/class_posixAccount.inc:921
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:946
+#: plugins/personal/posix/class_posixAccount.inc:926
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:929
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:952
+#: plugins/personal/posix/class_posixAccount.inc:932
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:955
+#: plugins/personal/posix/class_posixAccount.inc:935
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: plugins/personal/posix/class_posixAccount.inc:940
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:943
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:968
+#: plugins/personal/posix/class_posixAccount.inc:948
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
-#: plugins/admin/groups/class_groupGeneric.inc:807
+#: 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 ""
 
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/paste_generic.tpl:4
-msgid "Posix settings"
+#: plugins/personal/posix/main.inc:131
+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
 msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:13
@@ -1567,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/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 ""
 
 msgid "Profile path"
 msgstr ""
 
@@ -1616,17 +1757,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:158
 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
 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
 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 ""
 
 msgid "IDLE"
 msgstr ""
 
@@ -1683,10 +1824,6 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr ""
 
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr ""
-
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -1695,122 +1832,137 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:196
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:198
 msgid "This account has no samba extensions."
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "disconnect"
 msgstr ""
 
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "reset"
 msgstr ""
 
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:464
 msgid "from any client"
 msgstr ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
+#: plugins/personal/samba/class_sambaAccount.inc:974
+msgid "Saving Samba account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:111
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Please select an entry or press cancel."
 msgstr ""
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
+msgid "Please select a printer or press cancel."
+msgstr ""
+
 #: plugins/personal/environment/hotplugDialog.tpl:1
 msgid "Add hotplug devices"
 msgstr ""
 #: plugins/personal/environment/hotplugDialog.tpl:1
 msgid "Add hotplug devices"
 msgstr ""
@@ -1828,8 +1980,10 @@ msgid "Choose the department the search will be based    on"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/admin/fai/class_divListFai.inc:81
 #: plugins/admin/groups/group_objects.tpl:46
 #: 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"
 #: plugins/admin/systems/glpiSelectUser.tpl:35
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
@@ -1839,80 +1993,119 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-msgid "Please select a printer or press cancel."
+#: plugins/personal/environment/class_environment.inc:198
+msgid "auto"
+msgstr ""
+
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:253
-#: plugins/personal/environment/class_environment.inc:290
+#: plugins/personal/environment/class_environment.inc:297
+#: plugins/personal/environment/class_environment.inc:334
 msgid "Remove environment extension"
 msgstr ""
 
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:254
-#: plugins/personal/environment/class_environment.inc:291
+#: 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 ""
 
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:263
-#: plugins/personal/environment/class_environment.inc:268
-#: plugins/personal/environment/class_environment.inc:296
-#: plugins/personal/environment/class_environment.inc:301
+#: 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 ""
 
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:264
-#: plugins/personal/environment/class_environment.inc:297
+#: 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 ""
 
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:269
-#: plugins/personal/environment/class_environment.inc:302
+#: 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 ""
 
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:381
-msgid "auto"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:414
-#: 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 ""
 
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:510
-#: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_workstationStartup.inc:503
-#: plugins/admin/systems/class_terminalStartup.inc:134
+#: 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 ""
 
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:756
+#: 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 ""
 
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:763
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:801
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:895
+#: plugins/personal/environment/class_environment.inc:1017
 msgid "Error while writing printer"
 msgstr ""
 
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:966
+#: plugins/personal/environment/class_environment.inc:1087
 msgid "Error while writing printer settings"
 msgstr ""
 
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1080
-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
 msgstr ""
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
@@ -1938,7 +2131,7 @@ msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
 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 ""
 #: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr ""
@@ -1979,24 +2172,38 @@ msgstr ""
 msgid "Manage"
 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 ""
 
 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/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/workstationStartup.tpl:86
-#: plugins/admin/systems/terminalStartup.tpl:66
+#: 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/servservice.tpl:11
+#: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/class_goShareServer.inc:148
 msgid "Shares"
 msgstr ""
 
 msgid "Shares"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:111
+msgid "User used to connect to the share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:112
+msgid "Select a share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:118
+msgid "Mount path"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
@@ -2004,24 +2211,25 @@ msgstr ""
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
 #: plugins/admin/fai/faiPackage.tpl:72
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
 #: 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/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/workstationStartup.tpl:101
+#: plugins/admin/systems/workstationStartup.tpl:144
 #: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: 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/glpiManufacturer.tpl:8
-#: plugins/admin/systems/printer.tpl:48
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
 msgid "Remove"
 msgstr ""
 
 msgid "Remove"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:126
 msgid "Logon scripts"
 msgstr ""
 
 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"
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
@@ -2036,9 +2244,8 @@ msgid "Hotplug device settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:164
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:456
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/admin/groups/class_divListGroup.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:96
 msgid "New"
 msgstr ""
 
 msgid "New"
 msgstr ""
 
@@ -2046,12 +2253,28 @@ msgstr ""
 msgid "Existing"
 msgstr ""
 
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:173
+#: plugins/personal/environment/environment.tpl:174
 msgid "Printer settings"
 msgstr ""
 
 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:97
+msgid "Specified name is invalid."
+msgstr ""
+
+#: 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 ""
 
 #: plugins/personal/environment/logonManagement.tpl:8
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:8
@@ -2064,26 +2287,27 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
+#: 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/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
-#: plugins/admin/systems/printer.tpl:13
-#: 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
 #: 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 ""
 
 msgid "Description"
 msgstr ""
 
@@ -2109,51 +2333,31 @@ msgid "Logon script"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:88
 #: plugins/gofax/faxaccount/lists.tpl:31
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: 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/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/groups/application_options.tpl:8
+#: plugins/admin/groups/class_groupManagement.inc:333
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/mail_admins.tpl:37
+#: 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/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 ""
 
 msgid "Apply"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-msgid "Specified name is invalid."
-msgstr ""
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-msgid "Specified description contains invalid characters."
-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/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -2188,200 +2392,147 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
+#: plugins/admin/fai/class_faiSummaryTab.inc:219
 #: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/systems/glpi_edit_type.tpl:15
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
-#: plugins/admin/systems/glpiManufacturer.tpl:13
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: 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_cartridge_type.tpl:13
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:79
 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:324
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:420
-msgid "Please enter a valid serial number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:461
-msgid "No certificate installed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "Can't remove user from kerberos database."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:907
-msgid "Can't add user to kerberos database."
+#: plugins/personal/environment/main.inc:124
+msgid "User environment settings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:947
-msgid "You have no permissions to create a user on this 'Base'."
+#: plugins/personal/environment/hotplugDialogNew.tpl:1
+msgid "Create new hotplug entry"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:952
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/environment/hotplugDialogNew.tpl:8
+msgid "Create new hotplug device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
+#: plugins/personal/environment/hotplugDialogNew.tpl:10
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:967
-msgid "There's already a person with this 'Login' in the database."
+#: plugins/personal/environment/hotplugDialogNew.tpl:28
+msgid "Vendor ID"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
+#: plugins/personal/environment/hotplugDialogNew.tpl:33
+msgid "Product ID"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
+#: plugins/personal/environment/hotplugDialogNew.tpl:40
+msgid "Device ID"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+#: 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/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/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 ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/password.tpl:2
 msgid ""
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"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 ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:993
-msgid "The field 'Homepage' contains an invalid URL definition."
+#: 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 ""
 
 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
-msgid "The field 'Name' contains invalid characters."
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
 msgstr ""
 
 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
-msgid "The field 'Given name' contains invalid characters."
+#: plugins/personal/generic/paste_generic.tpl:4
+msgid "User settings"
 msgstr ""
 
 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
-msgid "The field 'Phone' contains an invalid phone number."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-msgid "The field 'Fax' contains an invalid phone number."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/personal/generic/paste_generic.tpl:15
+#: plugins/personal/generic/generic.tpl:59 plugins/admin/users/template.tpl:32
+msgid "Login"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-msgid "The field 'Pager' contains an invalid phone number."
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1140
-msgid "Could not open specified certificate!"
+#: plugins/personal/generic/paste_generic.tpl:35
+msgid "Clear password"
 msgstr ""
 
 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/generic/paste_generic.tpl:36
+msgid "Set new password"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
 
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/paste_generic.tpl:41
-msgid "Personal picture"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:43
-#: plugins/personal/generic/paste_generic.tpl:7
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:19
-msgid "Last name"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:48
 msgid "Template name"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:48
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:55
-#: plugins/personal/generic/paste_generic.tpl:11
-#: plugins/addons/addressbook/address_edit.tpl:30
-#: plugins/admin/users/template.tpl:23
-msgid "First name"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:59
-#: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/admin/users/template.tpl:28
-msgid "Login"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:67
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/personal/generic/generic.tpl:67
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
@@ -2397,8 +2548,7 @@ msgid "Date of birth"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:100
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:100
-#: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr ""
 
 msgid "Set"
 msgstr ""
 
@@ -2412,31 +2562,33 @@ msgid "Preferred langage"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:127
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:127
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:101
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/addons/godfs/class_dfsManagment.inc:186
-#: plugins/admin/fai/class_faiManagement.inc:678
-#: plugins/admin/groups/class_groupManagement.inc:459
+#: 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/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:787
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:118
 #: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/departments/class_divListDepartment.inc:93
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/class_systemManagement.inc:772
 #: plugins/admin/systems/printer.tpl:20
 #: plugins/admin/systems/printer.tpl:20
+#: 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/wingeneric.tpl:13
+#: 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/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/admin/ogroups/class_divListOGroup.inc:125
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/gofon/macro/class_divListMacros.inc:98
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/conference/class_divListConferences.inc:99
 #: plugins/gofon/conference/generic.tpl:33
 #: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr ""
 
 msgid "Base"
 msgstr ""
 
@@ -2444,193 +2596,182 @@ msgstr ""
 msgid "Choose subtree to place user in"
 msgstr ""
 
 msgid "Choose subtree to place user in"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:134
-#: plugins/admin/groups/generic.tpl:26
-#: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/workstation.tpl:32
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
-#: plugins/admin/systems/printer.tpl:25
+#: 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/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 ""
 
 msgid "Select a base"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:147
-#: plugins/personal/generic/generic.tpl:291
+#: 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/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
-#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:155
 msgid "Private phone"
 msgstr ""
 
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:159
 msgid "Homepage"
 msgstr ""
 
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/generic.tpl:168
 msgid "Password storage"
 msgstr ""
 
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:174
+#: plugins/personal/generic/generic.tpl:178
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:176
+#: plugins/personal/generic/generic.tpl:180
 msgid "Edit certificates"
 msgstr ""
 
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:184
 msgid "Kerberos"
 msgstr ""
 
 msgid "Kerberos"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:181
+#: plugins/personal/generic/generic.tpl:185
 msgid "Edit properties"
 msgstr ""
 
 msgid "Edit properties"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:197
+#: plugins/personal/generic/generic.tpl:201
 msgid "Organizational information"
 msgstr ""
 
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:209 html/getxls.php:236
+#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
 msgid "Organization"
 msgstr ""
 
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
-#: plugins/admin/applications/class_applicationManagement.inc:521
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/ogroups/class_ogroupManagement.inc:518
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: 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/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:221
 msgid "Department No."
 msgstr ""
 
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:223
+#: plugins/personal/generic/generic.tpl:227
 msgid "Employee No."
 msgstr ""
 
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:233
 msgid "Employee type"
 msgstr ""
 
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:245
-#: plugins/personal/generic/generic.tpl:384
+#: plugins/personal/generic/generic.tpl:249
+#: plugins/personal/generic/generic.tpl:388
 msgid "Room No."
 msgstr ""
 
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:257
-#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_edit.tpl:95
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr ""
 
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:283
+#: plugins/personal/generic/generic.tpl:287
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/addons/godfs/generic.tpl:34
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/generic.tpl:51
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
+#: 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 ""
 
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
-#: 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 ""
 
 #: html/getxls.php:236
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:305
+#: plugins/personal/generic/generic.tpl:309
 msgid "Vocation"
 msgstr ""
 
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:313
 msgid "Unit description"
 msgstr ""
 
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/generic.tpl:321
 msgid "Subject area"
 msgstr ""
 
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:325
+#: plugins/personal/generic/generic.tpl:329
 msgid "Functional title"
 msgstr ""
 
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:336
 msgid "Role"
 msgstr ""
 
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:348
 msgid "Person locality"
 msgstr ""
 
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:352
+#: plugins/personal/generic/generic.tpl:356
 msgid "Unit"
 msgstr ""
 
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:359
+#: plugins/personal/generic/generic.tpl:363
 msgid "Street"
 msgstr ""
 
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:365
+#: 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/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:371
+#: plugins/personal/generic/generic.tpl:375
 msgid "House identifier"
 msgstr ""
 
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:393
+#: plugins/personal/generic/generic.tpl:397
 msgid "Please use the phone tab"
 msgstr ""
 
 msgid "Please use the phone tab"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:406
+#: plugins/personal/generic/generic.tpl:410
 msgid "Last delivery"
 msgstr ""
 
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/generic.tpl:417
 msgid "Public visible"
 msgstr ""
 
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr ""
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -2647,109 +2788,248 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/main.inc:189
-msgid "Generic user information"
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:4
-msgid "User settings"
+#: plugins/personal/generic/class_user.inc:272
+msgid "This account has no valid GOsa extensions."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
+#: plugins/personal/generic/class_user.inc:326
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:10
-msgid "Proxy account"
+#: plugins/personal/generic/class_user.inc:422
+msgid "Please enter a valid serial number"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:18
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
+#: plugins/personal/generic/class_user.inc:459
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Limit proxy access to working time"
+#: plugins/personal/generic/class_user.inc:459
+msgid "valid"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
+#: plugins/personal/generic/class_user.inc:459
+msgid "invalid"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:86
-msgid "per"
+#: plugins/personal/generic/class_user.inc:463
+msgid "No certificate installed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/pptp.tpl:3
-msgid "PPTP account"
+#: plugins/personal/generic/class_user.inc:546
+msgid "Removing generic user account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:3
-msgid "Intranet account"
+#: plugins/personal/generic/class_user.inc:835
+msgid "Saving generic user account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:3
-msgid "PHPGroupware account"
+#: plugins/personal/generic/class_user.inc:882
+msgid "Kerberos database communication failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/glpi.tpl:1
-msgid "GLPI account"
+#: plugins/personal/generic/class_user.inc:899
+msgid "Can't remove user from kerberos database."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
+#: plugins/personal/generic/class_user.inc:910
+msgid "Can't add user to kerberos database."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
+#: plugins/personal/generic/class_user.inc:954
+msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
+#: plugins/personal/generic/class_user.inc:959
+msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
+#: plugins/personal/generic/class_user.inc:974
+msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
+#: plugins/personal/generic/class_user.inc:983
+msgid "The required field 'Login' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/admin/systems/servRepositorySetup.tpl:24
-msgid "URL"
+#: plugins/personal/generic/class_user.inc:990
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:39
-msgid "Future"
+#: plugins/personal/generic/class_user.inc:997
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
+#: plugins/personal/generic/class_user.inc:1000
+msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:45
-msgid "Invitation policy"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:4
-msgid "FTP account"
+#: 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: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: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:1017
+#: plugins/addons/addressbook/class_addressbook.inc:573
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: 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:1147
+msgid "Could not open specified certificate!"
+msgstr ""
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr ""
+
+#: plugins/personal/generic/main.inc:189
+msgid "Generic user information"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:10
+msgid "Proxy account"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:18
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Limit proxy access to working time"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr ""
+
+#: plugins/personal/connectivity/proxy.tpl:86
+msgid "per"
+msgstr ""
+
+#: plugins/personal/connectivity/pptp.tpl:3
+msgid "PPTP account"
+msgstr ""
+
+#: plugins/personal/connectivity/intranet.tpl:3
+msgid "Intranet account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+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 ""
+
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/admin/systems/servRepositorySetup.tpl:24
+msgid "URL"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:26
+#: plugins/personal/connectivity/oxchange.tpl:30
+msgid "days"
+msgstr ""
+
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
+msgstr ""
+
+#: plugins/personal/connectivity/pureftpd.tpl:4
+msgid "FTP account"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:15
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:15
@@ -2802,65 +3082,53 @@ msgstr ""
 msgid "Temporary disable FTP access"
 msgstr ""
 
 msgid "Temporary disable FTP access"
 msgstr ""
 
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr ""
+
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr ""
 
 #: plugins/personal/connectivity/oxchange.tpl:2
 #: plugins/personal/connectivity/oxchange.tpl:2
 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 ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
+#: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
 msgstr ""
 
 msgid "Open-Xchange account"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:13
+#: plugins/personal/connectivity/oxchange.tpl:21
 msgid "Remember"
 msgstr ""
 
 msgid "Remember"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
+#: plugins/personal/connectivity/oxchange.tpl:25
 msgid "Appointment Days"
 msgstr ""
 
 msgid "Appointment Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
+#: plugins/personal/connectivity/oxchange.tpl:29
 msgid "Task Days"
 msgstr ""
 
 msgid "Task Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
+#: plugins/personal/connectivity/oxchange.tpl:41
 msgid "User Information"
 msgstr ""
 
 msgid "User Information"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:37
+#: plugins/personal/connectivity/oxchange.tpl:45
 msgid "User Timezone"
 msgstr ""
 
 msgid "User Timezone"
 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_workstationGeneric.inc:71
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr ""
-
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:79
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 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 ""
 
 msgid "KB"
 msgstr ""
 
@@ -2869,7 +3137,7 @@ msgid "GB"
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:80
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:304
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
 msgid "hour"
 msgstr ""
 
@@ -2885,51 +3153,81 @@ msgstr ""
 msgid "month"
 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 ""
 
 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 ""
 
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/personal/connectivity/class_proxyAccount.inc:262
+msgid "Saving proxy account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:26
-msgid "PPTP"
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Upload bandwidth' is not valid."
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
-msgid "Value specified as 'Download bandwidth' is not valid."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
-msgid "Value specified as 'Ratio' is not valid."
+#: 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 ""
 
 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 ""
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
 msgstr ""
@@ -2973,76 +3271,110 @@ msgstr ""
 msgid "Anonymous"
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
+#: plugins/personal/connectivity/class_kolabAccount.inc:325
+msgid "Saving Kolab account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
 msgstr ""
 
 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_pureftpdAccount.inc:96
+msgid "Removing pureftpd account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-msgid "OpenXchange"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
 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_pureftpdAccount.inc:141
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+msgid "Value specified as 'Files' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+msgid "Value specified as 'Size' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:701
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+msgid "Saving pureftpd account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:705
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:802
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:806
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:785
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
+msgid "Removing of oxchange addressbook failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+msgid "Removing oxchange account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+msgid "Saving of oxchange account failed"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+msgid "Creating oxchange addressbook tree failed"
+msgstr ""
+
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr ""
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr ""
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr ""
@@ -3065,361 +3397,434 @@ msgid ""
 "configuration twice."
 msgstr ""
 
 "configuration twice."
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr ""
-
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
 msgid "PHPscheduleit"
 msgstr ""
 
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
 msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+msgid "Removing PHPscheduleit account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+msgid "Saving PHPscheduleit account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:72
-msgid "Numbers can also contain wild cards."
+#: 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 ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:641
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_systemManagement.inc:753
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
+#: 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_divListOGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
 msgid "Go to root department"
 msgstr ""
 
 msgid "Go to root department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/addons/godfs/class_dfsManagment.inc:183
-#: plugins/admin/fai/class_faiManagement.inc:641
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/departments/class_departmentManagement.inc:296
+#: 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_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_systemManagement.inc:753
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
 msgid "Root"
 msgstr ""
 
 msgid "Root"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:644
-#: plugins/admin/groups/class_groupManagement.inc:452
-#: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:473
-#: plugins/admin/departments/class_departmentManagement.inc:297
+#: 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_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_systemManagement.inc:755
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:444
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: 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 ""
 
 msgid "Go up one department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/addons/godfs/class_dfsManagment.inc:182
-#: plugins/admin/fai/class_faiManagement.inc:644
+#: 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_faiProfile.inc:303
-#: plugins/admin/groups/class_groupManagement.inc:452
-#: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:473
-#: plugins/admin/departments/class_departmentManagement.inc:297
+#: 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_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_systemManagement.inc:755
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
 msgid "Up"
 msgstr ""
 
 msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/groups/class_groupManagement.inc:453
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:474
+#: 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_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:445
-#: 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 ""
 
 msgid "Go to users department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:647
-#: plugins/admin/groups/class_groupManagement.inc:453
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: 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_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_systemManagement.inc:757
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:446
-#: 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 ""
 
 msgid "Home"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
-#: plugins/admin/fai/class_faiManagement.inc:649
-#: plugins/admin/groups/class_groupManagement.inc:454
-#: plugins/admin/users/class_userManagement.inc:781
-#: plugins/admin/applications/class_applicationManagement.inc:475
-#: plugins/admin/departments/class_departmentManagement.inc:299
+#: 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_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_systemManagement.inc:758
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_ogroupManagement.inc:447
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: 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 ""
 
 msgid "Reload list"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/addons/godfs/class_dfsManagment.inc:187
-#: plugins/admin/fai/class_faiManagement.inc:649
-#: plugins/admin/fai/class_faiManagement.inc:679
-#: plugins/admin/groups/class_groupManagement.inc:454
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:781
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/applications/class_applicationManagement.inc:475
-#: plugins/admin/applications/class_applicationManagement.inc:481
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/departments/class_departmentManagement.inc:304
+#: 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_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_systemManagement.inc:758
-#: plugins/admin/systems/class_systemManagement.inc:775
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_ogroupManagement.inc:447
-#: plugins/admin/ogroups/class_ogroupManagement.inc:453
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: 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 ""
 
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+#: 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 ""
 
 msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:99
 msgid "New Blocklist"
 msgstr ""
 
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/addons/godfs/class_dfsManagment.inc:187
-#: plugins/admin/fai/class_faiManagement.inc:679
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/applications/class_applicationManagement.inc:481
-#: plugins/admin/departments/class_departmentManagement.inc:304
+#: 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/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_systemManagement.inc:775
-#: plugins/admin/ogroups/class_ogroupManagement.inc:453
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: 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 ""
 
 msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:697
-#: plugins/admin/fai/class_faiManagement.inc:797
-#: plugins/admin/fai/class_faiManagement.inc:802
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:470
-#: plugins/admin/groups/class_groupManagement.inc:475
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/admin/applications/class_applicationManagement.inc:492
-#: plugins/admin/applications/class_applicationManagement.inc:498
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: 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/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/systems/class_divListSystem.inc:163
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:465
-#: plugins/admin/ogroups/class_ogroupManagement.inc:470
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: 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 ""
 
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:131
+#: plugins/admin/users/class_divListUsers.inc:228
 msgid "Edit user"
 msgstr ""
 
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:698
-#: plugins/admin/fai/class_faiManagement.inc:804
-#: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:472
-#: plugins/admin/groups/class_groupManagement.inc:477
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/admin/applications/class_applicationManagement.inc:494
-#: plugins/admin/applications/class_applicationManagement.inc:500
-#: plugins/admin/departments/class_departmentManagement.inc:312
-#: plugins/admin/systems/class_systemManagement.inc:782
-#: plugins/admin/ogroups/class_ogroupManagement.inc:467
-#: plugins/admin/ogroups/class_ogroupManagement.inc:472
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+#: 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 ""
 
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
-#: plugins/admin/users/class_userManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:811
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
+#: plugins/admin/users/class_divListUsers.inc:232
 msgid "Delete user"
 msgstr ""
 
 msgid "Delete user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-msgid "Blocklist name"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
-#: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:694
-#: plugins/admin/groups/class_groupManagement.inc:526
-#: plugins/admin/users/class_userManagement.inc:821
-#: plugins/admin/applications/class_applicationManagement.inc:522
-#: plugins/admin/departments/class_departmentManagement.inc:319
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/systems/class_systemManagement.inc:793
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/ogroups/class_ogroupManagement.inc:495
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
-msgid "Actions"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
-msgid "This table displays faxblocklists for the selected tree."
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
-msgid "send"
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
-msgid "receive"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
-msgid "You have no permissions to create a blocklist on this 'Base'."
+#: 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:47
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
-#: plugins/admin/departments/class_departmentGeneric.inc:199
-msgid "Required field 'Name' is not set."
+#: plugins/gofax/blocklists/generic.tpl:39
+msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
-msgid "Required field 'Name' contains invalid characters"
+#: plugins/gofax/blocklists/generic.tpl:48
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
-msgid "Specified name is already used."
+#: plugins/gofax/blocklists/generic.tpl:61
+msgid "Blocked numbers"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
-msgid "No permission to create a blocklist on this base."
+#: plugins/gofax/blocklists/generic.tpl:77
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: 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
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
-#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
-#: ihtml/themes/lhs/islocked.tpl:6
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/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:49 html/index.php:331 html/index.php:337
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 msgid "Warning"
 msgstr ""
 
 msgid "Warning"
 msgstr ""
 
@@ -3438,45 +3843,11 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 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 ""
 
 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 ""
 #: plugins/gofax/faxaccount/generic.tpl:12
 msgid "Fax number for GOfax to trigger on"
 msgstr ""
@@ -3613,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/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 ""
 
 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 ""
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr ""
@@ -3640,6 +4015,10 @@ msgid ""
 "correct your choice."
 msgstr ""
 
 "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 ""
 #: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr ""
@@ -3655,8 +4034,8 @@ msgstr ""
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/systems/class_printGeneric.inc:758
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
 msgid "User"
 msgstr ""
 
 msgid "User"
 msgstr ""
 
@@ -3693,6 +4072,41 @@ msgstr ""
 msgid "# pages"
 msgstr ""
 
 msgid "# pages"
 msgstr ""
 
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr ""
+
+#: 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:109
+#: plugins/addons/logview/class_logview.inc:66
+#: 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:120
+#: plugins/gofax/faxreports/class_faxreport.inc:125
+msgid "Can't select fax database for report generation!"
+msgstr ""
+
+#: 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:157
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+
+#: 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 ""
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3734,13 +4148,13 @@ msgstr ""
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
-#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
 msgid "Search"
 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 ""
 
 msgid "Date"
 msgstr ""
 
@@ -3759,62 +4173,81 @@ msgstr ""
 msgid "Search returned no results..."
 msgstr ""
 
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
+#: plugins/gofax/faxreports/main.inc:18
+msgid "FAX reports"
 msgstr ""
 
 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
-msgid "Can't connect to fax database, no reports can be shown!"
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
 msgstr ""
 
 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
-msgid "Can't select fax database for report generation!"
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
+#: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofax/faxreports/main.inc:5
-msgid "FAX reports"
+#: 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
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: 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/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
-#: plugins/admin/fai/faiVariableEntry.tpl:9
+#: 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/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/glpiAttachmentEdit.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
 #: plugins/admin/systems/glpi_devices.tpl:146
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
 #: plugins/admin/systems/glpi_devices.tpl:146
@@ -3828,6 +4261,8 @@ 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/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/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
@@ -3835,12 +4270,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
-#: plugins/addons/addressbook/address_info.tpl:29
-msgid "Private"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr ""
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr ""
@@ -3857,7 +4286,7 @@ msgid "Add entry"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:50
 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 ""
 
 msgid "Edit entry"
 msgstr ""
 
@@ -3897,73 +4326,19 @@ msgstr ""
 msgid "Search string"
 msgstr ""
 
 msgid "Search string"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
+#: plugins/addons/addressbook/remove.tpl:6
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
+#: plugins/addons/addressbook/main.inc:37
+msgid "Address book"
 msgstr ""
 
 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: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/remove.tpl:6
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-
-#: plugins/addons/addressbook/main.inc:23
-msgid "Address book"
-msgstr ""
-
-#: plugins/addons/addressbook/class_addressbook.inc:6
-msgid "Addressbook"
+#: plugins/addons/addressbook/class_addressbook.inc:6
+msgid "Addressbook"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:153
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:153
@@ -3977,12 +4352,16 @@ msgid ""
 "perform direct dials."
 msgstr ""
 
 "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 ""
 
 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 ""
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr ""
@@ -4015,8 +4394,8 @@ msgid "Creating new entry in"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:513
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/mailqueue/class_mailqueue.inc:286
-#: plugins/addons/mailqueue/class_mailqueue.inc:351
+#: 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"
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
 msgid "All"
@@ -4045,18 +4424,119 @@ msgstr ""
 msgid "User ID"
 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 ""
 
 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 ""
 
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
-#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/addressbook/class_addressbook.inc:650
+msgid "Saving addressbook entry failed"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+msgid "DFS Managment"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+msgid "Removing DFS share failed"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+msgid "Go up one dfsshare"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
+msgstr ""
+
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+msgid "Create new dfsshare"
+msgstr ""
+
+#: 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/class_mailqueue.inc:6
+#: plugins/addons/mailqueue/main.inc:38
 msgid "Mail queue"
 msgstr ""
 
 msgid "Mail queue"
 msgstr ""
 
@@ -4066,45 +4546,56 @@ msgid ""
 msgstr ""
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
 msgstr ""
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
-#: plugins/addons/mailqueue/class_mailqueue.inc:93
 #: plugins/addons/mailqueue/class_mailqueue.inc:112
 #: 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:121
-#: plugins/addons/mailqueue/class_mailqueue.inc:176
-#: plugins/addons/mailqueue/class_mailqueue.inc:203
+#: 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 ""
 
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:256
+#: 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 ""
 
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:258
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
 msgid "down"
 msgstr ""
 
 msgid "down"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
 msgid "no limit"
 msgstr ""
 
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:306
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
 msgid "hours"
 msgstr ""
 
 msgid "hours"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:352
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "Hold"
 msgstr ""
 
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:353
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Un hold"
 msgstr ""
 
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:354
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 #: plugins/addons/mailqueue/contents.tpl:76
 msgid "Active"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
 msgid "Active"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:355
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr ""
 
 msgid "Not active"
 msgstr ""
 
@@ -4321,14 +4812,18 @@ msgid "Import LDIF File"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 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 ""
 
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:33
-msgid "Overwrite existing entry"
+#: plugins/addons/ldapmanager/contentimport.tpl:34
+msgid "Remove existing entries first"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
+#: plugins/addons/ldapmanager/contentimport.tpl:41
 msgid "Import successful"
 msgstr ""
 
 msgid "Import successful"
 msgstr ""
 
@@ -4406,7 +4901,7 @@ msgid "Click here to save the LDAP Export "
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/main.inc:40
 msgid "LDAP manager"
 msgstr ""
 
 msgid "LDAP manager"
 msgstr ""
 
@@ -4501,128 +4996,112 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
 msgid "Message"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:23
+#: plugins/addons/logview/main.inc:33
 msgid "System log view"
 msgstr ""
 
 msgid "System log view"
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsManagment.inc:16
-#: plugins/addons/godfs/contents.tpl:8
-msgid "DFS Shares"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:141
-msgid "No DFS entries found"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:182
-msgid "Go up one dfsshare"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:183
-msgid "Go to dfs root"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:184
-msgid "Create new dfsshare"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:87
-msgid "You have no premissions to create a dfs share."
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:94
-#: plugins/addons/godfs/class_dfsgeneric.inc:96
-msgid "Dfs share already exists."
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:101
-msgid "Required Field \"Name of dfs Share\" is not set."
+#: 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:265
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+msgid "Download"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:104
-msgid "Required Field \"Description\" is not set."
+#: plugins/admin/fai/class_faiScript.inc:303
+msgid "Removing FAI script base failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:107
-msgid "Required Field \"Fileserver\" is not set."
+#: plugins/admin/fai/class_faiScript.inc:354
+msgid "Creating FAI script base failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:110
-msgid "Required Field \"Share on fileserver\" is not set."
+#: plugins/admin/fai/class_faiScript.inc:424
+msgid "Removing FAI script failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:113
-msgid "Required Field \"Location\" is not set."
+#: plugins/admin/fai/class_faiScript.inc:443
+msgid "Saving FAI script failed"
 msgstr ""
 
 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."
+#: 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:30
+msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/contents.tpl:40
-msgid "Display dfs shares matching"
+#: plugins/admin/fai/class_faiTemplate.inc:325
+msgid "Saving FAI template base failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/contents.tpl:44
-msgid "Regular expression for matching dfs share names"
+#: plugins/admin/fai/class_faiTemplate.inc:386
+msgid "Removing FAI template base failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/generic.tpl:4
-msgid "DFS Properties"
+#: plugins/admin/fai/class_faiTemplate.inc:391
+#: plugins/admin/fai/class_faiTemplate.inc:404
+msgid "Saving FAI template failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/generic.tpl:8
-msgid "Name of dfs Share"
+#: plugins/admin/fai/class_faiManagement.inc:32
+msgid "FAI"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/generic.tpl:16
-msgid "Fileserver"
+#: plugins/admin/fai/class_faiManagement.inc:33
+msgid "Fully Automatic Installation - management"
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/generic.tpl:20
-msgid "Share on Fileserver"
+#: plugins/admin/fai/class_faiManagement.inc:153
+#, php-format
+msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/addons/godfs/generic.tpl:30
-msgid "DFS Location"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
-msgid "Distributed Filesystem Administration"
+#: plugins/admin/fai/class_faiManagement.inc:255
+#, php-format
+msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:240
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_faiHookEntry.inc:84
-msgid "Download"
+#: plugins/admin/fai/class_faiManagement.inc:258
+msgid "You are not allowed to delete this release!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
-msgid "Objects"
+#: plugins/admin/fai/class_faiManagement.inc:313
+msgid "Specified branch name is invalid."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
+#: plugins/admin/fai/class_faiManagement.inc:315
+msgid "Specified freeze name is invalid."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
+#: 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 ""
 
 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/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
-#: plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/departments/tabs_department.inc:31
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
+#: 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_faiPackageEntry.inc:35
 msgstr ""
 
 #: plugins/admin/fai/class_faiPackageEntry.inc:35
@@ -4641,191 +5120,42 @@ msgid ""
 "200 entries are shown, to keep the memory usage low."
 msgstr ""
 
 "200 entries are shown, to keep the memory usage low."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:32
-msgid "FAI"
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/applications/release_select.tpl:3
+msgid "Branches"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:33
-msgid "Fully Automatic Installation - management"
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/applications/release_select.tpl:9
+msgid "Current release"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:227
-#, php-format
-msgid "You're about to delete all information about the FAI class at '%s'."
+#: plugins/admin/fai/branch_selector.tpl:21
+msgid "Create new branch"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:233
-#: plugins/admin/fai/class_faiManagement.inc:271
-#: plugins/admin/systems/class_systemManagement.inc:532
-#: plugins/admin/systems/class_systemManagement.inc:603
-msgid "You are not allowed to delete this component!"
+#: plugins/admin/fai/branch_selector.tpl:25
+msgid "Create new locked branch"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:323
-#, php-format
-msgid "You're about to delete a fai branch / freeze  '%s'."
+#: plugins/admin/fai/branch_selector.tpl:30
+msgid "Delete current release"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:326
-msgid "You are not allowed to delete this release!"
+#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
+msgid "Fully Automatic Installation"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:382
-msgid "Specified branch name is invalid."
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
+#: plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
+msgid "Objects"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:384
-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
-msgid "This name is already in use."
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:444
-#: plugins/admin/fai/class_faiManagement.inc:611
-#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
-#: plugins/admin/departments/class_departmentGeneric.inc:333
-#: 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
-#: 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/lhs/setup_introduction.tpl:12
-#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
-#: ihtml/themes/lhs/setup_step3.tpl:18
-msgid "Continue"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:647
-#: plugins/admin/departments/class_departmentManagement.inc:298
-msgid "Go to users home department"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:654
-msgid "New profile"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:654
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "P"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:659
-msgid "New partition table"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:659
-msgid "PT"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:662
-msgid "New scripts"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:662
-msgid "S"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:665
-msgid "New hooks"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:665
-msgid "H"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:668
-msgid "New variables"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:668
-msgid "V"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:671
-msgid "New templates"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:671
-msgid "T"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:674
-msgid "New package list"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:674
-msgid "PK"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:688
-#: plugins/admin/systems/class_systemManagement.inc:788
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:692
-msgid "Name of FAI class"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:693
-msgid "Class type"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:697
-#: plugins/admin/fai/class_faiManagement.inc:798
-#: plugins/admin/fai/class_faiManagement.inc:803
-msgid "Edit class"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:698
-#: plugins/admin/fai/class_faiManagement.inc:805
-msgid "Delete class"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:718
-#: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:335
-msgid "department"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:739
-#: plugins/admin/fai/class_faiManagement.inc:740
-#: plugins/admin/fai/class_faiProfile.inc:297
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
-msgid "Partition table"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:746
-#: plugins/admin/fai/class_faiManagement.inc:747
-msgid "Package list"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:753
-#: plugins/admin/fai/class_faiManagement.inc:754
-msgid "Scripts"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:774
-#: plugins/admin/fai/class_faiManagement.inc:775
-msgid "Profile"
-msgstr ""
-
-#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
-msgid "Fully Automatic Installation"
-msgstr ""
-
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr ""
-
-#: plugins/admin/fai/faiPartitionTable.tpl:34
-msgid "Discs"
+#: plugins/admin/fai/faiPartitionTable.tpl:34
+msgid "Discs"
 msgstr ""
 
 #: plugins/admin/fai/faiPartitionTable.tpl:40
 msgstr ""
 
 #: plugins/admin/fai/faiPartitionTable.tpl:40
@@ -4868,31 +5198,68 @@ msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 
 #: 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/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/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/servRepository.tpl:50
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-msgid "Device"
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-msgid "Partition entries"
+#: plugins/admin/fai/class_faiSummaryTab.inc:39
+msgid "Scripts"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-msgid "Add partition"
+#: 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
 msgstr ""
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
@@ -4905,24 +5272,32 @@ msgstr ""
 msgid "Selected file is empty."
 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 ""
 
 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 ""
 
 msgid "Please enter a script."
 msgstr ""
 
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
+#: 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/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
@@ -4942,31 +5317,54 @@ msgid "Import script"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPackage.inc:340
 msgstr ""
 
 #: 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 ""
 
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:344
+#: plugins/admin/fai/class_faiPackage.inc:373
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:365
+#: plugins/admin/fai/class_faiPackage.inc:394
 msgid "package is configured"
 msgstr ""
 
 msgid "package is configured"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:389
+#: 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 ""
 
 #, 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/class_servRepository.inc:242
-#: plugins/admin/systems/servRepositorySetup.tpl:8
+#: 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
 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 ""
 
 msgid "Section"
 msgstr ""
 
@@ -4982,10 +5380,31 @@ msgstr ""
 msgid "Choosen packages"
 msgstr ""
 
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:596
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
 msgid "Configure"
 msgstr ""
 
 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."
 #: 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."
@@ -5020,57 +5439,39 @@ msgid "Remove class from profile"
 msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:304
 msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/systems/class_servDNSeditZone.inc:277
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
 msgid "Down"
 msgstr ""
 
 #: 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 ""
 
 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 ""
 
 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 ""
 
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
-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."
+#: plugins/admin/fai/class_faiProfile.inc:429
+msgid "Saving FAI profile failed"
 msgstr ""
 
 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/faiProfile.tpl:32
+msgid "FAI classes"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "FS type"
 msgstr ""
 
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 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"
 msgstr ""
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
 msgid "FS option"
 msgstr ""
@@ -5079,56 +5480,64 @@ msgstr ""
 msgid "Preserve"
 msgstr ""
 
 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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."
 msgstr ""
 
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
-msgid "List of scripts"
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+msgid "Device"
+msgstr ""
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+msgid "Partition entries"
+msgstr ""
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+msgid "Add partition"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:42
-msgid "Choose a script to delete or edit"
+#: plugins/admin/fai/faiScript.tpl:34
+msgid "List of scripts"
 msgstr ""
 
 #: plugins/admin/fai/faiPackageNew.tpl:1
 msgstr ""
 
 #: plugins/admin/fai/faiPackageNew.tpl:1
@@ -5159,20 +5568,21 @@ msgid ""
 "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 
 "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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Please specify a value for the attribute 'content'."
 msgstr ""
 
@@ -5191,7 +5601,7 @@ msgid "Please enter a name for the branch"
 msgstr ""
 
 #: plugins/admin/fai/faiNewBranch.tpl:33
 msgstr ""
 
 #: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_move.tpl:1
+#: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr ""
 
 msgid "Processing the requested operation"
 msgstr ""
 
@@ -5203,7 +5613,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/fai/faiNewBranch.tpl:40
 msgstr ""
 
 #: plugins/admin/fai/faiNewBranch.tpl:40
-#: plugins/admin/departments/recursive_move.tpl:7
+#: plugins/admin/departments/dep_iframe.tpl:8
 msgid ""
 "Your browser doesn't support iframes, please use this link to perform the "
 "requested operation."
 msgid ""
 "Your browser doesn't support iframes, please use this link to perform the "
 "requested operation."
@@ -5229,10 +5639,6 @@ msgstr ""
 msgid "List of template files"
 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 ""
 #: plugins/admin/fai/faiPackageEntry.tpl:6
 msgid "List of available packages"
 msgstr ""
@@ -5243,89 +5649,203 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:6
+#: plugins/admin/fai/class_divListFai.inc:43
 msgid "List of FAI classes"
 msgstr ""
 
 msgid "List of FAI classes"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI classes."
+#: plugins/admin/fai/class_divListFai.inc:44
+msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:30
-msgid "Branches"
+#: plugins/admin/fai/class_divListFai.inc:48
+msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:35
-#: plugins/admin/applications/headpage.tpl:36
-msgid "Current release"
+#: plugins/admin/fai/class_divListFai.inc:64
+msgid "Name of FAI class"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch"
+#: plugins/admin/fai/class_divListFai.inc:65
+msgid "Class type"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:51
-msgid "Create new locked branch"
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Display FAI profile objects"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:56
-msgid "Delete current release"
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Show profiles"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:71
-msgid "Show profiles"
+#: plugins/admin/fai/class_divListFai.inc:69
+msgid "Display FAI template objects"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:72 plugins/admin/users/headpage.tpl:38
+#: plugins/admin/fai/class_divListFai.inc:69
+#: plugins/admin/users/class_divListUsers.inc:60
 msgid "Show templates"
 msgstr ""
 
 msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:73
+#: plugins/admin/fai/class_divListFai.inc:70
+msgid "Display FAI scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:70
 msgid "Show scripts"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Show variables"
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:76
-msgid "Show packages"
+#: plugins/admin/fai/class_divListFai.inc:73
+msgid "Display FAI packages"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:77
-msgid "Show partitions"
+#: plugins/admin/fai/class_divListFai.inc:73
+msgid "Show packages"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-msgid "Hook attributes"
+#: plugins/admin/fai/class_divListFai.inc:74
+msgid "Display FAI partitions"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
+#: plugins/admin/fai/class_divListFai.inc:74
+msgid "Show partitions"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:36
-msgid "Choose an existing FAI task"
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/departments/class_divListDepartment.inc:79
+msgid "Go to users home department"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:263
-#: plugins/admin/fai/class_faiPartitionTable.inc:269
-#, php-format
-msgid "%s partition"
+#: plugins/admin/fai/class_divListFai.inc:131
+msgid "New profile"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:265
-#: plugins/admin/fai/class_faiPartitionTable.inc:271
+#: 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:271
+#: plugins/admin/fai/class_faiPartitionTable.inc:277
 #, php-format
 msgid "%s partition(s)"
 msgstr ""
 
 #, 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 ""
 
 msgid "Please enter a value for script."
 msgstr ""
 
@@ -5338,48 +5858,73 @@ msgstr ""
 msgid "Class name"
 msgstr ""
 
 msgid "Class name"
 msgstr ""
 
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+msgid "Hook attributes"
+msgstr ""
+
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr ""
+
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose an existing FAI task"
+msgstr ""
+
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr ""
 
 #: 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -5412,12 +5957,11 @@ msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #: plugins/admin/systems/glpiDeviceManagement.tpl:51
 
 #: 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/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
-#: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/glpiAttachmentPool.tpl:51
 msgid "Use"
 msgstr ""
 
 msgid "Use"
 msgstr ""
 
@@ -5432,39 +5976,47 @@ msgid ""
 "to get your data back."
 msgstr ""
 
 "to get your data back."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:81
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:21
 msgid "Template attributes"
 msgstr ""
@@ -5479,9 +6031,9 @@ msgid "Save template"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
-#: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/applications/generic.tpl:102
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 msgid "Upload"
 msgstr ""
 
 msgid "Upload"
 msgstr ""
 
@@ -5490,15 +6042,15 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 msgid "Owner"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:672
-#: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
+#: 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 ""
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
@@ -5508,7 +6060,7 @@ msgid "Access"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:167
 msgid "Class"
 msgstr ""
 
 msgid "Class"
 msgstr ""
 
@@ -5522,9 +6074,11 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
 
 #: 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 ""
 
 msgid "Execute"
 msgstr ""
 
@@ -5552,321 +6106,303 @@ msgstr ""
 msgid "List of hook scripts"
 msgstr ""
 
 msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:42
-msgid "Choose a hook to delete or edit"
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:63
+msgid "IMAP shared folders"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:67
+msgid "Default permission"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:76
+msgid "Member permission"
+msgstr ""
+
+#: 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 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
+msgstr ""
+
+#: 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:251
+#: plugins/admin/groups/class_groupManagement.inc:282
+msgid "You are not allowed to delete this group!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
+#: plugins/admin/groups/class_groupGeneric.inc:123
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:179
+#: plugins/admin/groups/class_groupGeneric.inc:177
 msgid "This 'dn' is no group."
 msgstr ""
 
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Samba group"
 msgstr ""
 
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain admins"
 msgstr ""
 
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain users"
 msgstr ""
 
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:330
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain guests"
 msgstr ""
 
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:335
+#: plugins/admin/groups/class_groupGeneric.inc:323
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:445
+#: 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 ""
 
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:462
-msgid "! unknown id"
+#: plugins/admin/groups/class_groupGeneric.inc:496
+msgid "Removing group failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:598
+#: plugins/admin/groups/class_groupGeneric.inc:603
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:603
+#: plugins/admin/groups/class_groupGeneric.inc:608
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: 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 ""
 
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:726
+#: plugins/admin/groups/class_groupGeneric.inc:732
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
+#: 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 ""
 
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr ""
-
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
-msgstr ""
-
-#: plugins/admin/groups/mail.tpl:63
-msgid "IMAP shared folders"
-msgstr ""
-
-#: plugins/admin/groups/mail.tpl:67
-msgid "Default permission"
-msgstr ""
-
-#: plugins/admin/groups/mail.tpl:76
-msgid "Member permission"
-msgstr ""
-
-#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
-msgid "Forward messages to non group members"
-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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:357
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/groups/class_groupManagement.inc:389
-msgid "You are not allowed to delete this group!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:462
-#: plugins/admin/ogroups/class_ogroupManagement.inc:431
-msgid "Paste"
+#: plugins/admin/groups/class_divListGroup.inc:112
+msgid "Create new group"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:443
-#: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:433
-msgid "Can't paste"
+#: plugins/admin/groups/class_divListGroup.inc:146
+#: plugins/admin/users/class_divListUsers.inc:167
+msgid "Posix"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:456
-msgid "Create new group"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:466
-#: plugins/admin/users/class_userManagement.inc:796
-#: plugins/admin/applications/class_applicationManagement.inc:488
-#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+#: 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 ""
 
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:466
-#: plugins/admin/users/class_userManagement.inc:796
-#: plugins/admin/applications/class_applicationManagement.inc:488
-#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+#: 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 ""
 
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/applications/class_applicationManagement.inc:490
-#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+#: 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 ""
 
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/applications/class_applicationManagement.inc:490
-#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+#: 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 ""
 
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:470
-#: plugins/admin/groups/class_groupManagement.inc:475
-#: plugins/admin/applications/class_applicationManagement.inc:492
-#: plugins/admin/applications/class_applicationManagement.inc:498
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:465
-#: plugins/admin/ogroups/class_ogroupManagement.inc:470
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: 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 ""
 
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:472
-#: plugins/admin/groups/class_groupManagement.inc:477
-#: plugins/admin/applications/class_applicationManagement.inc:494
-#: plugins/admin/applications/class_applicationManagement.inc:500
-#: plugins/admin/departments/class_departmentManagement.inc:312
-#: plugins/admin/ogroups/class_ogroupManagement.inc:467
-#: plugins/admin/ogroups/class_ogroupManagement.inc:472
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+#: 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 ""
 
 msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:500
-#: plugins/admin/users/class_userManagement.inc:857
-msgid "Posix"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:509
-#: plugins/admin/applications/class_applicationManagement.inc:512
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:524
-msgid "Groupname"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:529
-#: plugins/admin/applications/class_applicationManagement.inc:526
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
-msgid "This table displays all groups, in the selected tree."
-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/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/application_options.tpl:1
-msgid "Application options"
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
+msgid "Group administration"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:278
+#: plugins/admin/groups/class_groupMail.inc:284
 msgid "read"
 msgstr ""
 
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:279
+#: plugins/admin/groups/class_groupMail.inc:285
 msgid "post"
 msgstr ""
 
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:280
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "external post"
 msgstr ""
 
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:281
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "append"
 msgstr ""
 
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:282
+#: plugins/admin/groups/class_groupMail.inc:288
 msgid "write"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:801
+#: 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 ""
 
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:834
+#: plugins/admin/groups/class_groupMail.inc:839
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:838
+#: plugins/admin/groups/class_groupMail.inc:843
 msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
 msgid "Please select a valid mail server."
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:314
-#: include/class_ldap.inc:412
+#: plugins/admin/departments/class_departmentGeneric.inc:484
+#: include/class_ldap.inc:455 ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Object"
 msgstr ""
 
 msgid "Object"
 msgstr ""
 
@@ -5879,15 +6415,23 @@ msgstr ""
 msgid "Apply this acl only for users own entries"
 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 ""
 
 msgid "Used applications"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:7
+#: plugins/admin/groups/application.tpl:19
 msgid "Add category"
 msgstr ""
 
 msgid "Add category"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:12
+#: plugins/admin/groups/application.tpl:24
 msgid "Available applications"
 msgstr ""
 
 msgid "Available applications"
 msgstr ""
 
@@ -5896,7 +6440,7 @@ msgid "Select users to add"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:30
 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 ""
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
@@ -5910,82 +6454,93 @@ msgid "Display users of department"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:47
 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/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 ""
 
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
-#: plugins/admin/ogroups/class_ogroup.inc:736
+#: 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/ogroups/generic.tpl:7
 msgid "Group name"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
+#: plugins/admin/groups/paste_generic.tpl:8 plugins/admin/groups/generic.tpl:9
 msgid "Posix name of the group"
 msgstr ""
 
 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"
-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:37
 #: plugins/admin/groups/paste_generic.tpl:13
 #: plugins/admin/groups/paste_generic.tpl:13
+#: plugins/admin/groups/generic.tpl:41
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:37
 #: plugins/admin/groups/paste_generic.tpl:15
 #: plugins/admin/groups/paste_generic.tpl:15
+#: plugins/admin/groups/generic.tpl:41
 msgid "Force GID"
 msgstr ""
 
 msgid "Force GID"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/paste_generic.tpl:18
 #: plugins/admin/groups/paste_generic.tpl:18
+#: plugins/admin/groups/generic.tpl:43
 msgid "Forced ID number"
 msgstr ""
 
 msgid "Forced ID number"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:46
-msgid "Select to create a samba conform group"
+#: plugins/admin/groups/class_groupAcl.inc:59
+msgid "This 'dn' is no acl container."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:51
-msgid "in domain"
+#: plugins/admin/groups/class_groupAcl.inc:100
+msgid "Removing ACL information failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:68
-msgid "Members are in a phone pickup group"
+#: plugins/admin/groups/class_groupAcl.inc:196
+msgid "Saving ACL information failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:81
-msgid "Members are in a nagios group"
+#: plugins/admin/groups/class_groupAcl.inc:206
+msgid "All fields are writeable"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:97
-msgid "Group members"
+#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
+msgid "Descriptive text for this group"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+msgid "Choose subtree to place group in"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/groups/mail_admins.tpl:24
+#: plugins/admin/groups/generic.tpl:50
+msgid "Select to create a samba conform group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:55
+msgid "in domain"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:72
+msgid "Members are in a phone pickup group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:85
+msgid "Members are in a nagios group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl:101
+msgid "Group members"
+msgstr ""
+
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr ""
+
+#: plugins/admin/groups/mail_admins.tpl:24
 msgid "Select a specific department"
 msgstr ""
 
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
 msgstr ""
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgstr ""
 
 #: plugins/admin/groups/mail_locals.tpl:32
@@ -5996,69 +6551,106 @@ msgstr ""
 msgid "Display addresses matching"
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:592
+#: plugins/admin/groups/class_groupApplication.inc:709
 msgid "Insert seperator"
 msgstr ""
 
 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 "
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6066,6 +6658,40 @@ msgid ""
 "able to login without it."
 msgstr ""
 
 "able to login without it."
 msgstr ""
 
+#: 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: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:312
+#, php-format
+msgid "You're about to delete the user %s."
+msgstr ""
+
+#: 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: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:531
+msgid "A person with the choosen name is already used in this tree."
+msgstr ""
+
 #: plugins/admin/users/template.tpl:2
 msgid "Creating a new user using templates"
 msgstr ""
 #: plugins/admin/users/template.tpl:2
 msgid "Creating a new user using templates"
 msgstr ""
@@ -6077,200 +6703,229 @@ msgid ""
 "templates."
 msgstr ""
 
 "templates."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:1181
-#: plugins/admin/systems/class_systemManagement.inc:918
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Template"
 msgstr ""
 
 msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+#: 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/main.inc:41 plugins/admin/users/main.inc:47
 msgid "User administration"
 msgstr ""
 
 msgid "User administration"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
-msgid "Users"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:334
-#: plugins/admin/users/class_userManagement.inc:404
-msgid "You are not allowed to set this users password!"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:440
-#, php-format
-msgid "You're about to delete the user %s."
+#: plugins/admin/users/class_divListUsers.inc:56
+#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+msgid "Username"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:446
-#: plugins/admin/users/class_userManagement.inc:474
-msgid "You are not allowed to delete this user!"
+#: plugins/admin/users/class_divListUsers.inc:60
+msgid "Select to see template pseudo users"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:575
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:277
-msgid "none"
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Select to see users that have only a GOsa object"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:646
-msgid "A person with the choosen name is already used in this tree."
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Show functional users"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:783
-msgid "Create new user"
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Select to see users that have posix settings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:783
-msgid "New user"
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Show unix users"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:784
-msgid "Create new template"
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Select to see users that have mail settings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:784
-msgid "New template"
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Show mail users"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
-msgid "password"
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Select to see users that have samba settings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:819
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
-#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
-#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
-msgid "Username"
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Show samba users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Select to see users that have proxy settings"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Show proxy users"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:116
+msgid "Create new user"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:116
+msgid "New user"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:118
+msgid "Create new template"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:824
-msgid "This table displays all users, in the selected tree."
+#: plugins/admin/users/class_divListUsers.inc:118
+msgid "New template"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_divListUsers.inc:165
 msgid "GOsa"
 msgstr ""
 
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_divListUsers.inc:166
 msgid "Edit generic properties"
 msgstr ""
 
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_divListUsers.inc:168
 msgid "Edit UNIX properties"
 msgstr ""
 
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/users/class_divListUsers.inc:170
 msgid "Edit environment properties"
 msgstr ""
 
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/admin/users/class_divListUsers.inc:172
 msgid "Edit mail properties"
 msgstr ""
 
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_divListUsers.inc:174
 msgid "Edit phone properties"
 msgstr ""
 
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Edit fax properies"
 msgstr ""
 
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_divListUsers.inc:178
 msgid "Edit samba properties"
 msgstr ""
 
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_divListUsers.inc:180
+msgid "Edit netatalk properties"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:181
 msgid "Create user from template"
 msgstr ""
 
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_divListUsers.inc:182
 msgid "Create user with this template"
 msgstr ""
 
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:929
+#: plugins/admin/users/class_divListUsers.inc:229
+msgid "password"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:251
 msgid "Online"
 msgstr ""
 
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:936
+#: plugins/admin/users/class_divListUsers.inc:258
 msgid "Offline"
 msgstr ""
 
 msgid "Offline"
 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/applications/class_divListApplication.inc:31
+msgid "List of Applications"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-#: plugins/admin/systems/glpiSelectUser.tpl:6
-msgid "List of users"
+#: plugins/admin/applications/class_divListApplication.inc:32
+msgid "This table displays all applications in the selected tree."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/applications/class_divListApplication.inc:36
 msgid ""
 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."
+"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 ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
+msgid "new"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
+#: plugins/admin/applications/class_divListApplication.inc:115
+msgid "Create new application"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
+#: plugins/admin/applications/class_applicationParameters.inc:128
+msgid "Removing application parameters failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:521
-#: plugins/admin/applications/class_applicationGeneric.inc:379
-msgid "Application name"
+#: plugins/admin/applications/class_applicationParameters.inc:159
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:190
+msgid "Saving applications parameters failed"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:11
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:11
@@ -6279,7 +6934,7 @@ msgid "Display name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:13
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:451
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
@@ -6291,168 +6946,156 @@ msgstr ""
 msgid "Choose subtree to place application in"
 msgstr ""
 
 msgid "Choose subtree to place application in"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:48
+#: plugins/admin/applications/generic.tpl:55
 msgid "Icon"
 msgstr ""
 
 msgid "Icon"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
 msgid "Update"
 msgstr ""
 
 msgid "Update"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
 msgid "Reload picture from LDAP"
 msgstr ""
 
 msgid "Reload picture from LDAP"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:77
 msgid "Only executable for members"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Place entry in members launch bar"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
+#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+msgid ""
+"This may be used by several groups. Please double check if your really want "
+"to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
+#: plugins/admin/applications/main.inc:39
+#: plugins/admin/applications/main.inc:41
+msgid "Application management"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
+#: plugins/admin/applications/class_applicationGeneric.inc:96
+msgid "no example"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
+#: plugins/admin/applications/class_applicationGeneric.inc:116
+msgid "This 'dn' is no application."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
+#: plugins/admin/applications/class_applicationGeneric.inc:199
+msgid "Removing application failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
+#: plugins/admin/applications/class_applicationGeneric.inc:211
+#, php-format
+msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:158
+#: plugins/admin/applications/class_applicationGeneric.inc:218
 #, php-format
 #, php-format
-msgid "Value '%s' specified as option name is not valid."
+msgid "Removing application from group '%s' failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
-msgid ""
-"This may be used by several groups. Please double check if your really want "
-"to do this since there is no way for GOsa to get your data back."
+#: plugins/admin/applications/class_applicationGeneric.inc:260
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/applications/class_applicationGeneric.inc:336
+msgid "Specified execute path must start with '/'."
 msgstr ""
 
 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:350
+msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:56
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationGeneric.inc:355
+msgid "Required field 'Name' is not filled."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:59
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationGeneric.inc:359
+msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
+#: plugins/admin/applications/class_applicationGeneric.inc:363
+msgid "Required field 'Execute' is not filled."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:376
-#, php-format
-msgid "You're about to delete the application '%s'."
+#: plugins/admin/applications/class_applicationGeneric.inc:378
+#: plugins/admin/applications/class_applicationGeneric.inc:386
+msgid "There's already an application with this 'Name'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:382
-#: plugins/admin/applications/class_applicationManagement.inc:408
-msgid "You are not allowed to delete this application!"
+#: plugins/admin/applications/class_applicationGeneric.inc:417
+msgid "Saving application failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/ogroups/class_ogroupManagement.inc:449
-msgid "new"
+#: plugins/admin/applications/class_applicationGeneric.inc:442
+msgid "Application settings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:477
-msgid "Create new application"
+#: plugins/admin/applications/class_applicationManagement.inc:289
+#, php-format
+msgid "You're about to delete the application '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:87
-msgid "no example"
+#: plugins/admin/applications/class_applicationManagement.inc:295
+#: plugins/admin/applications/class_applicationManagement.inc:324
+msgid "You are not allowed to delete this application!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:107
-msgid "This 'dn' is no application."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:216
-msgid "The specified picture has not been uploaded correctly."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:298
-msgid "You have no permissions to create a application on this 'Base'."
+#: plugins/admin/departments/class_divListDepartment.inc:47
+msgid "Department name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:303
-msgid "Required field 'Name' is not filled."
+#: plugins/admin/departments/class_divListDepartment.inc:91
+msgid "Create new department"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:307
-msgid "Invalid character in application name. Only a-z 0-9 are allowed."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:311
-msgid "Required field 'Execute' is not filled."
+#: plugins/admin/departments/generic.tpl:8
+msgid "Name of department"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:320
-msgid "There's already an application with this 'Name'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "Application settings"
-msgstr ""
-
-#: plugins/admin/departments/generic.tpl:8
-msgid "Name of department"
-msgstr ""
-
-#: plugins/admin/departments/generic.tpl:9
-msgid "Name of subtree to create"
+#: plugins/admin/departments/generic.tpl:9
+msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:14
 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 ""
 
 msgid "Descriptive text for department"
 msgstr ""
 
@@ -6465,30 +7108,38 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:30
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
 msgid ""
@@ -6497,10 +7148,6 @@ msgid ""
 "your data back."
 msgstr ""
 
 "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 "
 #: plugins/admin/departments/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
@@ -6516,403 +7163,553 @@ msgstr ""
 msgid "Regular expression for matching department names"
 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 ""
 
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
-msgid "Departments"
+#: plugins/admin/departments/class_departmentGeneric.inc:170
+msgid "Removing department failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:186
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
-#, php-format
-msgid "You're about to delete the whole LDAP subtree placed under '%s'."
+#: plugins/admin/departments/class_departmentGeneric.inc:226
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
-msgid "You have no permission to remove this department."
+#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:235
+msgid "Department with that 'Name' already exists."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:301
-msgid "Create new department"
+#: plugins/admin/departments/class_departmentGeneric.inc:243
+msgid "Required field 'Description' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:309
-msgid "This table displays all departments, in the selected tree."
+#: plugins/admin/departments/class_departmentGeneric.inc:247
+#, php-format
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:318
-msgid "Department name"
+#: plugins/admin/departments/class_departmentGeneric.inc:291
+msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:412
-msgid ".."
+#: plugins/admin/departments/class_departmentGeneric.inc:333
+msgid "Saving department failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-msgid "You have no permissions to create a department on this 'Base'."
+#: plugins/admin/departments/class_departmentGeneric.inc:371
+#, php-format
+msgid "Tagging '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
+#: plugins/admin/departments/class_departmentGeneric.inc:448
+#, php-format
+msgid "Moving '%s' to '%s'"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
+#: plugins/admin/departments/class_departmentGeneric.inc:487
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
+msgid "Departments"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:278
-#, php-format
-msgid "Moving %s to %s"
+#: plugins/admin/departments/class_departmentManagement.inc:181
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
+msgid "You have no permission to remove this department."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:317
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
+#: plugins/admin/departments/class_departmentManagement.inc:345
+msgid ".."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/departments/recursive_move.tpl:2
+#: plugins/admin/systems/glpiSelectUser.tpl:23
 msgid ""
 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."
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:200
-msgid "present"
+#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:68
-#: plugins/admin/systems/class_workstationService.inc:151
-#: plugins/admin/systems/class_workstationStartup.inc:372
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_terminalGeneric.inc:153
-msgid "This 'dn' has no terminal features."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:75
-msgid "There is no php snmp module installed, can't gather any informations."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:81
-#: plugins/admin/systems/class_terminalInfo.inc:175
-msgid "unknown status"
+#: plugins/admin/systems/class_terminalService.inc:155
+msgid "default"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:90
-msgid "This is a virtual terminal which has no properties to show here."
+#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
+msgid "show chooser"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:108
-msgid "online"
+#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
+msgid "direct"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:164
-msgid "running"
+#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
+msgid "load balanced"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:167
-msgid "not running"
+#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
+msgid "Windows RDP"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:192
-msgid "offline"
+#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
+msgid "ICA client"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network\tsettings"
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_workstationService.inc:204
+msgid "Bit"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:9
-msgid "IP-address"
+#: plugins/admin/systems/class_terminalService.inc:252
+#: plugins/admin/systems/class_terminalInfo.inc:67
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:13
-msgid "MAC-address"
+#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_workstationService.inc:291
+msgid "Choose the phone located at the current terminal"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:29
-msgid "Enable DNS for this device"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:30
-#: plugins/admin/systems/servdnseditzone.tpl:63
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:34
-msgid "Zone"
+#: plugins/admin/systems/class_terminalService.inc:416
+msgid "Saving terminal service information failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/servdnseditzone.tpl:81
-#: plugins/admin/systems/class_servDNS.inc:298
-msgid "TTL"
+#: plugins/admin/systems/goKrbServer.tpl:1 plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:47
-msgid "Dns records"
+#: plugins/admin/systems/goKrbServer.tpl:4 plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-msgid "Model"
+#: plugins/admin/systems/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:199
+msgid "present"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
+#: plugins/admin/systems/class_terminalInfo.inc:74
+msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
+#: plugins/admin/systems/class_terminalInfo.inc:80
+#: plugins/admin/systems/class_terminalInfo.inc:174
+msgid "unknown status"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
+#: plugins/admin/systems/class_terminalInfo.inc:89
+msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
+#: plugins/admin/systems/class_terminalInfo.inc:107
+msgid "online"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
+#: plugins/admin/systems/class_terminalInfo.inc:163
+msgid "running"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
+#: plugins/admin/systems/class_terminalInfo.inc:166
+msgid "not running"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
+#: plugins/admin/systems/class_terminalInfo.inc:191
+msgid "offline"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
+#: plugins/admin/systems/class_goLdapServer.inc:27
+#: plugins/admin/systems/goLdapServer.tpl:1
+msgid "LDAP service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
+#: plugins/admin/systems/class_goLdapServer.inc:47
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:23
-msgid "Telephone hardware"
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:25
-msgid "Telephone"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
+#: plugins/admin/systems/ServiceAddDialog.tpl:3
+msgid "Adding a new service to the current server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-msgid "Driver"
+#: 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 ""
 
 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"
+#: plugins/admin/systems/ServiceAddDialog.tpl:13
+msgid "Service to add"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
+#: plugins/admin/systems/ServiceAddDialog.tpl:20
+msgid "All available services are already in use."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/ogroups/class_termgroup.inc:38
+msgid "Activated"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
+#: plugins/admin/systems/class_servGeneric.inc:67
+msgid "This 'dn' has no server features."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
+#: 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 "Execution of '%s' failed!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
+#: plugins/admin/systems/class_servGeneric.inc:188
+msgid "Removing server failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
+#: plugins/admin/systems/class_servGeneric.inc:224
+msgid "The required field 'Server name' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
+#: plugins/admin/systems/class_servGeneric.inc:231
+msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
+#: plugins/admin/systems/class_servGeneric.inc:300
+msgid "Saving server failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
+#: plugins/admin/systems/network.tpl:1
+msgid "Network\tsettings"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
+#: plugins/admin/systems/network.tpl:9
+msgid "IP-address"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
-msgstr ""
+#: plugins/admin/systems/network.tpl:13
+msgid "MAC-address"
+msgstr ""
 
 
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
+#: plugins/admin/systems/network.tpl:19
+msgid "Autodetect"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
+#: plugins/admin/systems/network.tpl:41
+msgid "Enable DNS for this device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:64
-msgid "Floppy device"
+#: plugins/admin/systems/network.tpl:50
+msgid "Zone"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:68
-msgid "CDROM device"
+#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/servdnseditzone.tpl:85
+msgid "TTL"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:77
-msgid "Audio device"
+#: plugins/admin/systems/network.tpl:63
+msgid "Dns records"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:93
-msgid "Up since"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:96
-msgid "CPU load"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:99
-msgid "Memory usage"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:102
-msgid "Swap usage"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:116
-msgid "SSH service"
+#: plugins/admin/systems/class_servDNS.inc:32
+msgid "Domain name system service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:119
-msgid "Print service"
+#: plugins/admin/systems/class_servDNS.inc:73
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:122
-msgid "Scan service"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:125
-msgid "Sound service"
+#: plugins/admin/systems/class_servDNS.inc:76
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
+#: 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_servDNS.inc:165
+msgid "Reverse zone"
+msgstr ""
+
+#: 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
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:9
@@ -6956,7 +7753,6 @@ msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:63
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
 #: plugins/admin/systems/glpi_devices.tpl:208
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
 #: plugins/admin/systems/glpi_devices.tpl:208
@@ -6969,6 +7765,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:622
 #: plugins/admin/systems/glpi_devices.tpl:676
 #: plugins/admin/systems/glpi_devices.tpl:722
 #: 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/glpiPrinterCartridgesEdit.tpl:25
 msgid "Comment"
 msgstr ""
@@ -6993,450 +7790,405 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
 msgid "Attachments"
 msgstr ""
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-msgid "Supported interfaces"
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-msgid "Manage System-types"
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
 msgstr ""
 
 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"
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
 msgstr ""
 
 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"
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-msgid "Select"
+#: plugins/admin/systems/info.tpl:64
+msgid "Floppy device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:89
-#: plugins/admin/systems/class_terminalService.inc:102
-msgid "default"
+#: plugins/admin/systems/info.tpl:68
+msgid "CDROM device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:90
-#: plugins/admin/systems/class_terminalService.inc:103
-msgid "show chooser"
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:91
-#: plugins/admin/systems/class_terminalService.inc:104
-msgid "direct"
+#: plugins/admin/systems/info.tpl:77
+msgid "Audio device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:94
-#: plugins/admin/systems/class_terminalService.inc:107
-msgid "load balanced"
+#: plugins/admin/systems/info.tpl:93
+msgid "Up since"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_terminalService.inc:110
-msgid "Windows RDP"
+#: plugins/admin/systems/info.tpl:96
+msgid "CPU load"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:98
-#: plugins/admin/systems/class_terminalService.inc:111
-msgid "ICA client"
+#: plugins/admin/systems/info.tpl:99
+msgid "Memory usage"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:201
-#: plugins/admin/systems/class_terminalService.inc:209
-msgid "Choose the phone located at the current terminal"
+#: plugins/admin/systems/info.tpl:102
+msgid "Swap usage"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-msgid "Please specify a valid VSync range."
+#: plugins/admin/systems/info.tpl:116
+msgid "SSH service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-msgid "Please specify a valid HSync range."
+#: plugins/admin/systems/info.tpl:119
+#: plugins/admin/systems/class_goCupsServer.inc:26
+#: plugins/admin/systems/class_goCupsServer.inc:46
+msgid "Print service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:313
-msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
+#: plugins/admin/systems/info.tpl:122
+msgid "Scan service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:354
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+#: plugins/admin/systems/info.tpl:125
+msgid "Sound service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:410
-msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:691
-#, php-format
-msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:702
-#, php-format
-msgid ""
-"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
-#, php-format
-msgid "Can't open '%s', ppd settings resetted."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
-#, php-format
-msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-msgid "Can't get ppd informations."
+#: plugins/admin/systems/printer.tpl:39
+msgid "Printer location"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
-#, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
-#, php-format
-msgid "There is already a ppd file for this kind of printer."
+#: plugins/admin/systems/printer.tpl:51
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
-#, php-format
-msgid "Can't save file '%s'."
+#: plugins/admin/systems/printer.tpl:63
+msgid "Permissions"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-msgid "Please specify a valid ppd file."
+#: plugins/admin/systems/printer.tpl:70
+msgid "Users which are allowed to use this printer"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-msgid "Please select a valid ppd."
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+msgid "Add user"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
-msgid "True"
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+msgid "Add group"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
-msgid "False"
+#: plugins/admin/systems/printer.tpl:86
+msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
-#, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
+#: plugins/admin/systems/printer.tpl:87
+msgid "Admins"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/workstation.tpl:79
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
+#: plugins/admin/systems/servdb.tpl:30 plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:43
-msgid "Select action to execute for this server"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_goFonServer.inc:52
+msgid "Asterisk management"
+msgstr ""
 
 
-#: plugins/admin/systems/workstationStartup.tpl:4
-#: plugins/admin/systems/terminalStartup.tpl:1
-msgid "Boot parameters"
+#: plugins/admin/systems/servdb.tpl:46 plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
+#: plugins/admin/systems/servdb.tpl:54
+#: plugins/admin/systems/goFonServer.tpl:12
+msgid "Country dial prefix"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
+#: plugins/admin/systems/servdb.tpl:58
+#: plugins/admin/systems/goFonServer.tpl:16
+msgid "Local dial prefix"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
+#: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/goImapServer.tpl:7
+msgid "Server identifier"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
+#: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/goImapServer.tpl:13
+msgid "Connect URL"
 msgstr ""
 
 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"
+#: plugins/admin/systems/servdb.tpl:91
+#: plugins/admin/systems/goImapServer.tpl:31
+msgid "Sieve port"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:37
-msgid "FAI server"
+#: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/class_goLogDBServer.inc:29
+#: plugins/admin/systems/class_goLogDBServer.inc:49
+msgid "Logging database"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:54
-msgid "Assigned FAI classes"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
+#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/goGlpiServer.tpl:14
+msgid "Database"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
+#: plugins/admin/systems/glpiPrinter.tpl:31
+msgid "Supported interfaces"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+#: 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 ""
 msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
+#: plugins/admin/systems/class_terminalStartup.inc:386
+msgid "Saving terminal startup settings failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+msgid "Manage System-types"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-#: plugins/admin/systems/class_glpiAccount.inc:144
-msgid "There is no server with valid glpi database service."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-#: plugins/admin/systems/class_glpiAccount.inc:154
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-#: plugins/admin/systems/class_glpiAccount.inc:164
-msgid "Can't connect to glpi database, check configuration twice."
+#: plugins/admin/systems/goImapServer.tpl:44
+msgid "Start IMAP service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#: plugins/admin/systems/class_glpiAccount.inc:564
-msgid "Remove inventory"
+#: plugins/admin/systems/goImapServer.tpl:51
+msgid "Start IMAP SSL service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/goImapServer.tpl:58
+msgid "Start POP3 service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-#: plugins/admin/systems/class_glpiAccount.inc:567
-msgid "Add inventory"
+#: plugins/admin/systems/goImapServer.tpl:65
+msgid "Start POP3 SSL service"
 msgstr ""
 
 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/goImapServer.tpl:76
+#: plugins/admin/systems/goMailServer.tpl:149
+msgid "The server must be saved before you can use the status flag."
 msgstr ""
 
 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/goImapServer.tpl:78
+#: plugins/admin/systems/goMailServer.tpl:151
+msgid "The service must be saved before you can use the status flag."
 msgstr ""
 
 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/goImapServer.tpl:81
+#: plugins/admin/systems/goMailServer.tpl:154
+msgid "Set new status"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
+#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/systems/goMailServer.tpl:160
+msgid "Set status"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-msgid "since"
+#: plugins/admin/systems/class_divListSystemService.inc:17
+#: plugins/admin/systems/class_divListSystemService.inc:18
+msgid "Installed services"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
+#: plugins/admin/systems/class_divListSystemService.inc:22
+msgid ""
+"This menu allows you to add, remove and configure the properties of a "
+"specific service."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
+#: plugins/admin/systems/class_divListSystemService.inc:30
+msgid "Service name"
 msgstr ""
 
 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_divListSystemService.inc:51
+msgid "Add service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
-msgid "Select terminal mode"
+#: plugins/admin/systems/class_divListSystemService.inc:51
+msgid "Add new service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:53
-msgid "Root server"
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:55
-msgid "Select NFS root filesystem to use"
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all services"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Swap server"
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#: plugins/admin/systems/class_divListSystemService.inc:106
+msgid "Stop service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:63
-msgid "Choose NFS filesystem to place swap files on"
+#: plugins/admin/systems/class_divListSystemService.inc:56
+msgid "Stop all services"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#: plugins/admin/systems/class_divListSystemService.inc:112
+msgid "Restart service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/class_divListSystemService.inc:58
+msgid "Restart all services"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
-msgid "NTP server"
+#: plugins/admin/systems/class_divListSystemService.inc:86
+msgid "Stopped"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Choose server to use for synchronizing time"
+#: plugins/admin/systems/class_divListSystemService.inc:87
+msgid "Started"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/class_divListSystemService.inc:88
+msgid "Restarting"
 msgstr ""
 
 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_divListSystemService.inc:89
+msgid "User status"
 msgstr ""
 
 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_divListSystemService.inc:100
+msgid "Start service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/class_divListSystemService.inc:118
+msgid "Edit service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, php-format
-msgid "The specified kerberos password is empty."
+#: plugins/admin/systems/class_divListSystemService.inc:124
+msgid "Remove service"
 msgstr ""
 
 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_workstationService.inc:415
+msgid "Saving workstation services failed"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 msgstr ""
 
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
@@ -7455,6 +8207,14 @@ msgstr ""
 msgid "Cartridges"
 msgstr ""
 
 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"
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 msgid "New monitor"
@@ -7465,305 +8225,323 @@ msgstr ""
 msgid "M"
 msgstr ""
 
 msgid "M"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-msgid "Activated"
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Add/Edit monitor"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "Memory test"
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-msgid "System analysis"
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
-msgid "No ACTIONCMD definition found in your gosa.conf"
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: 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/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/glpi_devices.tpl:44
+msgid "Integrated microphone"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-msgid "Instant update"
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-msgid "Scheduled update"
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-msgid "Rescan hardware"
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
+#: plugins/admin/systems/glpi_devices.tpl:97
+msgid "Add/Edit other device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
 msgstr ""
 
 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/glpi_devices.tpl:249
+msgid "Add/Edit controller"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:125
-msgid "Please specify a valid path for your setup."
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:131
-msgid "Please specify a valid name for your setup."
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:134
-msgid "Please specify a name for your setup."
+#: plugins/admin/systems/glpi_devices.tpl:371
+msgid "Add/Edit harddisk"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:139
-msgid "Description contains invalid characters."
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:143
-msgid "Path contains invalid characters."
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:147
-msgid "Option contains invalid characters."
+#: plugins/admin/systems/glpi_devices.tpl:443
+msgid "Add/Edit memory"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
+#: plugins/admin/systems/glpi_devices.tpl:507
+msgid "Add/Edit sound card"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/glpi_devices.tpl:553
+msgid "Add/Edit network interface"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
-msgid "Codepage"
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:59
-msgid "Option"
+#: plugins/admin/systems/glpi_devices.tpl:607
+msgid "Add/Edit processor"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
 msgstr ""
 
 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/glpi_devices.tpl:649
+msgid "Default frequence"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
 msgstr ""
 
 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/glpi_devices.tpl:696
+msgid "Chipset"
 msgstr ""
 
 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/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
 msgstr ""
 
 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/glpi_devices.tpl:742
+msgid "format"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:50
-#: plugins/admin/systems/class_winGeneric.inc:73
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:145
-#: plugins/admin/systems/class_winGeneric.inc:162
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
+#: 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/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/class_glpiAccount.inc:178
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAccount.inc:178
@@ -7802,534 +8580,1284 @@ msgid "Updating operating system failed, specifed name is already used."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAccount.inc:565
 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
 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 ""
 
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr ""
-
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
+#: plugins/admin/systems/class_glpiAccount.inc:667
+msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:313
-msgid "The required field 'IP-address' is not set."
+#: plugins/admin/systems/class_workstationStartup.inc:461
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/class_workstationStartup.inc:519
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:325
-msgid "The required field 'MAC-address' is not set."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_workstationStartup.inc:870
+#, php-format
 msgid ""
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:346
-#, php-format
-msgid "Found duplicate value for record type '%s'."
+#: plugins/admin/systems/class_workstationStartup.inc:1037
+msgid "Saving workstation startup settings failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_workstationStartup.inc:1087
 #, php-format
 #, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_workstationStartup.inc:1089
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
 #, php-format
 msgid ""
 #, php-format
 msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
 #, php-format
 #, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
+msgid "Can't get ppd informations."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
+#, php-format
 msgid ""
 msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
+"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
+"invalid, can't read/write any ppd informations."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
+msgid "Please specify a valid ppd file."
 msgstr ""
 
 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_printerPPDDialog.inc:186
+#, php-format
+msgid "Can't select PPD file '%s', the file is not readable"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:144
+#: plugins/admin/systems/class_printerPPDDialog.inc:203
+#: plugins/admin/systems/class_printerPPDDialog.inc:275
 #, php-format
 #, 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."
+msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:176
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
 #, php-format
 #, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
+msgid "Can't create file '%s' to store modifed ppd informations."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-msgid "Sections"
+#: plugins/admin/systems/class_printerPPDDialog.inc:235
+#, php-format
+msgid "Can't add new ppd file, the source file '%s' is not accessible."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/systems/class_printerPPDDialog.inc:253
+#, php-format
+msgid ""
+"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"informations."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-msgid "The selected name is already in use."
+#: plugins/admin/systems/class_printerPPDDialog.inc:267
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
+#, php-format
+msgid "Can't save file '%s'."
+msgstr ""
+
+#: 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:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
+msgid "True"
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
+msgid "False"
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr ""
+
+#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/servservice.tpl:99
+msgid "Print Service"
+msgstr ""
+
+#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/goSyslogServer.tpl:1
+msgid "enabled"
+msgstr ""
+
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr ""
+
+#: 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/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/server.tpl:54
+msgid "Select action to execute for this server"
+msgstr ""
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/servservice.tpl:91
+msgid "Syslog Service"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+msgid "Inventory database"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:32
+msgid "VoIP service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:137
+#, php-format
+msgid "The attribute DB user is empty or contains invalid characters."
+msgstr ""
+
+#: 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/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
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
+msgid "Custom options"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
+msgstr ""
+
+#: 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:63
+#: plugins/admin/systems/workstationStartup.tpl:95
+msgid "Assigned FAI classes"
+msgstr ""
+
+#: 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:118
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr ""
+
+#: plugins/admin/systems/workstationStartup.tpl:142
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr ""
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr ""
+
+#: 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/class_glpiPrinterAccount.inc:203
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
+msgid "since"
+msgstr ""
+
+#: 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/goTerminalServer.tpl:6
+#: plugins/admin/systems/servservice.tpl:75
+msgid "Temporary disable login"
+msgstr ""
+
+#: plugins/admin/systems/goTerminalServer.tpl:9
+#: plugins/admin/systems/servservice.tpl:78
+msgid "Font path"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr ""
+
+#: 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/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/terminal.tpl:59
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:67
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
+msgstr ""
+
+#: 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/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/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/servRepository.tpl:6
+msgid "List of configured repositories."
 msgstr ""
 
 #: plugins/admin/systems/servRepository.tpl:11
 msgid "Add repository"
 msgstr ""
 
 msgstr ""
 
 #: plugins/admin/systems/servRepository.tpl:11
 msgid "Add repository"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:9
+msgid "Postfix mydomain"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:16
+msgid "Postfix mydestination"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:33
+msgid "POP3 service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:41
+msgid "POP3/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:49
+msgid "IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:57
+msgid "IMAP/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:65
+msgid "Sieve service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:73
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:89
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:100
+msgid "Quota settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:116
+msgid "Free/Busy settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:121
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:136
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:141
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:157
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:168
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:182
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:188
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
+msgstr ""
+
+#: plugins/admin/systems/class_goKrbServer.inc:29
+msgid "Kerberos service"
+msgstr ""
+
+#: plugins/admin/systems/class_goKrbServer.inc:49
+msgid "Kerberos kadmin access informations"
+msgstr ""
+
+#: 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_goKrbServer.inc:138
+#, php-format
+msgid "The specified kerberos admin is empty."
+msgstr ""
+
+#: plugins/admin/systems/class_goKrbServer.inc:141
+#, php-format
+msgid "The specified kerberos realm is empty."
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
+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"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
+msgstr ""
+
+#: 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_servService.inc:380
+msgid "Saving server service object failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:411
+#: plugins/admin/systems/class_goShareServer.inc:287
+msgid "Creating mount container failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:425
+#: plugins/admin/systems/class_goShareServer.inc:301
+msgid "Removing mount container failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:437
+#: plugins/admin/systems/class_goShareServer.inc:313
+msgid "Saving mount container failed"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:27
+msgid "Can't be edited because the zone wasn't saved right now."
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:39
+msgid "SOA record"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:45
+msgid "Primary dns server for this zone"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
+msgstr ""
+
+#: 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/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:100
+msgid "MxRecords"
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:112
+msgid "Global zone records"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:184
+msgid "This 'dn' has no workstation features."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+msgid "Removing workstation failed"
+msgstr ""
+
+#: 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/class_workstationGeneric.inc:348
+msgid "The required field 'Workstation name' is not set."
+msgstr ""
+
+#: 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/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/servRepositorySetup.tpl:8
+msgid "Parent server"
+msgstr ""
+
+#: 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_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:42
+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."
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:58
+msgid "System / Department"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Select to see Linux terminals"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Select to see Linux workstations"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:64
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show windows based workstations"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Select to see network printers"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Show network printers"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Select to see VOIP phones"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Select to see network devices"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Show network devices"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:76
+msgid "Display systems of user"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:109
+msgid "New Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_systemManagement.inc:765
+msgid "New Terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:111
+msgid "New Workstation template"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_systemManagement.inc:766
+msgid "New Workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:113
+msgid "New Server"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/class_divListSystem.inc:115
+msgid "New Printer"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:116
+#: plugins/admin/systems/class_divListSystem.inc:117
+msgid "New Phone"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:119
+msgid "New Component"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:137
+msgid "Cups Server"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:138
+msgid "Log Db"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:139
+msgid "Syslog Server"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:140
+msgid "Mail Server"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:141
+msgid "Imap Server"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:142
+msgid "Nfs Server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
+#: plugins/admin/systems/class_divListSystem.inc:143
+msgid "Kerberos Server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
+#: plugins/admin/systems/class_divListSystem.inc:144
+msgid "Asterisk Server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone entries"
+#: plugins/admin/systems/class_divListSystem.inc:145
+msgid "Fax Server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
-msgid "SOA record"
+#: plugins/admin/systems/class_divListSystem.inc:146
+msgid "Ldap Server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
-msgid "Primary dns server for this zone"
+#: plugins/admin/systems/class_divListSystem.inc:163
+msgid "Edit system"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/class_divListSystem.inc:164
+msgid "Delete system"
 msgstr ""
 
 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
-#: ihtml/themes/lhs/setup_finish.tpl:31
-msgid "Retry"
+#: plugins/admin/systems/class_divListSystem.inc:195
+msgid "Set root       password"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:75
-msgid "Expire"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:96
-msgid "MxRecords"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
-msgid "Zone records"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
+#: plugins/admin/systems/class_servDB.inc:156
+#: plugins/admin/systems/class_goImapServer.inc:186
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: plugins/admin/systems/class_servDB.inc:191
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-msgid "Add/Edit monitor"
+#: plugins/admin/systems/class_servDB.inc:245
+msgid "Saving server db settings failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:17
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-msgid "Comments"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-msgid "Monitor size"
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-msgid "Inch"
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
 msgstr ""
 
 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/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 ""
 
 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/class_servNfs.inc:46
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
+#: plugins/admin/systems/class_servNfs.inc:49
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
+#: plugins/admin/systems/class_servNfs.inc:179
+msgid "Please specify a valid path for your setup."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
+#: plugins/admin/systems/class_servNfs.inc:185
+msgid "Please specify a valid name for your share."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Serial number"
+#: plugins/admin/systems/class_servNfs.inc:188
+msgid "Please specify a name for your share."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-msgid "Additional serial number"
+#: plugins/admin/systems/class_servNfs.inc:193
+msgid "Description contains invalid characters."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-msgid "Add/Edit other device"
+#: plugins/admin/systems/class_servNfs.inc:197
+msgid "Volume contains invalid characters."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
+#: plugins/admin/systems/class_servNfs.inc:201
+msgid "Path contains invalid characters."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/class_servNfs.inc:205
+msgid "Option contains invalid characters."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-msgid "Power"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
+#: plugins/admin/systems/servservice.tpl:70
+msgid "Terminal Service"
 msgstr ""
 
 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/servservice.tpl:107
+msgid "Mail server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-msgid "Ram"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-msgid "Add/Edit controller"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-msgid "Writeable"
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-msgid "Add/Edit harddisk"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-msgid "Cache"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-msgid "Add/Edit memory"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-msgid "Frequenz"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-msgid "Add/Edit sound card"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-msgid "Add/Edit network interface"
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-msgid "MAC address"
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-msgid "Add/Edit processor"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-msgid "Frequence"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-msgid "Default frequence"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-msgid "Chipset"
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Volume"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-msgid "format"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#: plugins/admin/systems/servnfs.tpl:104
+msgid "Option"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:99
 #, php-format
 #, php-format
-msgid "Internal Error can't create device of type '%s'"
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#: plugins/admin/systems/class_servKolab.inc:105
 #, php-format
 #, php-format
-msgid "You're about to delete the glpi device '%s'."
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
+#: plugins/admin/systems/class_servKolab.inc:191
+msgid "Removing kolab host entry failed"
 msgstr ""
 
 msgstr ""
 
-#: 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'"
+#: plugins/admin/systems/class_servKolab.inc:207
+msgid "Removing server from kolab object failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-msgid "devices"
+#: plugins/admin/systems/class_servKolab.inc:246
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-msgid "New mainbord"
+#: plugins/admin/systems/class_servKolab.inc:248
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "New processor"
+#: plugins/admin/systems/class_servKolab.inc:252
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "New case"
+#: plugins/admin/systems/class_servKolab.inc:254
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
+#: plugins/admin/systems/class_servKolab.inc:256
+msgid "Future days must be a value."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "New network interface"
+#: plugins/admin/systems/class_servKolab.inc:260
+msgid "No SMTP privileged networks set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "NI"
+#: plugins/admin/systems/class_servKolab.inc:332
+msgid "Saving server to kolab object failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "New ram"
+#: plugins/admin/systems/class_servKolab.inc:354
+msgid "Kolab mail service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "New hard disk"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "New drive"
+#: plugins/admin/systems/class_terminalGeneric.inc:98
+msgid "text"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "D"
+#: plugins/admin/systems/class_terminalGeneric.inc:99
+msgid "graphic"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "New controller"
+#: plugins/admin/systems/class_terminalGeneric.inc:167
+msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
+#: plugins/admin/systems/class_terminalGeneric.inc:179
+msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
+#: plugins/admin/systems/class_terminalGeneric.inc:191
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:319
+msgid "Removing terminal failed"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:374
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:378
+msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
+#: plugins/admin/systems/class_terminalGeneric.inc:476
+msgid "Saving terminal failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "New sound card"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "New misc device"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-msgid "You have to specify a valid name for this device."
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
 msgstr ""
 
 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/terminalService.tpl:181
+msgid "Print device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-msgid "Other"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
-msgid "Parent server"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:50
+msgid "This 'dn' has no network features."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/class_winGeneric.inc:126
+msgid "Removing Samba workstation failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/class_winGeneric.inc:224
+msgid "Saving Samba workstation failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:109
-msgid "Mail server"
+#: plugins/admin/systems/class_componentGeneric.inc:101
+msgid "Removing generic component failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/class_componentGeneric.inc:139
+msgid "The required field 'Component name' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
+msgid "The required field IP address is empty."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
+msgid "The field IP address contains an invalid address."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
+#: plugins/admin/systems/class_componentGeneric.inc:223
+msgid "Saving generic component failed"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:6
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:6
@@ -8353,699 +9881,756 @@ msgstr ""
 msgid "Regular expression for matching cartridge types"
 msgstr ""
 
 msgid "Regular expression for matching cartridge types"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
 msgstr ""
 
 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/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
 msgstr ""
 
 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/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
 
 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/terminalStartup.tpl:42
+msgid "use debug mode for startup"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
+#: plugins/admin/systems/goMailServer.tpl:7
+msgid "Visible full qualified hostname"
 msgstr ""
 
 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/goMailServer.tpl:10
+msgid "The full qualified host name."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
+#: plugins/admin/systems/goMailServer.tpl:14
+msgid "Max mail header size"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-msgid "The required field 'Server name' is not set."
+#: plugins/admin/systems/goMailServer.tpl:18
+msgid "This value specifies the maximal header size."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
+#: plugins/admin/systems/goMailServer.tpl:22
+msgid "Max mailbox size"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
+#: plugins/admin/systems/goMailServer.tpl:26
+msgid "Defines the maximal size of mail box."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
+#: plugins/admin/systems/goMailServer.tpl:30
+msgid "Max message size"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
+#: plugins/admin/systems/goMailServer.tpl:34
+msgid "Specify the maximal size of a message."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
+#: plugins/admin/systems/goMailServer.tpl:38
+msgid "Relay host"
 msgstr ""
 
 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/goMailServer.tpl:42
+msgid "Relay messages to following host:"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
+#: plugins/admin/systems/goMailServer.tpl:51
+msgid "Local networks"
 msgstr ""
 
 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/goMailServer.tpl:52
+msgid "Postfix networks"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
+#: plugins/admin/systems/goMailServer.tpl:66
+msgid "Domains and routing"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
+#: plugins/admin/systems/goMailServer.tpl:74
+msgid "Domains to accept mail for"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/goMailServer.tpl:75
+msgid "Postfix is responsible for the following domains:"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/goMailServer.tpl:89
+msgid "Transports"
 msgstr ""
 
 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/goMailServer.tpl:92
+msgid "Select a transport protocol."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:761
-msgid "New Terminal template"
+#: plugins/admin/systems/goMailServer.tpl:105
+msgid "Restrictions"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:761
-#: plugins/admin/systems/class_systemManagement.inc:925
-msgid "New Terminal"
+#: plugins/admin/systems/goMailServer.tpl:113
+msgid "Restrictions for sender"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-msgid "New Workstation template"
+#: plugins/admin/systems/goMailServer.tpl:116
+#: plugins/admin/systems/goMailServer.tpl:132
+msgid "Restriction filter"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:926
-msgid "New Workstation"
+#: plugins/admin/systems/goMailServer.tpl:129
+msgid "Restrictions for recipient"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:765
-msgid "New Server"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:766
-#: plugins/admin/systems/class_systemManagement.inc:767
-msgid "New Printer"
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:768
-#: plugins/admin/systems/class_systemManagement.inc:769
-msgid "New Phone"
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
-msgid "New Component"
+#: 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 and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-msgid "Edit system"
+#: plugins/admin/systems/SelectDeviceType.tpl:9
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:782
-msgid "Delete system"
+#: plugins/admin/systems/SelectDeviceType.tpl:21
+msgid "Choose a system type"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:792
-msgid "System"
+#: plugins/admin/systems/SelectDeviceType.tpl:32
+msgid "Choose an object group as template"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-msgid "Cups Server"
+#: plugins/admin/systems/SelectDeviceType.tpl:33
+msgid "Choose an object group"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Log Db"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-msgid "Syslog Server"
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-msgid "Mail Server"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-msgid "Imap Server"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-msgid "Nfs Server"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-msgid "Kerberos Server"
+#: plugins/admin/systems/class_termDNS.inc:132
+#, php-format
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-msgid "Asterisk Server"
+#: plugins/admin/systems/class_termDNS.inc:298
+msgid "The required field 'IP-address' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-msgid "Fax Server"
+#: plugins/admin/systems/class_termDNS.inc:305
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:839
-msgid "Ldap Server"
+#: plugins/admin/systems/class_termDNS.inc:312
+msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:872
-msgid "Set root password"
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid ""
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
+"':'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:917
-msgid "New System from incoming"
+#: plugins/admin/systems/class_termDNS.inc:339
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
-msgid "Terminal"
+#: plugins/admin/systems/class_termDNS.inc:347
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:920
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
+#: plugins/admin/systems/class_termDNS.inc:358
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-msgid "Winstation"
+#: plugins/admin/systems/class_termDNS.inc:365
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:924
-msgid "Network Device"
+#: plugins/admin/systems/class_termDNS.inc:448
+msgid "Saving terminal to DNS object failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1147
-msgid "New terminal"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1149
-msgid "New workstation"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+msgid "The selected name is already in use."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1151
-msgid "New Device"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1168
-msgid "Terminal template for"
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+msgid "NTP service"
+msgstr ""
+
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:35
+#: plugins/admin/systems/class_servRepository.inc:392
+msgid "Repository service"
+msgstr ""
+
+#: 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/class_servRepository.inc:171
+#, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1180
-msgid "Workstation template for"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
-msgid "Please enter a value for 'release'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
-msgid "Please specify a valid value for 'url'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
-msgid "Printer location"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:58
-msgid "Permissions"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:65
-msgid "Users which are allowed to use this printer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-msgid "Add user"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-msgid "Add group"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:81
-msgid "Users which are allowed to administrate this printer"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:82
-msgid "Admins"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:270
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:297
-msgid "Reverse zone"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
-msgid "This zoneName is already in use"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
-msgid "This reverse zone is already in use"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
-msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
+msgid "You have to specify a valid name for this device."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
+msgid "This device name is already in use."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
-msgid "Please specify a numeric value for serial number."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+msgid "Other"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
-msgid "Please specify a numeric value for refresh."
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
-msgid "Please specify a numeric value for ttl."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "New entry"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
-msgid "Please specify a numeric value for expire."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
-msgid "Please specify a numeric value for retry."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#, php-format
+msgid "Entry name '%s' contains invalid characters."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#, php-format
+msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#, php-format
+msgid "Can not create '%s',the destination name already exists."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#, php-format
+msgid "The name '%s' is used more than once."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#, php-format
+msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
+#: plugins/admin/systems/class_systemManagement.inc:236
+msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
+#: plugins/admin/systems/class_systemManagement.inc:253
+msgid "You are not allowed to set this systems password!"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
+#: plugins/admin/systems/class_systemManagement.inc:307
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
+#: plugins/admin/systems/class_systemManagement.inc:632
+msgid "New terminal"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
+#: plugins/admin/systems/class_systemManagement.inc:634
+msgid "New workstation"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
+#: plugins/admin/systems/class_systemManagement.inc:636
+msgid "New Device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
+#: plugins/admin/systems/class_systemManagement.inc:651
+msgid "Terminal template for"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
+#: plugins/admin/systems/class_systemManagement.inc:663
+msgid "Workstation template for"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
+#: plugins/admin/systems/class_systemManagement.inc:751
+msgid "New System from incoming"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
+#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+msgid "Terminal"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:220
-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_systemManagement.inc:755
+msgid "Workstation is installing"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
-msgid "Remove printer extension"
+#: plugins/admin/systems/class_systemManagement.inc:756
+msgid "Workstation is waiting for action"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
+#: plugins/admin/systems/class_systemManagement.inc:757
+msgid "Workstation installation failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:236
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+#: plugins/admin/systems/class_systemManagement.inc:760
+msgid "Server is installing"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "Server is waiting for action"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:244
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+#: plugins/admin/systems/class_systemManagement.inc:762
+msgid "Server installation failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "Winstation"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+#: plugins/admin/systems/class_systemManagement.inc:764
+msgid "Network Device"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:427
-msgid "can't get ppd informations."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "Create a new DNS zone entry"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
+msgid "This zoneName is already in use"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
+msgid "This reverse zone is already in use"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#, php-format
+msgid "Please choose a valid zone name."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#, php-format
+msgid "Please choose a valid reverse zone name."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
+msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
+msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
+msgid "Please specify a numeric value for serial number."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
+msgid "Please specify a numeric value for refresh."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
+msgid "Please specify a numeric value for ttl."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
+msgid "Please specify a numeric value for expire."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
+msgid "Please specify a numeric value for retry."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
+#: plugins/admin/systems/class_printGeneric.inc:248
+msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
 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_printGeneric.inc:279
+msgid "This 'dn' has no printer features."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
+#: plugins/admin/systems/class_printGeneric.inc:294
+#: plugins/admin/systems/class_printGeneric.inc:297
+msgid "Remove printer extension"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
+#: plugins/admin/systems/class_printGeneric.inc:295
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/class_printGeneric.inc:298
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
+#: plugins/admin/systems/class_printGeneric.inc:303
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/class_printGeneric.inc:306
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
+#: plugins/admin/systems/class_printGeneric.inc:480
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_printGeneric.inc:488
+msgid "can't get ppd informations."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_printGeneric.inc:501
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
+#: plugins/admin/systems/class_printGeneric.inc:503
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
+#: plugins/admin/systems/class_printGeneric.inc:554
+msgid "Removing printer failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/systems/class_printGeneric.inc:736
+msgid "Saving printer failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
+msgid "Choose a base"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
 msgstr ""
 
 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/class_baseSelectDialog.inc:115
+#, php-format
+msgid "Select this base"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:73
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:73
@@ -9113,88 +10698,10 @@ msgstr ""
 msgid "New Attachment"
 msgstr ""
 
 msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
 msgid "Please specify a valid name for this attachment."
 msgstr ""
 
 msgid "Please specify a valid name for this attachment."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:24
-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."
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
-msgstr ""
-
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr ""
-
 #: plugins/admin/systems/glpiAttachmentPool.tpl:6
 msgid "List of attachments"
 msgstr ""
 #: plugins/admin/systems/glpiAttachmentPool.tpl:6
 msgid "List of attachments"
 msgstr ""
@@ -9213,122 +10720,115 @@ msgstr ""
 msgid "Regular expression for matching attachment names"
 msgstr ""
 
 msgid "Regular expression for matching attachment names"
 msgstr ""
 
-#: 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."
+#: plugins/admin/systems/class_goMailServer.inc:44
+msgid "Mail service (SMTP)"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/class_goMailServer.inc:482
+msgid "Postfix"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/class_goMailServer.inc:619
+msgid "Please specify a numeric value for header size limit."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
+#: plugins/admin/systems/class_goMailServer.inc:623
+msgid "Please specify a numeric value for mailbox size limit."
 msgstr ""
 
 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/class_goMailServer.inc:627
+msgid "Please specify a numeric value for message size limit."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
+msgid "Please enter a value for 'release'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
+msgid "Please specify a valid value for 'url'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
+#: plugins/admin/systems/class_goImapServer.inc:48
+msgid "IMAP/POP3 service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/class_goImapServer.inc:53
+msgid "Repair database"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
+#: plugins/admin/systems/class_goImapServer.inc:83
+msgid "Cyrus service"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
+#: plugins/admin/systems/class_goImapServer.inc:168
+msgid "Please specify a server identifier."
 msgstr ""
 
 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_goImapServer.inc:171
+msgid "Please specify a connect url."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
+#: plugins/admin/systems/class_goImapServer.inc:174
+msgid "Please specify an admin user."
 msgstr ""
 
 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_goImapServer.inc:177
+msgid "Please specify a password for the admin user."
 msgstr ""
 
 #: plugins/admin/systems/class_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
 msgstr ""
 
 msgstr ""
 
 #: plugins/admin/systems/class_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:122
 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:123
 msgid "no"
 msgstr ""
 
 msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 msgid "dynamic"
 msgstr ""
 
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 msgid "Networksettings"
 msgstr ""
 
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
+#: 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 ""
 
 #, 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
+#: plugins/admin/systems/class_phoneGeneric.inc:247
+msgid "Removing phone failed"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:297
+#: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:304
+#: plugins/admin/systems/class_phoneGeneric.inc:302
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-msgid "Printer ppd selection."
+#: plugins/admin/systems/class_phoneGeneric.inc:397
+msgid "Saving phone failed"
 msgstr ""
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
 msgstr ""
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
@@ -9347,121 +10847,45 @@ msgstr ""
 msgid "Regular expression for matching member names"
 msgstr ""
 
 msgid "Regular expression for matching member names"
 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."
-msgstr ""
-
-#: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
-msgstr ""
-
-#: plugins/admin/systems/SelectDeviceType.tpl:21
-msgid "Choose a system type"
-msgstr ""
-
-#: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr ""
-
-#: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose a object group"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:232
-#, php-format
-msgid "Settings for free host entry # %s"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:234
-#, php-format
-msgid "Settings for '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:401
-#, php-format
-msgid ""
-"The name '%s' can't be used as free hand entry, the name is already used in "
-"this ldap tree."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:408
-#, php-format
-msgid "Entry name '%s' contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:420
-#, php-format
-msgid "Can't rename the server '%s' to '%s', the server contains this zone."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:432
-#, php-format
-msgid "Can't rename '%s' to '%s',the destination name already exists."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:436
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
 #, php-format
 msgid ""
 #, php-format
 msgid ""
-"Can't rename '%s' to '%s',the destination name contains invalid characters."
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:450
-#, php-format
-msgid "The record type '%s' is a unique type and can't be defined twice."
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:461
-#, php-format
-msgid "There is an empty '%s' for host '%s'."
+#: 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 ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:469
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
 #, php-format
 #, php-format
-msgid "There is a duplicate entry in '%s' for '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
-msgid "Choose a base"
-msgstr ""
-
-#: 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."
+msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:51
-msgid "Filter entries with this syntax"
-msgstr ""
-
-#: plugins/admin/systems/class_baseSelectDialog.inc:115
-#, php-format
-msgid "Select this base"
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+msgid "Printer ppd selection."
 msgstr ""
 
 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/systems/class_goShareServer.inc:31
+msgid "File service"
 msgstr ""
 
 msgstr ""
 
-#: 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."
+#: plugins/admin/ogroups/tabs_ogroups.inc:61
+#: plugins/admin/ogroups/tabs_ogroups.inc:168
+msgid "Phone queue"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:58
-#: plugins/admin/ogroups/tabs_ogroups.inc:150
-msgid "Phone queue"
+#: plugins/admin/ogroups/tabs_ogroups.inc:87
+msgid "System"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:83
-#: plugins/admin/ogroups/tabs_ogroups.inc:130
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
 msgid "Terminals"
 msgstr ""
 
 msgid "Terminals"
 msgstr ""
 
@@ -9473,6 +10897,10 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 msgstr ""
 
 msgid "Primary mail address for this distribution list"
 msgstr ""
 
+#: plugins/admin/ogroups/class_termgroup.inc:111
+msgid "There must be at least one NTP server selected."
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -9529,15 +10957,123 @@ msgstr ""
 msgid "Display objects of department"
 msgstr ""
 
 msgid "Display objects of department"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
+#: 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/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
+msgid "Object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:193
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+msgid "You are not allowed to delete this object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:39
+msgid "List of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:44
 msgid ""
 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."
+"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/class_divListOGroup.inc:58
+msgid "Name of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Select to see groups containing users"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Show groups containing users"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Select to see groups containing groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Show groups containing groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Select to see groups containing applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Show groups containing applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Select to see groups containing departments"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Show groups containing departments"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Select to see groups containing servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Show groups containing servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Select to see groups containing workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Show groups containing workstations"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Select to see groups containing terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Show groups containing terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Select to see groups containing printer"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Show groups containing printer"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Select to see groups containing phones"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Show groups containing phones"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
+msgid "Create new object group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:184
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:144
@@ -9589,68 +11125,30 @@ msgid "and"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:508
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
+msgid "Non existing dn:"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-msgid "Object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 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 ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:449
-msgid "Create new object group"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
-msgid "Name of object groups"
+#: plugins/admin/ogroups/class_ogroup.inc:715
+msgid "Saving object group failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:542
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
+#: 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 ""
 
 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 ""
 
 msgid "Member objects"
 msgstr ""
 
@@ -9664,6 +11162,14 @@ msgid ""
 "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
 "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 ""
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr ""
@@ -9707,138 +11213,103 @@ msgid ""
 "clicking below."
 msgstr ""
 
 "clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:199
+#: plugins/admin/ogroups/class_phonequeue.inc:201
 msgid "Timeout must be numeric"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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:1046
-#: 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 ""
 
 #, 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 ""
 
 #, 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/admin/ogroups/class_phonequeue.inc:525
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1147
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1149
-#: 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 ""
 
 #, 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:1035
-#: 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 ""
 
 #, 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/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/admin/ogroups/phonequeue.tpl:1
 msgid "Queue Settings"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
 #: plugins/gofon/phoneaccount/paste_generic.tpl:2
 #: plugins/gofon/phoneaccount/paste_generic.tpl:6
 #: 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"
 msgstr ""
 
 msgid "Phone numbers"
 msgstr ""
 
@@ -9951,16 +11422,16 @@ msgstr ""
 msgid "Phone Reports"
 msgstr ""
 
 msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
+#: 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 ""
 
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:110
+#: plugins/gofon/fonreports/class_fonreport.inc:171
 msgid "Can't select phone database for report generation!"
 msgstr ""
 
 msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:212
+#: plugins/gofon/fonreports/class_fonreport.inc:189
 msgid "Query for phone database failed!"
 msgstr ""
 
 msgid "Query for phone database failed!"
 msgstr ""
 
@@ -9980,80 +11451,81 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
 msgid "Duration"
 msgstr ""
 
-#: plugins/gofon/fonreports/main.inc:5
+#: plugins/gofon/fonreports/main.inc:21
 msgid "Phone reports"
 msgstr ""
 
 msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr ""
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr ""
-
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
+#: plugins/gofon/macro/class_divListMacros.inc:52
+msgid "macro name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: plugins/gofon/macro/class_divListMacros.inc:53
+msgid "Visible"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: plugins/gofon/macro/class_divListMacros.inc:60
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/gofon/macro/class_divListMacros.inc:96
+msgid "Create new phone macro"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:136
+msgid "Edit macro"
 msgstr ""
 
 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/macro/class_divListMacros.inc:118
+#: plugins/gofon/macro/class_divListMacros.inc:138
+msgid "Delete macro"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
-msgid "Create new phone macro"
+#: plugins/gofon/macro/class_divListMacros.inc:121
+msgid "Macro"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-msgid "Visible"
+#: plugins/gofon/macro/class_divListMacros.inc:122
+msgid "visible"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/macro/class_divListMacros.inc:123
+msgid "invisible"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "Macro"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "visible"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
-msgid "invisible"
+#: 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
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:645
-#: 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 "
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -10065,86 +11537,95 @@ msgstr ""
 msgid "This 'dn' is no phone macro."
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
+#: plugins/gofon/macro/class_gofonMacro.inc:456
+msgid "Saving phone macro failed"
 msgstr ""
 
 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/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/macro/generic.tpl:48
+msgid "Visible for user"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:57
+msgid "Macro text"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
@@ -10163,143 +11644,173 @@ msgstr ""
 msgid "Delete unused"
 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 ""
 
 #, 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:915
+#: 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+msgid "Saving phone macro parameters failed"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr ""
+
+#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 msgid "Phone macro management"
 msgstr ""
 
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr ""
+
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 msgid "no macro"
 msgstr ""
 
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:135
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:136
 msgid "undefined"
 msgstr ""
 
 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 ""
 
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:560
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:561
 msgid "Error while performing query:"
 msgstr ""
 
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:616
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:740
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
 msgid "This account has no phone extensions."
 msgstr ""
 
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:636
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
 msgid "Remove phone account"
 msgstr ""
 
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:752
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Create phone account"
 msgstr ""
 
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: 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 ""
 
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:771
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 msgid "Please enter a valid phone number!"
 msgstr ""
 
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:801
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
 msgid "Choose your private phone"
 msgstr ""
 
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:887
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:888
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:890
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:891
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:898
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:899
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
+#: 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: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:1118
 #, php-format
 #, php-format
-msgid "You need to specify at least one phone number!"
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1077
-msgid "Stop"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
+msgid "Removing phone account failed"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1111
-#, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+#: plugins/gofon/phoneaccount/main.inc:122
+msgid "Phone settings"
 msgstr ""
 
 msgstr ""
 
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
 #: plugins/gofon/phoneaccount/generic.tpl:33
 #: plugins/gofon/phoneaccount/generic.tpl:33
-#: plugins/gofon/phoneaccount/paste_generic.tpl:28
 msgid "Voicemail PIN"
 msgstr ""
 
 msgid "Voicemail PIN"
 msgstr ""
 
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
 #: plugins/gofon/phoneaccount/generic.tpl:41
 #: plugins/gofon/phoneaccount/generic.tpl:41
-#: plugins/gofon/phoneaccount/paste_generic.tpl:36
 msgid "Phone PIN"
 msgstr ""
 
 msgid "Phone PIN"
 msgstr ""
 
@@ -10308,129 +11819,136 @@ msgstr ""
 msgid "Phone macro"
 msgstr ""
 
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:13
-msgid "Conference name"
-msgstr ""
-
-#: plugins/gofon/conference/generic.tpl:18
-msgid "Name of conference to create"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:24
-#: plugins/gofon/conference/generic.tpl:35
-msgid "Choose subtree to place conference in"
+#: 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 ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:61
-msgid "Lifetime (in days)"
+#: plugins/gofon/conference/class_divListConferences.inc:52
+msgid "Name - Number"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:99
-msgid "Preset PIN"
+#: plugins/gofon/conference/class_divListConferences.inc:54
+#: plugins/gofon/conference/generic.tpl:112
+msgid "PIN"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
-msgid "PIN"
+#: plugins/gofon/conference/class_divListConferences.inc:61
+msgid "Regular expression for matching conference names"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:113
-msgid "Record conference"
+#: plugins/gofon/conference/class_divListConferences.inc:90
+msgid "Create new conference"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:121
-msgid "Sound file format"
+#: plugins/gofon/conference/class_divListConferences.inc:90
+msgid "New conference"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:138
-msgid "Play music on hold"
+#: plugins/gofon/conference/class_divListConferences.inc:160
+msgid "Conference"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:144
-msgid "Activate session menu"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:150
-msgid "Announce users joining or leaving the conference"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:156
-msgid "Count users"
+#: plugins/gofon/conference/generic.tpl:13
+msgid "Conference name"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
+#: plugins/gofon/conference/generic.tpl:18
+msgid "Name of conference to create"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
+#: plugins/gofon/conference/generic.tpl:24
+#: plugins/gofon/conference/generic.tpl:35
+msgid "Choose subtree to place conference in"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
-msgid "Create new conference"
+#: plugins/gofon/conference/generic.tpl:66
+msgid "Lifetime (in days)"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
-msgid "New conference"
+#: plugins/gofon/conference/generic.tpl:104
+msgid "Preset PIN"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
-msgid "This table displays all available conference rooms."
+#: plugins/gofon/conference/generic.tpl:118
+msgid "Record conference"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
-msgid "Name - Number"
+#: plugins/gofon/conference/generic.tpl:126
+msgid "Sound file format"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
-msgid "Conference"
+#: plugins/gofon/conference/generic.tpl:143
+msgid "Play music on hold"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:6
-msgid "List of conference rooms"
+#: plugins/gofon/conference/generic.tpl:149
+msgid "Activate session menu"
 msgstr ""
 
 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."
+#: plugins/gofon/conference/generic.tpl:155
+msgid "Announce users joining or leaving the conference"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
+#: plugins/gofon/conference/generic.tpl:161
+msgid "Count users"
 msgstr ""
 
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:215
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:219
 msgid "Please enter a PIN."
 msgstr ""
 
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:223
 msgid "Please enter a name for the conference."
 msgstr ""
 
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:231
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#: 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 ""
 
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:509
+msgid "Saving phone conference failed"
+msgstr ""
+
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
+msgstr ""
+
+#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr ""
 
 msgid "Conference management"
 msgstr ""
 
@@ -10452,7 +11970,7 @@ msgstr ""
 
 #: plugins/generic/welcome/welcome.tpl:4
 msgid ""
 
 #: 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 ""
 "left, or by choosing one of the pictograms below. All changes apply directly "
 "to your companies LDAP server."
 msgstr ""
@@ -10473,9 +11991,7 @@ msgid "Welcome %s!"
 msgstr ""
 
 #: include/class_mail-methods-cyrus.inc:39
 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."
+msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
 
 #: include/class_mail-methods-cyrus.inc:52
 msgstr ""
 
 #: include/class_mail-methods-cyrus.inc:52
@@ -10484,491 +12000,582 @@ msgid ""
 "settings will not be stored on your server!"
 msgstr ""
 
 "settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:115
+#: include/class_mail-methods-cyrus.inc:129
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:131
+#: include/class_mail-methods-cyrus.inc:148
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:155
+#: include/class_mail-methods-cyrus.inc:174
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:173
+#: include/class_mail-methods-cyrus.inc:192
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_mail-methods-cyrus.inc:214
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_mail-methods-cyrus.inc:242
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:255
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_mail-methods-cyrus.inc:326
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_mail-methods-cyrus.inc:330
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_debconfTemplate.inc:250
+#: include/class_debconfTemplate.inc:260
 msgid "This package has no debconf options."
 msgstr ""
 
 msgid "This package has no debconf options."
 msgstr ""
 
-#: include/functions_setup.inc:98
-msgid "Can't bind to LDAP. No schema check possible!"
+#: 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: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:615
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:254 include/functions.inc:1084
 msgid "OK"
 msgstr ""
 
 msgid "OK"
 msgstr ""
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:257
 msgid "Ignored"
 msgstr ""
 
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:259
 msgid "Failed"
 msgstr ""
 
 msgid "Failed"
 msgstr ""
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:276
 msgid "PHP setup inspection"
 msgstr ""
 
 msgid "PHP setup inspection"
 msgstr ""
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:278
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:371
 #, php-format
 msgid "Checking for function %s"
 msgstr ""
 
 #, 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 #, 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
 #: ihtml/themes/default/setup_useradmin.tpl:6
-#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
 msgstr ""
 
 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 ""
 
 msgstr ""
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:493
-#, php-format
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
 msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
 
 msgstr ""
 
-#: include/class_password-methods.inc:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
 msgstr ""
 
 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:59
+msgid "Changing password in kerberos database failed!"
 msgstr ""
 
 #: include/functions_helpviewer.inc:43
 msgstr ""
 
 #: include/functions_helpviewer.inc:43
@@ -10976,24 +12583,24 @@ msgstr ""
 msgid "XML error in guide.xml: %s at line %d"
 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 ""
 
 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 ""
 
 msgid "previous"
 msgstr ""
 
-#: include/functions_helpviewer.inc:99
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
 msgid "next"
 msgstr ""
 
 msgid "next"
 msgstr ""
 
-#: include/functions_helpviewer.inc:387
+#: include/functions_helpviewer.inc:385
 #, php-format
 #, 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 ""
 
 msgstr ""
 
-#: include/functions_helpviewer.inc:462
+#: include/functions_helpviewer.inc:459
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
@@ -11003,50 +12610,64 @@ msgstr ""
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
-#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#: include/class_ppdManager.inc:144
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
+msgstr ""
+
+#: include/class_ppdManager.inc:146
+#, php-format
+msgid "The required tmp file file '%s' can't be opened for writing."
+msgstr ""
+
+#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
 #, 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 ""
 
 msgid "Nested groups are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:141
+#: include/class_ppdManager.inc:182
 msgid "Group name not unique!"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:196
+#: include/class_ppdManager.inc:237
 msgid "PickMany is not supported yet!"
 msgstr ""
 
 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 ""
 
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
+#: include/class_MultiSelectWindow.inc:393
 msgid ""
 msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
 
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
+#: include/class_MultiSelectWindow.inc:494
+msgid "Create snapshot"
 msgstr ""
 
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
+#: 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
 msgstr ""
 
 #: include/class_certificate.inc:35
@@ -11077,7 +12698,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:362
+#: include/php_setup.inc:71 html/main.php:380
 msgid "Toggle information"
 msgstr ""
 
 msgid "Toggle information"
 msgstr ""
 
@@ -11113,110 +12734,153 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
 msgid "Arguments"
 msgstr ""
 
-#: include/functions.inc:291
+#: include/functions.inc:298
 #, php-format
 #, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
+msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
 msgstr ""
 
-#: include/functions.inc:312
+#: include/functions.inc:315
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:331
+#: include/functions.inc:336
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:369
+#: include/functions.inc:468
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:379
+#: 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 ""
 
 #, 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:394
+#: include/functions.inc:493
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:420
+#: include/functions.inc:519
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:450
+#: include/functions.inc:549
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:460
+#: include/functions.inc:559
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
 msgstr ""
 
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
 msgstr ""
 
-#: include/functions.inc:468
+#: include/functions.inc:567
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:582
+#: include/functions.inc:653
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:584
+#: 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 ""
 
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:601
+#: include/functions.inc:672
 msgid "incomplete"
 msgstr ""
 
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1002
-#, 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 ""
 
 msgstr ""
 
-#: include/functions.inc:1068
+#: 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 ""
 
 #, 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:1167
-msgid "LDAP error:"
-msgstr ""
-
-#: include/functions.inc:1345
+#: include/functions.inc:1433
 msgid "Entries per page"
 msgstr ""
 
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1373
+#: include/functions.inc:1461
 msgid "Apply filter"
 msgstr ""
 
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1647
+#: include/functions.inc:1735
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1690
+#: include/functions.inc:1778
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
 #, 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 ""
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
@@ -11227,94 +12891,111 @@ msgid ""
 "contributed script fix_config.sh!"
 msgstr ""
 
 "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
-#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/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 ""
 
 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
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "You are going to copy the entry '%s'."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgstr ""
 
-#: include/class_ldap.inc:405
+#: include/class_config.inc:70
 #, php-format
 #, php-format
-msgid "Creating copy of %s"
+msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
 msgstr ""
 
-#: include/class_ldap.inc:408
-msgid "Processing"
+#: include/class_config.inc:197 html/index.php:203
+msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
 msgstr ""
 
-#: include/class_ldap.inc:448
-msgid "Error while fetching source dn - aborted!"
+#: include/class_config.inc:461
+msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
 msgstr ""
 
-#: include/class_ldap.inc:511
+#: include/class_ldap.inc:196
 #, php-format
 #, php-format
-msgid "Unknown FAIstate %s"
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
 msgstr ""
 
 msgstr ""
 
-#: include/class_ldap.inc:632
+#: include/class_ldap.inc:228
 #, php-format
 msgid ""
 #, php-format
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
 msgstr ""
 
 msgstr ""
 
-#: include/class_ldap.inc:894
+#: include/class_ldap.inc:448
 #, php-format
 #, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+msgid "Creating copy of %s"
+msgstr ""
+
+#: include/class_ldap.inc:451
+msgid "Processing"
+msgstr ""
+
+#: include/class_ldap.inc:491
+msgid "Error while fetching source dn - aborted!"
+msgstr ""
+
+#: include/class_ldap.inc:554
+#, php-format
+msgid "Unknown FAIstate %s"
 msgstr ""
 
 msgstr ""
 
-#: include/class_ldap.inc:907
+#: include/class_ldap.inc:702
 #, php-format
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
 
 msgstr ""
 
-#: include/class_ldap.inc:923
+#: include/class_ldap.inc:771
 #, php-format
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
 msgstr ""
 
-#: include/class_plugin.inc:465
+#: include/class_ldap.inc:773
 #, php-format
 #, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgid "while operating on LDAP server %s"
 msgstr ""
 
 msgstr ""
 
-#: include/class_plugin.inc:521
+#: include/class_ldap.inc:995
 #, php-format
 msgid ""
 #, php-format
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
 
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:172
+#: include/class_ldap.inc:1024
 #, php-format
 #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 msgstr ""
 
-#: html/helpviewer.php:116
-msgid "There is no helpfile specified for this class."
+#: include/class_ldap.inc:1146
+msgid "Ldap import failed"
 msgstr ""
 
 msgstr ""
 
-#: html/helpviewer.php:226
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+#: include/class_SnapShotDialog.inc:79
+msgid "Please specify a valid description for this snapshot."
 msgstr ""
 
 #: html/getvcard.php:36
 msgstr ""
 
 #: html/getvcard.php:36
@@ -11360,6 +13041,11 @@ msgstr ""
 msgid "Common name"
 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"
 #: html/getxls.php:156 html/getxls.php:314
 #, php-format
 msgid "Servers of %s on %s"
@@ -11432,53 +13118,70 @@ msgstr ""
 msgid "Computers of %s on %s"
 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 ""
 
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:71
+#: html/index.php:134
 #, php-format
 #, php-format
-msgid "Directory '%s' specified as compile directory is not accessable!"
+msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:191
+#: html/index.php:254
 msgid "Please specify your password!"
 msgstr ""
 
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:198
+#: html/index.php:261
 msgid "Please check the username/password combination."
 msgstr ""
 
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:237 html/index.php:301
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/index.php:237 html/index.php:301
-msgid "Enter SSL session"
+#: html/index.php:285
+msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
 msgstr ""
 
-#: html/index.php:243
+#: html/index.php:337
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
 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:118
+msgid "There is no helpfile specified for this class"
+msgstr ""
+
+#: html/helpviewer.php:265
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr ""
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr ""
@@ -11501,22 +13204,26 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
-#: html/main.php:151
+#: html/main.php:164
 msgid ""
 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 ""
 
 msgstr ""
 
-#: html/main.php:194
+#: html/main.php:206
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:334
+#: html/main.php:341
 #, php-format
 #, 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 ""
 
 msgstr ""
 
-#: html/main.php:362
+#: html/main.php:380
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -11542,104 +13249,123 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr ""
 
 msgid "Can't open file '%s'."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-#: ihtml/themes/lhs/sizelimit.tpl:3
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:4
 msgid ""
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
+"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 ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-#: ihtml/themes/lhs/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
+#: ihtml/themes/default/copyPasteDialog.tpl:21
+msgid "Operation complete"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-#: ihtml/themes/lhs/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
-#: ihtml/themes/lhs/conflict.tpl:2
-msgid "Session conflict detected"
+#: ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/lhs/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:9
 msgid ""
 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."
+"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 ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
-#: ihtml/themes/lhs/conflict.tpl:10
+#: ihtml/themes/default/setup_finish.tpl:3
 msgid ""
 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 ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
-#: ihtml/themes/lhs/conflict.tpl:14
-msgid "Logout"
+#: ihtml/themes/default/setup_finish.tpl:7
+msgid "Schema Configuration"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-#: ihtml/themes/lhs/login.tpl:17
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
+#: ihtml/themes/default/setup_finish.tpl:12
+msgid "Configuration File"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
-msgid "Directory"
+#: 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 ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-#: ihtml/themes/lhs/login.tpl:57
-msgid "Sign in"
+#: ihtml/themes/default/setup_finish.tpl:17
+msgid "Download configuration"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-#: ihtml/themes/lhs/login.tpl:58
-msgid "Click here to log in"
+#: 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 ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
-#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr ""
 
 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/"
 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 ""
 
 "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
 #: ihtml/themes/default/setup_useradmin.tpl:3
-#: ihtml/themes/lhs/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
 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
 #: ihtml/themes/default/setup_useradmin.tpl:10
-#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -11647,57 +13373,99 @@ msgid ""
 "create the missing entries."
 msgstr ""
 
 "create the missing entries."
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
-msgid "Main"
+#: ihtml/themes/default/login.tpl:14
+msgid "Please use your username and password to log in"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
-msgid "Help"
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+msgid "Directory"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
-msgid "Sign out"
+#: ihtml/themes/default/login.tpl:57
+msgid "Sign in"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
-msgid "Signed in:"
+#: ihtml/themes/default/login.tpl:58
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:10
+msgid "Sign in again"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: 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 ""
 
 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_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
-#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr ""
 
 msgid "Setup continued..."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
 msgstr ""
 
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-#: ihtml/themes/lhs/islocked.tpl:2
-msgid "Locking conflict detected"
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/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:23
+#: ihtml/themes/default/accountexpired.tpl:27
+msgid "Old Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+msgid "New Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+msgid "Verify Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:51
+msgid "Change Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:52
+msgid "Click here to Change your password"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -11706,262 +13474,160 @@ msgid ""
 "is organized will be asked later on."
 msgstr ""
 
 "is organized will be asked later on."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/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 "
 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 ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/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 ""
 
 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 ihtml/themes/lhs/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr ""
 
 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 ihtml/themes/lhs/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr ""
 
 msgid "Location name"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
 
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr ""
 
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27
 msgid "Admin password"
 msgstr ""
 
 msgid "Admin password"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
 "values below if the fit your needs."
 msgstr ""
 
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
 "values below if the fit your needs."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39
 msgid "Base "
 msgstr ""
 
 msgid "Base "
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr ""
 
 msgid "People storage ou"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr ""
 
 msgid "People dn attribute"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr ""
 
 msgid "Group storage ou"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr ""
 
 msgid "ID base for users/groups"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
 "used here, too."
 msgstr ""
 
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
 "used here, too."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr ""
 
 msgid "Encryption algorithm"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88
 msgid "Mail method"
 msgstr ""
 
 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 "
 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 ""
 
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
 #: ihtml/themes/default/setup_step4.tpl:104
-#: ihtml/themes/lhs/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr ""
 
 msgid "Display PHP errors"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:107
-#: ihtml/themes/lhs/setup_step4.tpl:107
 msgid "true"
 msgstr ""
 
 msgid "true"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
 #: ihtml/themes/default/setup_step4.tpl:108
-#: ihtml/themes/lhs/setup_step4.tpl:108
 msgid "false"
 msgstr ""
 
 msgid "false"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
-#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr ""
 
 msgid "Check"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
-msgid "Setup finished"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/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 ihtml/themes/lhs/setup_finish.tpl:7
-msgid "Schema Configuration"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:12
-#: ihtml/themes/default/setup_finish.tpl:12
-#: ihtml/themes/lhs/setup_finish.tpl:12
-msgid "Configuration File"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:14
-#: ihtml/themes/default/setup_finish.tpl:14
-#: ihtml/themes/lhs/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
-#: ihtml/themes/lhs/setup_finish.tpl:17
-msgid "Download configuration"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:20
-#: ihtml/themes/default/setup_finish.tpl:20
-#: ihtml/themes/lhs/setup_finish.tpl:20
-msgid ""
-"After placing the file under /etc/gosa, place make sure that the webserver "
-"user is able to read gosa.conf, while other users shouldn't. You may want to "
-"execute these commands to achieve this requirement:"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
-msgid "Index"
+#: ihtml/themes/default/conflict.tpl:2
+msgid "Session conflict detected"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:4
-#: ihtml/themes/lhs/setup_introduction.tpl:4
+#: ihtml/themes/default/conflict.tpl:6
 msgid ""
 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 ""
 
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:17
-#: ihtml/themes/lhs/setup_introduction.tpl:17
+#: ihtml/themes/default/conflict.tpl:10
 msgid ""
 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
-#: ihtml/themes/lhs/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
-msgid "Your GOsa session has expired!"
+"Ignoring this message will change/destroy the data you're currently editing, "
+"so please close multiple windows and log in again."
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/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/conflict.tpl:14
+msgid "Logout"
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
-msgid "Sign in again"
+#: ihtml/themes/default/snapshotdialog.tpl:3
+msgid "Restoring an object snapshot"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
+#: ihtml/themes/default/snapshotdialog.tpl:15
+msgid "There are no available snapshots."
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:4
-msgid ""
-"Some values need to be unique in the complete directory while some "
-"combinations make no sense. GOsa shows the relevant attributes. Please "
-"maintain the values below to fullfill the policies."
+#: ihtml/themes/default/snapshotdialog.tpl:25
+msgid "There is no snapshot available that could be restored."
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:18
-msgid "Operation complete"
+#: ihtml/themes/default/snapshotdialog.tpl:27
+msgid "Choose a snapshot and click continue, to restore the snapshot."
 msgstr ""
 
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:100
-#: ihtml/themes/lhs/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:54
+msgid "Creating an object snapshot"
 msgstr ""
 msgstr ""