Fixed error msgs for server - kolab,generic,dns

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index edffc76ac548afb38af76f22cbd7ef51f3adcf09..cf41c176734315d1fd1b968afc5f646d533f92d0 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -12,9 +12,9 @@ msgstr ""
 
 #: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
 #: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
-#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:151
-#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
-#: contrib/gosa.conf:171 contrib/gosa.conf:176
+#: contrib/gosa.conf: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
@@ -23,17 +23,20 @@ msgstr ""
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
+#: 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/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/fai/faiPackage.tpl:4 plugins/admin/groups/mail.tpl:7
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6 plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/goImapServer.tpl:1
 #: plugins/admin/systems/servkolab.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/systems/goMailServer.tpl:1
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
@@ -45,32 +48,32 @@ msgstr ""
 
 #: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_divListGroup.inc:136
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/groups/class_divListGroup.inc:156
+#: plugins/admin/users/class_divListUsers.inc:169
 msgid "Environment"
 msgstr ""
 
 #: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_divListGroup.inc:128
-#: plugins/admin/users/class_divListUsers.inc:166
-#: plugins/admin/ogroups/tabs_ogroups.inc:72
-#: plugins/admin/ogroups/tabs_ogroups.inc:171
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
+#: plugins/admin/ogroups/tabs_ogroups.inc:178
+#: plugins/admin/ogroups/class_divListOGroup.inc:147
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
 #: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_divListGroup.inc:130
-#: plugins/admin/users/class_divListUsers.inc:172
+#: plugins/admin/groups/class_divListGroup.inc:150
+#: plugins/admin/users/class_divListUsers.inc:177
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
 #: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
-#: plugins/admin/users/class_divListUsers.inc:174
+#: plugins/admin/users/class_divListUsers.inc:179
 msgid "Netatalk"
 msgstr ""
 
@@ -84,7 +87,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:170
+#: 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
@@ -98,12 +101,12 @@ msgstr ""
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/groups/class_divListGroup.inc:154
+#: plugins/admin/users/class_divListUsers.inc:173
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:742
-#: plugins/admin/ogroups/class_ogroupManagement.inc:368
+#: 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"
@@ -115,9 +118,9 @@ msgstr ""
 
 #: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
 #: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
-#: contrib/gosa.conf:137 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:157 contrib/gosa.conf:162 contrib/gosa.conf:167
-#: contrib/gosa.conf:172 contrib/gosa.conf:177
+#: 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 ""
 
@@ -131,8 +134,8 @@ msgid "ACL"
 msgstr ""
 
 #: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:73
-#: plugins/admin/systems/class_servRepository.inc:250
 #: plugins/admin/systems/printerPPDDialog.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:246
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:92
 msgid "Options"
@@ -142,68 +145,57 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:142
-#: plugins/admin/ogroups/tabs_ogroups.inc:95
+#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:135
+#: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:143
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: contrib/gosa.conf:118 contrib/gosa.conf:136
+#: plugins/admin/ogroups/tabs_ogroups.inc:102
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:144
+#: contrib/gosa.conf:119 contrib/gosa.conf:137
 #: plugins/personal/environment/environment.tpl:173
-#: plugins/admin/systems/class_systemManagement.inc:751
-#: plugins/admin/ogroups/class_ogroupManagement.inc:371
+#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/ogroups/class_ogroupManagement.inc:381
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
+#: contrib/gosa.conf:120 contrib/gosa.conf:129 contrib/gosa.conf:138
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/admin/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/glpiSelectUser.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
-#: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
 #: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:61
+#: ihtml/themes/default/MultiSelectWindow.tpl:64
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:127
-msgid "Databases"
-msgstr ""
-
-#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:26
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:26
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:132 contrib/gosa.conf:134
-#: plugins/admin/fai/faiPackage.tpl:29
-#: plugins/admin/systems/servRepositorySetup.tpl:1
-msgid "Repository"
-msgstr ""
-
-#: contrib/gosa.conf:135 contrib/gosa.conf:146
+#: contrib/gosa.conf:128 contrib/gosa.conf:139
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:199
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:199 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
@@ -212,92 +204,92 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:211
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:201 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:212 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
-#: plugins/addons/ldapmanager/contentimport.tpl:49
+#: plugins/addons/ldapmanager/contentimport.tpl:50
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/admin/applications/generic.tpl:101
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:213
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:206
+#: contrib/gosa.conf:217
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:210 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:221 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #: plugins/admin/applications/generic.tpl:99
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiSummaryTab.inc:40
+#: contrib/gosa.conf:225 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:41
+#: contrib/gosa.conf:229 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:233 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:226 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:237 plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:227
+#: contrib/gosa.conf:238 plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:231
+#: contrib/gosa.conf:242
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:264
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:284 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:285
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:286
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:287
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:288
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:289
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:290
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:291
 msgid "Polish"
 msgstr ""
 
@@ -389,37 +381,24 @@ msgid "Removing nagios account failed"
 msgstr ""
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
-#: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
+#: plugins/personal/posix/main.inc:110 plugins/personal/netatalk/main.inc:104
+#: plugins/personal/samba/main.inc:104
 #: plugins/personal/environment/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/class_faiManagement.inc:539
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servdnseditzone.tpl:119
-#: plugins/admin/systems/servnfs.tpl:120
-#: plugins/admin/systems/class_systemManagement.inc:476
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
+#: plugins/admin/fai/class_faiManagement.inc:542
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/ogroups/class_ogroupManagement.inc:332
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
-#: include/class_MultiSelectWindow.inc:66
-#: ihtml/themes/default/copyPasteDialog.tpl:14
-msgid "Save"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+msgid "Ok"
 msgstr ""
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
@@ -433,13 +412,13 @@ msgstr ""
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/main.inc:106
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: 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/gofax/blocklists/generic.tpl:87
+#: 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
@@ -447,8 +426,8 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/godfs/class_dfsManagment.inc:249
-#: plugins/admin/fai/class_faiManagement.inc:541
-#: plugins/admin/fai/class_faiManagement.inc:546
+#: plugins/admin/fai/class_faiManagement.inc:548
+#: plugins/admin/fai/class_faiManagement.inc:553
 #: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiScriptEntry.tpl:69
@@ -460,51 +439,67 @@ msgstr ""
 #: 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:328
+#: plugins/admin/groups/class_groupManagement.inc:336
 #: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:625
+#: 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:350
+#: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: 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/goImapServer.tpl:96
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: 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/SelectDeviceType.tpl:45
+#: 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/class_baseSelectDialog.inc:41
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
-#: plugins/admin/systems/glpiSelectUser.tpl:51
-#: plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:120
-#: plugins/admin/systems/remove_glpi.tpl:16
+#: 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/chooser.tpl:18
+#: 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/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:484
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
+#: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/servnfs.tpl:121
-#: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:333
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
 #: plugins/gofon/conference/remove.tpl:16
-#: ihtml/themes/altlinux/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 ""
 
@@ -522,7 +517,7 @@ msgstr ""
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/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:140
+#: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
@@ -532,15 +527,16 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTable.tpl:44
 #: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/systems/glpi.tpl:48
 #: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
+#: plugins/admin/systems/printer.tpl:52
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/goShareServer.tpl:11
+#: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
 #: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
-#: plugins/admin/systems/printer.tpl:52
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr ""
@@ -659,8 +655,8 @@ msgstr ""
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
-#: plugins/personal/environment/environment.tpl:121
-#: plugins/personal/environment/environment.tpl:138
+#: 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
@@ -670,17 +666,17 @@ msgstr ""
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:41 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:41 plugins/admin/fai/faiPackage.tpl:71
+#: 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/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/groups/class_groupMail.inc:540
-#: plugins/admin/systems/glpi.tpl:100 plugins/admin/systems/glpiPrinter.tpl:93
+#: 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
@@ -688,24 +684,31 @@ msgstr ""
 #: 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/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/workstation.tpl:78
-#: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
+#: 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/servdnseditzone.tpl:106
 #: 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/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/terminalStartup.tpl:61
-#: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
@@ -728,8 +731,9 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/environment.tpl:139
-#: plugins/personal/environment/environment.tpl:167
+#: plugins/personal/environment/class_environment.inc:619
+#: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/environment.tpl:166
 #: plugins/personal/environment/environment.tpl:183
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:69
@@ -745,27 +749,29 @@ msgstr ""
 #: 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/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:104
 #: plugins/admin/systems/workstationStartup.tpl:125
 #: plugins/admin/systems/terminal.tpl:101
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
+#: 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/class_servDNSeditZone.inc:292
-#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: 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/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/class_termDNS.inc:474
-#: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/ogroups/termgroup.tpl:25 plugins/admin/ogroups/generic.tpl:44
 #: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:13
@@ -784,9 +790,10 @@ 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/systems/class_systemManagement.inc:743
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/admin/ogroups/class_ogroupManagement.inc:377
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr ""
@@ -882,75 +889,6 @@ msgstr ""
 msgid "disables all Mail options!"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:21
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/addons/godfs/contents.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:31
-#: plugins/admin/fai/faiPackageEntry.tpl:32
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/glpiSelectUser.tpl:27
-#: plugins/admin/systems/servRepository.tpl:36
-#: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:34
-#: ihtml/themes/default/MultiSelectWindow.tpl:70
-msgid "Filters"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:34
-#: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/mail_locals.tpl:33
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
-msgid "Regular expression for matching addresses"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
-msgstr ""
-
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
-msgstr ""
-
 #: plugins/personal/mail/class_mailAccount.inc:90
 #: plugins/admin/groups/class_groupMail.inc:75
 #, php-format
@@ -1080,22 +1018,102 @@ msgid ""
 "methods."
 msgstr ""
 
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:21
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiPackageEntry.tpl:32
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/glpiAttachmentPool.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:29
+#: ihtml/themes/default/MultiSelectWindow.tpl:35
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
+msgid "Filters"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/personal/environment/selectPrinterDialog.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:29
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/mail_locals.tpl:33
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:45
+msgid "Regular expression for matching addresses"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:52
+msgid "Display addresses of user"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:55
+msgid "User name of which addresses are shown"
+msgstr ""
+
 #: plugins/personal/password/class_password.inc:5
 #: plugins/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/class_divListSystem.inc:173
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
+#: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_divListSystem.inc:195
+#: plugins/admin/systems/goFaxServer.tpl:8
+#: plugins/admin/systems/goLogDBServer.tpl:8
+#: plugins/admin/systems/goFonServer.tpl:8
+#: plugins/admin/systems/goGlpiServer.tpl:9
 #: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
 msgid "Password"
 msgstr ""
 
+#: plugins/personal/password/nochange.tpl:2
+msgid "Password change not allowed"
+msgstr ""
+
+#: plugins/personal/password/nochange.tpl:6
+msgid "You are not allowed to change your password at this time"
+msgstr ""
+
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_divListUsers.inc:146
+#: plugins/admin/users/class_divListUsers.inc:230
 msgid "Change password"
 msgstr ""
 
@@ -1149,16 +1167,11 @@ msgstr ""
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:45
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/admin/fai/faiNewBranch.tpl:50
 #: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1470
-#: 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
 #: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1205,16 +1218,8 @@ msgstr ""
 msgid "External password changer reported a problem: "
 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/posix/posix_groups.tpl:6
-msgid "Select groups to add"
+#: plugins/personal/posix/posix_groups.tpl:6
+msgid "Select groups to add"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:32
@@ -1222,15 +1227,15 @@ msgid "Display groups of department"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:46
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
-#: plugins/admin/groups/class_divListGroup.inc:62
-#: plugins/admin/users/class_divListUsers.inc:63
-#: plugins/admin/applications/class_divListApplication.inc:48
-#: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:66
-#: plugins/admin/ogroups/class_divListOGroup.inc:69
-#: plugins/gofon/macro/class_divListMacros.inc:51
-#: plugins/gofon/conference/class_divListConferences.inc:52
+#: 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 ""
 
@@ -1239,9 +1244,9 @@ msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:57
-#: plugins/admin/groups/class_divListGroup.inc:65
-#: plugins/admin/departments/class_divListDepartment.inc:49
-#: plugins/admin/ogroups/class_divListOGroup.inc:72
+#: 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 ""
 
@@ -1250,7 +1255,7 @@ msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:68
-#: plugins/admin/groups/class_divListGroup.inc:66
+#: plugins/admin/groups/class_divListGroup.inc:72
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -1308,7 +1313,7 @@ msgid "Display systems of department"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:69
+#: plugins/admin/systems/class_divListSystem.inc:75
 msgid "Display systems matching"
 msgstr ""
 
@@ -1377,7 +1382,7 @@ msgstr ""
 #: 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:786
+#: plugins/admin/systems/class_workstationStartup.inc:789
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr ""
@@ -1543,8 +1548,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:557
 #: plugins/personal/samba/class_sambaAccount.inc:455
-#: plugins/admin/systems/class_terminalGeneric.inc:88
-#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
@@ -1690,12 +1694,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: plugins/personal/netatalk/main.inc:104
-#: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr ""
-
 #: plugins/personal/netatalk/main.inc:121
 msgid "Netatalk settings"
 msgstr ""
@@ -1938,6 +1936,28 @@ msgstr ""
 msgid "Saving Samba account failed"
 msgstr ""
 
+#: plugins/personal/environment/class_hotplugDialog.inc:115
+msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:118
+msgid "Invalid character in description. Please specify a valid description."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
+msgid "Please specify a valid id."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:133
+msgid "An Entry with this name already exists."
+msgstr ""
+
+#: plugins/personal/environment/class_hotplugDialog.inc:138
+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."
@@ -1960,10 +1980,10 @@ msgid "Choose the department the search will be based    on"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
-#: plugins/admin/fai/class_divListFai.inc:75
+#: plugins/admin/fai/class_divListFai.inc:81
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:66
-#: plugins/admin/applications/class_divListApplication.inc:51
+#: 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"
@@ -1973,11 +1993,11 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:198
 msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:207
+#: plugins/personal/environment/class_environment.inc:220
 #: plugins/admin/systems/class_terminalService.inc:95
 #: plugins/admin/systems/class_workstationService.inc:88
 #, php-format
@@ -1986,90 +2006,105 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:297
+#: plugins/personal/environment/class_environment.inc:334
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:298
+#: plugins/personal/environment/class_environment.inc:335
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:307
+#: plugins/personal/environment/class_environment.inc:312
+#: plugins/personal/environment/class_environment.inc:340
+#: plugins/personal/environment/class_environment.inc:345
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:308
+#: plugins/personal/environment/class_environment.inc:341
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:313
+#: plugins/personal/environment/class_environment.inc:346
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:703
+#: plugins/personal/environment/class_environment.inc:461
+#: plugins/personal/environment/class_environment.inc:770
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_workstationStartup.inc:610
+#: plugins/personal/environment/class_environment.inc:544
+#: plugins/personal/environment/class_environment.inc:555
 #: plugins/admin/systems/class_terminalStartup.inc:187
+#: plugins/admin/systems/class_workstationStartup.inc:613
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:706
+#: 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:758
+#: plugins/personal/environment/class_environment.inc:825
 msgid "Removing environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:811
+#: plugins/personal/environment/class_environment.inc:878
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:818
+#: plugins/personal/environment/class_environment.inc:885
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:856
+#: plugins/personal/environment/class_environment.inc:923
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:950
+#: plugins/personal/environment/class_environment.inc:1017
 msgid "Error while writing printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1020
+#: plugins/personal/environment/class_environment.inc:1087
 msgid "Error while writing printer settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1089
+#: plugins/personal/environment/class_environment.inc:1157
 msgid "Adding environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1132
+#: 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:1137
+#: plugins/personal/environment/class_environment.inc:1207
 msgid "Default printer"
 msgstr ""
 
@@ -2097,7 +2132,7 @@ msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
 #: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:149
 msgid "Environment managment settings"
 msgstr ""
 
@@ -2149,56 +2184,72 @@ msgstr ""
 
 #: 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/terminalStartup.tpl:66
+#: plugins/admin/systems/class_goShareServer.inc:148
 msgid "Shares"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:122
+#: plugins/personal/environment/environment.tpl:111
+msgid "User used to connect to the share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:112
+msgid "Select a share"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:118
+msgid "Mount path"
+msgstr ""
+
+#: plugins/personal/environment/environment.tpl:120
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/fai/faiPackage.tpl:72
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 #: plugins/admin/groups/class_groupMail.inc:544
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/printer.tpl:53
 #: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:144
 #: plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:81
+#: plugins/admin/systems/goMailServer.tpl:57
+#: plugins/admin/systems/goMailServer.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
-#: plugins/admin/systems/terminalStartup.tpl:81
-#: plugins/admin/systems/printer.tpl:53 ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:126
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:129
+#: plugins/personal/environment/environment.tpl:127
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:152
 msgid "Hotplug devices"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:154
+#: plugins/personal/environment/environment.tpl:153
 msgid "Hotplug device settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:165
-#: plugins/admin/groups/class_divListGroup.inc:98
-#: plugins/gofon/macro/class_divListMacros.inc:83
+#: plugins/personal/environment/environment.tpl:164
+#: plugins/admin/groups/class_divListGroup.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:96
 msgid "New"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:166
+#: plugins/personal/environment/environment.tpl:165
 msgid "Existing"
 msgstr ""
 
@@ -2219,6 +2270,10 @@ 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 ""
 
@@ -2236,23 +2291,23 @@ msgstr ""
 #: plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/fai/faiPartitionTable.tpl:19
 #: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
-#: plugins/admin/fai/faiPackage.tpl:19 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
-#: plugins/admin/systems/component.tpl:30
-#: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/servnfs.tpl:17 plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/printer.tpl:13 plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/wingeneric.tpl:25
+#: plugins/admin/systems/servnfs.tpl:17 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
 #: plugins/gofon/conference/generic.tpl:56
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
-#: html/getxls.php:230
+#: html/getxls.php:230 ihtml/themes/default/snapshotdialog.tpl:86
 msgid "Description"
 msgstr ""
 
@@ -2278,7 +2333,9 @@ msgid "Logon script"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:88
 #: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/class_faiManagement.inc:545
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiScriptEntry.tpl:68
@@ -2287,10 +2344,17 @@ msgstr ""
 #: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/class_groupManagement.inc:333
 #: 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/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 ""
 
@@ -2328,15 +2392,15 @@ msgid "Browse"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/fai/class_faiSummaryTab.inc:222
+#: plugins/admin/fai/class_faiSummaryTab.inc:219
 #: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: include/class_MultiSelectWindow.inc:67
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
+#: include/class_MultiSelectWindow.inc:79
 msgid "Close"
 msgstr ""
 
@@ -2358,27 +2422,47 @@ msgid "Device name"
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
-msgid "Device ID"
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:113
-msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
-msgstr ""
-
-#: plugins/personal/environment/class_hotplugDialog.inc:116
-msgid "Invalid character in description. Please specify a valid description."
+msgid "Vendor ID"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
-msgid "Please specify a valid id."
+#: plugins/personal/environment/hotplugDialogNew.tpl:33
+msgid "Product ID"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
-msgid "An Entry with this name already exists."
+#: plugins/personal/environment/hotplugDialogNew.tpl:40
+msgid "Device ID"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
-msgid "Please select an entry or press cancel."
+#: 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 ""
 
 #: plugins/personal/generic/password.tpl:2
@@ -2464,7 +2548,6 @@ msgid "Date of birth"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:100
-#: ihtml/themes/altlinux/sizelimit.tpl:14
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr ""
@@ -2479,31 +2562,32 @@ msgid "Preferred langage"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:88
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:101
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/fai/class_divListFai.inc:149
-#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/groups/class_divListGroup.inc:115
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_divListUsers.inc:107
-#: plugins/admin/applications/class_divListApplication.inc:104
+#: plugins/admin/users/class_divListUsers.inc:121
+#: plugins/admin/applications/class_divListApplication.inc:118
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/departments/class_divListDepartment.inc:93
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:14 plugins/admin/systems/terminal.tpl:17
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: 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/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/printer.tpl:20
-#: plugins/admin/systems/class_divListSystem.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/ogroups/class_divListOGroup.inc:125
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_divListMacros.inc:85
+#: plugins/gofon/macro/class_divListMacros.inc:98
 #: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_divListConferences.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:99
 #: plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr ""
@@ -2521,18 +2605,17 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:41
 #: plugins/admin/departments/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:36
-#: 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/phone.tpl:19 plugins/admin/systems/phone.tpl:21
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/workstation.tpl:31
+#: 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/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/printer.tpl:26 plugins/admin/systems/printer.tpl:28
-#: 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/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 ""
@@ -2586,13 +2669,13 @@ msgid "Organization"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:217
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/users/class_divListUsers.inc:50
-#: plugins/admin/applications/class_divListApplication.inc:44
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/gofon/macro/class_divListMacros.inc:46
+#: 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 ""
@@ -2772,7 +2855,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:965
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:517
+#: plugins/admin/users/class_userManagement.inc:519
 msgid "The required field 'Name' is not set."
 msgstr ""
 
@@ -2782,7 +2865,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:980
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:520
+#: plugins/admin/users/class_userManagement.inc:522
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -2810,7 +2893,7 @@ msgstr ""
 #: 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:244
+#: plugins/admin/departments/class_departmentGeneric.inc:251
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
@@ -2824,13 +2907,13 @@ 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:247
+#: 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:250
+#: plugins/admin/departments/class_departmentGeneric.inc:257
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
@@ -3043,6 +3126,9 @@ msgid "Proxy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/admin/systems/goMailServer.tpl:18
+#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr ""
 
@@ -3051,7 +3137,7 @@ msgid "GB"
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:314
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
@@ -3096,8 +3182,8 @@ msgid "Template user"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:93
-#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_servGeneric.inc:44
+#: plugins/admin/systems/class_workstationGeneric.inc:103
 #: plugins/admin/ogroups/class_termgroup.inc:39
 msgid "Locked"
 msgstr ""
@@ -3344,40 +3430,40 @@ msgstr ""
 msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
 msgid "send"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
 msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:406
 msgid "Removing blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: 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:438
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: 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:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:514
 msgid "Saving blocklist object failed"
 msgstr ""
 
@@ -3393,268 +3479,295 @@ msgid ""
 "select box."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 msgid "Blocklist name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:47
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:53
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_divListFai.inc:60
-#: plugins/admin/groups/class_divListGroup.inc:51
-#: plugins/admin/users/class_divListUsers.inc:52
-#: plugins/admin/applications/class_divListApplication.inc:45
-#: plugins/admin/departments/class_divListDepartment.inc:42
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: 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_divListSystem.inc:53
-#: plugins/admin/ogroups/class_divListOGroup.inc:54
-#: plugins/gofon/macro/class_divListMacros.inc:48
-#: plugins/gofon/conference/class_divListConferences.inc:49
+#: 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:50
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
 msgid "Select to see send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
 msgid "Show send blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
 msgid "Select to see receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
 msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
-#: plugins/admin/groups/class_divListGroup.inc:62
-#: plugins/admin/users/class_divListUsers.inc:63
-#: plugins/admin/applications/class_divListApplication.inc:48
-#: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:66
-#: plugins/admin/ogroups/class_divListOGroup.inc:69
-#: plugins/gofon/macro/class_divListMacros.inc:51
-#: plugins/gofon/conference/class_divListConferences.inc:52
+#: 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:57
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:63
 msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
-#: plugins/admin/fai/class_divListFai.inc:111
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:93
-#: plugins/admin/applications/class_divListApplication.inc:92
-#: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: 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_divListSystem.inc:88
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/gofon/macro/class_divListMacros.inc:74
-#: plugins/gofon/conference/class_divListConferences.inc:75
+#: 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 ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
 #: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/fai/class_divListFai.inc:111
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:93
-#: plugins/admin/applications/class_divListApplication.inc:92
-#: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: 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_divListSystem.inc:88
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/gofon/macro/class_divListMacros.inc:74
-#: plugins/gofon/conference/class_divListConferences.inc:75
+#: 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 "Root"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
-#: plugins/admin/fai/class_divListFai.inc:114
-#: plugins/admin/groups/class_divListGroup.inc:94
-#: plugins/admin/users/class_divListUsers.inc:95
-#: plugins/admin/applications/class_divListApplication.inc:94
-#: plugins/admin/departments/class_divListDepartment.inc:70
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: 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_divListSystem.inc:90
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/gofon/macro/class_divListMacros.inc:76
-#: plugins/gofon/conference/class_divListConferences.inc:77
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
 msgid "Go up one department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
 #: plugins/addons/godfs/class_dfsManagment.inc:213
 #: plugins/admin/fai/class_faiProfile.inc:303
-#: plugins/admin/fai/class_divListFai.inc:114
-#: plugins/admin/groups/class_divListGroup.inc:94
-#: plugins/admin/users/class_divListUsers.inc:95
-#: plugins/admin/applications/class_divListApplication.inc:94
-#: plugins/admin/departments/class_divListDepartment.inc:70
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_divListSystem.inc:96
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_divListSystem.inc:90
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/gofon/macro/class_divListMacros.inc:76
-#: plugins/gofon/conference/class_divListConferences.inc:77
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
 msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/admin/groups/class_divListGroup.inc:95
-#: plugins/admin/users/class_divListUsers.inc:97
-#: plugins/admin/applications/class_divListApplication.inc:96
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: 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_divListSystem.inc:92
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/gofon/macro/class_divListMacros.inc:78
-#: plugins/gofon/conference/class_divListConferences.inc:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
 msgid "Go to users department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/groups/class_divListGroup.inc:95
-#: plugins/admin/users/class_divListUsers.inc:97
-#: plugins/admin/applications/class_divListApplication.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:71
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: 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_divListSystem.inc:92
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/gofon/macro/class_divListMacros.inc:78
-#: plugins/gofon/conference/class_divListConferences.inc:79
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
 msgid "Home"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/admin/fai/class_divListFai.inc:119
-#: plugins/admin/groups/class_divListGroup.inc:96
-#: plugins/admin/users/class_divListUsers.inc:99
-#: plugins/admin/applications/class_divListApplication.inc:98
-#: plugins/admin/departments/class_divListDepartment.inc:72
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: 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_divListSystem.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:87
 msgid "Reload list"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:90
+#: 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:120
-#: plugins/admin/fai/class_divListFai.inc:150
-#: plugins/admin/groups/class_divListGroup.inc:96
+#: plugins/admin/fai/class_divListFai.inc:126
+#: plugins/admin/fai/class_divListFai.inc:162
 #: plugins/admin/groups/class_divListGroup.inc:102
-#: plugins/admin/users/class_divListUsers.inc:99
-#: plugins/admin/users/class_divListUsers.inc:109
-#: plugins/admin/applications/class_divListApplication.inc:98
-#: plugins/admin/applications/class_divListApplication.inc:106
-#: plugins/admin/departments/class_divListDepartment.inc:72
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: 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_divListSystem.inc:93
-#: plugins/admin/systems/class_divListSystem.inc:110
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/macro/class_divListMacros.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:81
-#: plugins/gofon/conference/class_divListConferences.inc:88
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/ogroups/class_divListOGroup.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:86
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:94
+#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:111
+#: plugins/admin/applications/class_divListApplication.inc:110
+#: plugins/admin/departments/class_divListDepartment.inc:86
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:91
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Restore snapshopts of already deleted objects"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:94
+#: plugins/admin/fai/class_divListFai.inc:137
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:111
+#: plugins/admin/applications/class_divListApplication.inc:110
+#: plugins/admin/departments/class_divListDepartment.inc:86
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/ogroups/class_divListOGroup.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:91
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Restore"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:99
 msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:86
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:99
 msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:90
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:150
-#: plugins/admin/groups/class_divListGroup.inc:102
-#: plugins/admin/users/class_divListUsers.inc:109
-#: plugins/admin/applications/class_divListApplication.inc:106
-#: plugins/admin/departments/class_divListDepartment.inc:77
+#: 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_divListSystem.inc:110
-#: plugins/admin/ogroups/class_divListOGroup.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:88
+#: plugins/admin/ogroups/class_divListOGroup.inc:127
+#: plugins/gofon/macro/class_divListMacros.inc:100
+#: plugins/gofon/conference/class_divListConferences.inc:101
 msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:104
+#: 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:209
-#: plugins/admin/fai/class_divListFai.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: 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/class_divListSystem.inc:135
-#: plugins/admin/ogroups/class_divListOGroup.inc:138
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:163
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/ogroups/class_divListOGroup.inc:168
+#: plugins/gofon/macro/class_divListMacros.inc:115
+#: plugins/gofon/macro/class_divListMacros.inc:135
+#: plugins/gofon/conference/class_divListConferences.inc:131
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:104
-#: plugins/admin/users/class_divListUsers.inc:144
-#: plugins/gofon/macro/class_divListMacros.inc:103
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:131
+#: plugins/admin/users/class_divListUsers.inc:228
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
 #: plugins/addons/mailqueue/contents.tpl:93
 #: 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:216
-#: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_divListSystem.inc:136
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:105
-#: plugins/gofon/conference/class_divListConferences.inc:107
+#: plugins/admin/fai/class_divListFai.inc:235
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:231
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_divListSystem.inc:164
+#: plugins/admin/ogroups/class_divListOGroup.inc:170
+#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/conference/class_divListConferences.inc:133
+#: plugins/gofon/conference/class_divListConferences.inc:135
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/users/class_divListUsers.inc:148
-#: plugins/gofon/macro/class_divListMacros.inc:105
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:132
+#: plugins/admin/users/class_divListUsers.inc:232
 msgid "Delete user"
 msgstr ""
 
@@ -3671,17 +3784,17 @@ msgid "Select subtree to place blocklist in"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:37
-#: plugins/admin/fai/class_faiSummaryTab.inc:329
+#: plugins/admin/fai/class_faiSummaryTab.inc:326
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
 #: plugins/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/servnfs.tpl:47
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr ""
@@ -3711,7 +3824,6 @@ msgstr ""
 #: 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/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
 #: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 msgid "Warning"
 msgstr ""
@@ -3923,7 +4035,7 @@ msgstr ""
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/systems/class_printGeneric.inc:758
-#: plugins/admin/ogroups/class_ogroupManagement.inc:363
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
 msgid "User"
 msgstr ""
 
@@ -3981,7 +4093,7 @@ msgid "Can't select fax database for report generation!"
 msgstr ""
 
 #: plugins/gofax/faxreports/class_faxreport.inc:148
-#: plugins/gofax/faxreports/class_faxreport.inc:263
+#: plugins/gofax/faxreports/class_faxreport.inc:266
 msgid "Query for fax database failed!"
 msgstr ""
 
@@ -3990,7 +4102,7 @@ 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:271
+#: plugins/gofax/faxreports/class_faxreport.inc:274
 #: plugins/gofon/fonreports/class_fonreport.inc:202
 msgid "Y-M-D"
 msgstr ""
@@ -4042,6 +4154,7 @@ msgstr ""
 #: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
+#: ihtml/themes/default/snapshotdialog.tpl:78
 msgid "Date"
 msgstr ""
 
@@ -4128,15 +4241,13 @@ msgstr ""
 #: plugins/addons/addressbook/class_addressbook.inc:513
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/class_faiSummaryTab.inc:324
+#: plugins/admin/fai/class_faiSummaryTab.inc:321
 #: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
 #: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
 #: plugins/admin/systems/glpi_devices.tpl:146
@@ -4150,11 +4261,12 @@ 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/glpiManufacturerAdd.tpl:7
+#: 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/servnfs.tpl:9 plugins/gofon/macro/parameter.tpl:5
-#: html/getxls.php:174 html/getxls.php:233
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr ""
 
@@ -4282,8 +4394,8 @@ msgid "Creating new entry in"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/mailqueue/class_mailqueue.inc:296
-#: plugins/addons/mailqueue/class_mailqueue.inc:361
+#: 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"
@@ -4350,6 +4462,11 @@ msgstr ""
 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."
@@ -4428,50 +4545,57 @@ msgid ""
 "Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:86
-#: plugins/addons/mailqueue/class_mailqueue.inc:94
-#: plugins/addons/mailqueue/class_mailqueue.inc:113
-#: plugins/addons/mailqueue/class_mailqueue.inc:122
-#: plugins/addons/mailqueue/class_mailqueue.inc:177
-#: plugins/addons/mailqueue/class_mailqueue.inc:204
+#: plugins/addons/mailqueue/class_mailqueue.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:112
+#: plugins/addons/mailqueue/class_mailqueue.inc:171
+#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#, php-format
+msgid ""
+"You do not have permission to execute the command '%s' on the mailqueue."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:93
+#: plugins/addons/mailqueue/class_mailqueue.inc:121
+#: plugins/addons/mailqueue/class_mailqueue.inc:181
+#: plugins/addons/mailqueue/class_mailqueue.inc:213
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:216
+#: plugins/addons/mailqueue/class_mailqueue.inc:225
 msgid "There are no mail server specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:266
+#: plugins/addons/mailqueue/class_mailqueue.inc:275
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:268
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
 msgid "down"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:311
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:316
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
 msgid "hours"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:362
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:363
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:364
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 #: plugins/addons/mailqueue/contents.tpl:76
 msgid "Active"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:365
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr ""
 
@@ -4688,14 +4812,18 @@ msgid "Import LDIF File"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentimport.tpl:24
-msgid "Modify existing attributes"
+msgid "Modify existing objects, keep untouched attributes"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentimport.tpl:25
+msgid "Overwrite existing objects, all not listed attributes will be removed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:33
-msgid "Overwrite existing entry"
+#: plugins/addons/ldapmanager/contentimport.tpl:34
+msgid "Remove existing entries first"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
+#: plugins/addons/ldapmanager/contentimport.tpl:41
 msgid "Import successful"
 msgstr ""
 
@@ -4900,7 +5028,7 @@ msgstr ""
 #: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
 #: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
 #: plugins/admin/fai/tabsTemplate.inc:34
-#: plugins/admin/departments/tabs_department.inc:31
+#: plugins/admin/departments/tabs_department.inc:30
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -4955,25 +5083,24 @@ msgid "Specified freeze name is invalid."
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:322
+#: plugins/admin/systems/class_servRepository.inc:204
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
-#: plugins/admin/systems/class_servRepository.inc:208
 msgid "This name is already in use."
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:392
-#: plugins/admin/fai/class_faiManagement.inc:545
+#: 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:410
-#: plugins/admin/departments/class_departmentGeneric.inc:495
+#: 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/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/default/snapshotdialog.tpl:48
+#: ihtml/themes/default/snapshotdialog.tpl:95
 msgid "Continue"
 msgstr ""
 
@@ -5072,16 +5199,16 @@ msgstr ""
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:46
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: 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 ""
@@ -5104,33 +5231,33 @@ msgstr ""
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:204
+#: plugins/admin/fai/class_faiSummaryTab.inc:201
 msgid "This object has no FAI classes assigned."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:216
+#: plugins/admin/fai/class_faiSummaryTab.inc:213
 msgid "Open"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:323
+#: plugins/admin/fai/class_faiSummaryTab.inc:320
 msgid "No."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:325
+#: plugins/admin/fai/class_faiSummaryTab.inc:322
 msgid "FS options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:326
+#: plugins/admin/fai/class_faiSummaryTab.inc:323
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
 msgid "Mount options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:327
+#: 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:328
+#: plugins/admin/fai/class_faiSummaryTab.inc:325
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
 msgid "Mount point"
 msgstr ""
@@ -5165,12 +5292,12 @@ msgid "Choose a variable to delete or edit"
 msgstr ""
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_divListGroup.inc:50
-#: plugins/admin/users/class_divListUsers.inc:51
+#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/users/class_divListUsers.inc:57
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_divListOGroup.inc:53
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr ""
@@ -5189,35 +5316,107 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:332
-msgid "Removing FAI hook base failed"
+#: plugins/admin/fai/class_faiPackage.inc:340
+msgid "Removing FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:383
-msgid "Saving FAI hook base failed"
+#: plugins/admin/fai/class_faiPackage.inc:369
+msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:451
-msgid "Removing FAI hook failed"
+#: plugins/admin/fai/class_faiPackage.inc:373
+msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:457
-#: plugins/admin/fai/class_faiHook.inc:467
-msgid "Saving FAI hook failed"
+#: plugins/admin/fai/class_faiPackage.inc:394
+msgid "package is configured"
 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_faiPackage.inc:400
+msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
-msgid "Hook bundle"
+#: plugins/admin/fai/class_faiPackage.inc:425
+#, php-format
+msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiPackage.inc:484
+msgid "Saving FAI package base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:529
+msgid "Saving FAI package entry failed"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:29
+#: plugins/admin/systems/servRepositorySetup.tpl:1
+msgid "Repository"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/workstationStartup.tpl:45
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/servRepositorySetup.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:244
+msgid "Release"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/systems/class_printerPPDDialog.inc:413
+msgid "Section"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:49
+msgid "Install method"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:65
+msgid "Used packages"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:67
+msgid "Choosen packages"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
+msgid "Configure"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:74
+msgid "Toggle remove flag"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:332
+msgid "Removing FAI hook base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:383
+msgid "Saving FAI hook base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:451
+msgid "Removing FAI hook failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:457
+#: plugins/admin/fai/class_faiHook.inc:467
+msgid "Saving FAI hook failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiProfileEntry.inc:152
+msgid "This list displays all assigned class names for this profile."
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
+msgid "Hook bundle"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr ""
 
@@ -5369,15 +5568,6 @@ msgid ""
 "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:21
-#: plugins/admin/fai/faiPackageNew.tpl:24 plugins/admin/fai/faiPackage.tpl:33
-#: plugins/admin/systems/workstationStartup.tpl:45
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/servRepositorySetup.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:248
-msgid "Release"
-msgstr ""
-
 #: plugins/admin/fai/faiPackageNew.tpl:26
 msgid "please choose a release..."
 msgstr ""
@@ -5471,139 +5661,139 @@ msgstr ""
 msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:58
+#: plugins/admin/fai/class_divListFai.inc:64
 msgid "Name of FAI class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:59
+#: plugins/admin/fai/class_divListFai.inc:65
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:62
+#: plugins/admin/fai/class_divListFai.inc:68
 msgid "Display FAI profile objects"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:62
+#: plugins/admin/fai/class_divListFai.inc:68
 msgid "Show profiles"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:63
+#: plugins/admin/fai/class_divListFai.inc:69
 msgid "Display FAI template objects"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:63
-#: plugins/admin/users/class_divListUsers.inc:54
+#: plugins/admin/fai/class_divListFai.inc:69
+#: plugins/admin/users/class_divListUsers.inc:60
 msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:64
+#: plugins/admin/fai/class_divListFai.inc:70
 msgid "Display FAI scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:64
+#: plugins/admin/fai/class_divListFai.inc:70
 msgid "Show scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:65
+#: plugins/admin/fai/class_divListFai.inc:71
 msgid "Display FAI hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:65
+#: plugins/admin/fai/class_divListFai.inc:71
 msgid "Show hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/fai/class_divListFai.inc:72
 msgid "Display FAI variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/fai/class_divListFai.inc:72
 msgid "Show variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:67
+#: plugins/admin/fai/class_divListFai.inc:73
 msgid "Display FAI packages"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:67
+#: plugins/admin/fai/class_divListFai.inc:73
 msgid "Show packages"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:68
+#: plugins/admin/fai/class_divListFai.inc:74
 msgid "Display FAI partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:68
+#: plugins/admin/fai/class_divListFai.inc:74
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:71
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/departments/class_divListDepartment.inc:79
 msgid "Go to users home department"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/fai/class_divListFai.inc:131
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/fai/class_divListFai.inc:131
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:130
+#: plugins/admin/fai/class_divListFai.inc:142
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:130
+#: plugins/admin/fai/class_divListFai.inc:142
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:133
+#: plugins/admin/fai/class_divListFai.inc:145
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:133
+#: plugins/admin/fai/class_divListFai.inc:145
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/fai/class_divListFai.inc:148
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/fai/class_divListFai.inc:148
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:210
-#: plugins/admin/fai/class_divListFai.inc:215
+#: plugins/admin/fai/class_divListFai.inc:229
+#: plugins/admin/fai/class_divListFai.inc:234
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:217
+#: plugins/admin/fai/class_divListFai.inc:236
 msgid "Delete class"
 msgstr ""
 
@@ -5767,11 +5957,11 @@ msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 #: plugins/admin/systems/glpiDeviceManagement.tpl:51
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
-#: plugins/admin/systems/glpiAttachmentPool.tpl:51
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/glpiAttachmentPool.tpl:51
 msgid "Use"
 msgstr ""
 
@@ -5842,8 +6032,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:102
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 #: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 msgid "Upload"
 msgstr ""
 
@@ -5852,7 +6042,7 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_divListConferences.inc:47
+#: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
@@ -5860,7 +6050,7 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/systems/class_printGeneric.inc:753
 #: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/ogroups/class_ogroupManagement.inc:364
+#: plugins/admin/ogroups/class_ogroupManagement.inc:374
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
@@ -5870,7 +6060,7 @@ msgid "Access"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
-#: plugins/admin/systems/class_servDNS.inc:161
+#: plugins/admin/systems/class_servDNS.inc:167
 msgid "Class"
 msgstr ""
 
@@ -5884,8 +6074,10 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
+#: 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 ""
@@ -5914,101 +6106,117 @@ msgstr ""
 msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:413
-msgid "Section"
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:49
-msgid "Install method"
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:65
-msgid "Used packages"
+#: plugins/admin/groups/mail.tpl:63
+msgid "IMAP shared folders"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:67
-msgid "Choosen packages"
+#: plugins/admin/groups/mail.tpl:67
+msgid "Default permission"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
-msgid "Configure"
+#: plugins/admin/groups/mail.tpl:76
+msgid "Member permission"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:74
-msgid "Toggle remove flag"
+#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
+msgid "Forward messages to non group members"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:340
-msgid "Removing FAI package base failed"
+#: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:369
-msgid "Please select a least one Package."
+#: plugins/admin/groups/class_groupManagement.inc:245
+#, php-format
+msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:373
-msgid "Please choose a valid combination for your repository setup."
+#: plugins/admin/groups/class_groupManagement.inc:251
+#: plugins/admin/groups/class_groupManagement.inc:282
+msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:394
-msgid "package is configured"
+#: plugins/admin/groups/class_groupGeneric.inc:123
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:400
-msgid "Package marked for removal"
+#: plugins/admin/groups/class_groupGeneric.inc:177
+msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:425
-#, php-format
-msgid "Package file '%s' does not exist."
+#: plugins/admin/groups/class_groupGeneric.inc:317
+msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:484
-msgid "Saving FAI package base failed"
+#: plugins/admin/groups/class_groupGeneric.inc:317
+msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:529
-msgid "Saving FAI package entry failed"
+#: plugins/admin/groups/class_groupGeneric.inc:317
+msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
+#: plugins/admin/groups/class_groupGeneric.inc:318
+msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
+#: plugins/admin/groups/class_groupGeneric.inc:323
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:63
-msgid "IMAP shared folders"
+#: plugins/admin/groups/class_groupGeneric.inc:435
+msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:67
-msgid "Default permission"
+#: plugins/admin/groups/class_groupGeneric.inc:467
+#, php-format
+msgid ""
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:76
-msgid "Member permission"
+#: plugins/admin/groups/class_groupGeneric.inc:496
+msgid "Removing group failed"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
-msgid "Forward messages to non group members"
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
+#: plugins/admin/groups/class_groupGeneric.inc:608
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:244
-#, php-format
-msgid "You're about to delete the group '%s'."
+#: plugins/admin/groups/class_groupGeneric.inc:693
+msgid "Saving group failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:250
-#: plugins/admin/groups/class_groupManagement.inc:281
-msgid "You are not allowed to delete this group!"
+#: plugins/admin/groups/class_groupGeneric.inc:722
+#: plugins/admin/ogroups/class_ogroup.inc:656
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:732
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:744
+#: plugins/admin/groups/class_groupGeneric.inc:758
+#: plugins/admin/groups/class_groupGeneric.inc:765
+msgid "Value specified as 'Name' is already used."
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:35
@@ -6023,109 +6231,109 @@ msgid ""
 "large number of groups."
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:49
+#: plugins/admin/groups/class_divListGroup.inc:55
 msgid "Groupname / Department"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:60
 msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:60
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:55
+#: plugins/admin/groups/class_divListGroup.inc:61
 msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:55
+#: plugins/admin/groups/class_divListGroup.inc:61
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/groups/class_divListGroup.inc:62
 msgid "Select to see groups that have applications configured"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/groups/class_divListGroup.inc:62
 msgid "Show application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/groups/class_divListGroup.inc:63
 msgid "Select to see groups that have mail settings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/groups/class_divListGroup.inc:63
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:58
+#: plugins/admin/groups/class_divListGroup.inc:64
 msgid "Select to see normal groups that have only functional aspects"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:58
+#: plugins/admin/groups/class_divListGroup.inc:64
 msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:98
+#: plugins/admin/groups/class_divListGroup.inc:112
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:126
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/groups/class_divListGroup.inc:146
+#: plugins/admin/users/class_divListUsers.inc:167
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:132
-#: plugins/admin/applications/class_divListApplication.inc:130
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/applications/class_divListApplication.inc:144
+#: plugins/admin/ogroups/class_ogroupManagement.inc:375
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:133
+#: plugins/admin/groups/class_divListGroup.inc:171
+#: plugins/admin/users/class_divListUsers.inc:223
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:133
+#: plugins/admin/groups/class_divListGroup.inc:171
+#: plugins/admin/users/class_divListUsers.inc:223
+#: plugins/admin/applications/class_divListApplication.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
-#: plugins/admin/ogroups/class_divListOGroup.inc:135
+#: plugins/admin/groups/class_divListGroup.inc:173
+#: plugins/admin/users/class_divListUsers.inc:225
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
-#: plugins/admin/ogroups/class_divListOGroup.inc:135
+#: plugins/admin/groups/class_divListGroup.inc:173
+#: plugins/admin/users/class_divListUsers.inc:225
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/ogroups/class_divListOGroup.inc:165
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/ogroups/class_divListOGroup.inc:138
-#: plugins/gofon/conference/class_divListConferences.inc:103
+#: plugins/admin/groups/class_divListGroup.inc:176
+#: plugins/admin/applications/class_divListApplication.inc:168
+#: plugins/admin/departments/class_divListDepartment.inc:129
+#: plugins/admin/ogroups/class_divListOGroup.inc:168
+#: plugins/gofon/conference/class_divListConferences.inc:131
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/gofon/conference/class_divListConferences.inc:105
-#: plugins/gofon/conference/class_divListConferences.inc:107
+#: 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 ""
 
@@ -6139,26 +6347,79 @@ msgstr ""
 msgid "Group administration"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:476
-#: include/class_ldap.inc:454
-msgid "Object"
+#: plugins/admin/groups/class_groupMail.inc:284
+msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
+#: plugins/admin/groups/class_groupMail.inc:285
+msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
+#: plugins/admin/groups/class_groupMail.inc:286
+msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:3
-msgid "Release focus"
+#: plugins/admin/groups/class_groupMail.inc:287
+msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:5
+#: plugins/admin/groups/class_groupMail.inc:288
+msgid "write"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:312
+msgid "This 'dn' has no valid mail extensions."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:377
+msgid "You're trying to add an invalid email address "
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:378
+msgid "to the list of forwarders."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:613
+msgid "Removing group mail settings failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:777
+msgid "Saving group mail settings failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:806
+msgid "Please enter a valid email addres in 'Primary address' field."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:839
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:843
+msgid "Please select a valid mail server."
+msgstr ""
+
+#: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:484
+#: include/class_ldap.inc:455 ihtml/themes/default/snapshotdialog.tpl:70
+msgid "Object"
+msgstr ""
+
+#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr ""
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:3
+msgid "Release focus"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:5
 msgid "Select release name"
 msgstr ""
 
@@ -6179,7 +6440,7 @@ msgid "Select users to add"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:56
+#: plugins/admin/systems/class_divListSystem.inc:62
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
@@ -6331,7 +6592,7 @@ msgid "The selected application has no options."
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:638
-#: plugins/admin/departments/class_divListDepartment.inc:112
+#: plugins/admin/departments/class_divListDepartment.inc:146
 msgid "department"
 msgstr ""
 
@@ -6390,133 +6651,6 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:123
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:177
-msgid "This 'dn' is no group."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:317
-msgid "Samba group"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:317
-msgid "Domain admins"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:317
-msgid "Domain users"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:318
-msgid "Domain guests"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:323
-#, php-format
-msgid "Special group (%d)"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:435
-msgid "! unknown id"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:467
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:496
-msgid "Removing group failed"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:608
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:693
-msgid "Saving group failed"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:722
-#: plugins/admin/ogroups/class_ogroup.inc:656
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:732
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:744
-#: plugins/admin/groups/class_groupGeneric.inc:758
-#: plugins/admin/groups/class_groupGeneric.inc:765
-msgid "Value specified as 'Name' is already used."
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:284
-msgid "read"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:285
-msgid "post"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:286
-msgid "external post"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:287
-msgid "append"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:288
-msgid "write"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:312
-msgid "This 'dn' has no valid mail extensions."
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:377
-msgid "You're trying to add an invalid email address "
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:378
-msgid "to the list of forwarders."
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:613
-msgid "Removing group mail settings failed"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:777
-msgid "Saving group mail settings failed"
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:806
-msgid "Please enter a valid email addres in 'Primary address' field."
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:839
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
-msgstr ""
-
-#: plugins/admin/groups/class_groupMail.inc:843
-msgid "Please select a valid mail server."
-msgstr ""
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6525,9 +6659,9 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:28
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/systems/printer.tpl:71 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: 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 ""
 
@@ -6546,14 +6680,15 @@ msgstr ""
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:451
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: 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:529
+#: plugins/admin/users/class_userManagement.inc:531
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -6569,7 +6704,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "Template"
 msgstr ""
 
@@ -6597,159 +6732,156 @@ msgid ""
 "user list."
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:50
-#: plugins/gofon/macro/class_divListMacros.inc:46
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: plugins/admin/users/class_divListUsers.inc:56
 #: ihtml/themes/default/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:54
+#: plugins/admin/users/class_divListUsers.inc:60
 msgid "Select to see template pseudo users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:55
+#: plugins/admin/users/class_divListUsers.inc:61
 msgid "Select to see users that have only a GOsa object"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:55
+#: plugins/admin/users/class_divListUsers.inc:61
 msgid "Show functional users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/users/class_divListUsers.inc:62
 msgid "Select to see users that have posix settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/users/class_divListUsers.inc:62
 msgid "Show unix users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/users/class_divListUsers.inc:63
 msgid "Select to see users that have mail settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/users/class_divListUsers.inc:63
 msgid "Show mail users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/users/class_divListUsers.inc:64
 msgid "Select to see users that have samba settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/users/class_divListUsers.inc:64
 msgid "Show samba users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:59
+#: plugins/admin/users/class_divListUsers.inc:65
 msgid "Select to see users that have proxy settings"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:59
+#: plugins/admin/users/class_divListUsers.inc:65
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/users/class_divListUsers.inc:116
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/users/class_divListUsers.inc:116
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/users/class_divListUsers.inc:118
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/users/class_divListUsers.inc:118
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:145
-msgid "password"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:160
+#: plugins/admin/users/class_divListUsers.inc:165
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:161
+#: plugins/admin/users/class_divListUsers.inc:166
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:163
+#: plugins/admin/users/class_divListUsers.inc:168
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/users/class_divListUsers.inc:170
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:167
+#: plugins/admin/users/class_divListUsers.inc:172
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:169
+#: plugins/admin/users/class_divListUsers.inc:174
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:171
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:173
+#: plugins/admin/users/class_divListUsers.inc:178
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:175
+#: plugins/admin/users/class_divListUsers.inc:180
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:176
+#: plugins/admin/users/class_divListUsers.inc:181
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:182
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:230
+#: plugins/admin/users/class_divListUsers.inc:229
+msgid "password"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:251
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/users/class_divListUsers.inc:258
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:29
+#: plugins/admin/applications/class_divListApplication.inc:31
 msgid "List of Applications"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:30
+#: plugins/admin/applications/class_divListApplication.inc:32
 msgid "This table displays all applications in the selected tree."
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:34
+#: plugins/admin/applications/class_divListApplication.inc:36
 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."
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:44
+#: plugins/admin/applications/class_divListApplication.inc:51
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationGeneric.inc:446
 msgid "Application name"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:100
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
 msgid "new"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/applications/class_divListApplication.inc:115
 msgid "Create new application"
 msgstr ""
 
@@ -6916,13 +7048,13 @@ msgstr ""
 msgid "Application settings"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:295
+#: plugins/admin/applications/class_applicationManagement.inc:324
 msgid "You are not allowed to delete this application!"
 msgstr ""
 
@@ -6939,11 +7071,11 @@ msgid ""
 "of the department list."
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:41
+#: plugins/admin/departments/class_divListDepartment.inc:47
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:74
+#: plugins/admin/departments/class_divListDepartment.inc:91
 msgid "Create new department"
 msgstr ""
 
@@ -7039,154 +7171,210 @@ msgstr ""
 msgid "Removing department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:226
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
-#: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:243
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:247
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:284
+#: plugins/admin/departments/class_departmentGeneric.inc:291
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:326
+#: plugins/admin/departments/class_departmentGeneric.inc:333
 msgid "Saving department failed"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:363
+#: plugins/admin/departments/class_departmentGeneric.inc:371
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:440
+#: plugins/admin/departments/class_departmentGeneric.inc:448
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:479
+#: plugins/admin/departments/class_departmentGeneric.inc:487
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/ogroups/class_divListOGroup.inc:52
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:158
+#: plugins/admin/departments/class_departmentManagement.inc:160
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:179
+#: plugins/admin/departments/class_departmentManagement.inc:181
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:345
 msgid ".."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpi_devices.tpl:17
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-msgid "Comments"
+#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-msgid "Comment"
+#: plugins/admin/systems/class_terminalService.inc:72
+#: plugins/admin/systems/class_terminalService.inc:100
+#: plugins/admin/systems/class_terminalService.inc:106
+#: plugins/admin/systems/class_terminalService.inc:116
+#: plugins/admin/systems/class_terminalService.inc:117
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:123
+#: plugins/admin/systems/class_terminalService.inc:214
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_terminalService.inc:220
+#: plugins/admin/systems/class_terminalService.inc:223
+#: plugins/admin/systems/class_terminalService.inc:226
+#: plugins/admin/systems/class_terminalService.inc:229
+#: plugins/admin/systems/class_terminalService.inc:232
+#: plugins/admin/systems/class_terminalStartup.inc:39
+#: plugins/admin/systems/class_terminalStartup.inc:111
+#: plugins/admin/systems/class_terminalStartup.inc:131
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:213
+#: plugins/admin/systems/class_workstationService.inc:216
+#: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationStartup.inc:266
+#: plugins/admin/systems/class_workstationStartup.inc:284
+#: plugins/admin/systems/class_workstationStartup.inc:288
+#: plugins/admin/systems/class_workstationStartup.inc:788
+#: plugins/admin/systems/class_workstationGeneric.inc:118
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_terminalGeneric.inc:280
+msgid "inherited"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
+#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+msgid "bit"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
+#: plugins/admin/systems/class_terminalService.inc:155
+msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
+#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
+msgid "show chooser"
 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/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
+msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
+#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
+msgid "load balanced"
 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/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
+msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
-msgid "present"
+#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
+msgid "ICA client"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_workstationService.inc:204
+msgid "Bit"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:67
 #: plugins/admin/systems/class_terminalService.inc:252
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_terminalGeneric.inc:191
-#: plugins/admin/systems/class_workstationStartup.inc:478
+#: 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 ""
 
+#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_workstationService.inc:291
+msgid "Choose the phone located at the current terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:365
+#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:354
+#: plugins/admin/systems/class_workstationService.inc:359
+msgid "Please specify a valid VSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:380
+#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:369
+#: plugins/admin/systems/class_workstationService.inc:374
+msgid "Please specify a valid HSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:416
+msgid "Saving terminal service information failed"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:1 plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:4 plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:8 plugins/admin/systems/servdb.tpl:14
+#: plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/goImapServer.tpl:19
+msgid "Admin user"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:199
+msgid "present"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalInfo.inc:74
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
@@ -7204,50 +7392,402 @@ msgstr ""
 msgid "online"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
-msgid "running"
+#: plugins/admin/systems/class_terminalInfo.inc:163
+msgid "running"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalInfo.inc:166
+msgid "not running"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalInfo.inc:191
+msgid "offline"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:27
+#: plugins/admin/systems/goLdapServer.tpl:1
+msgid "LDAP service"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:47
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFaxServer.inc:185
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:353
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:3
+msgid "Adding a new service to the current server"
+msgstr ""
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:7
+msgid ""
+"This dialog allows you to add new services to the currenty edited server "
+"object. The box below shows all available but not already used services."
+msgstr ""
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:13
+msgid "Service to add"
+msgstr ""
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:20
+msgid "All available services are already in use."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/ogroups/class_termgroup.inc:38
+msgid "Activated"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:67
+msgid "This 'dn' has no server features."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_workstationGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:154
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:80
+#: plugins/admin/systems/class_workstationGeneric.inc:144
+#: plugins/admin/systems/class_terminalGeneric.inc:171
+#: plugins/admin/systems/class_terminalGeneric.inc:183
+#: plugins/admin/systems/class_terminalGeneric.inc:195
+#: plugins/admin/ogroups/class_termgroup.inc:158
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/systems/class_terminalGeneric.inc:262
+#: plugins/admin/ogroups/class_termgroup.inc:204
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Switch off"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/systems/class_terminalGeneric.inc:263
+#: plugins/admin/ogroups/class_termgroup.inc:205
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Reboot"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:162
+#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/ogroups/class_termgroup.inc:206
+msgid "Instant update"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:171
+#: plugins/admin/systems/class_workstationGeneric.inc:248
+#: plugins/admin/systems/class_workstationGeneric.inc:256
+#: plugins/admin/ogroups/class_termgroup.inc:207
+msgid "Scheduled update"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:164
+#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_workstationGeneric.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/ogroups/class_termgroup.inc:208
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:165
+#: plugins/admin/systems/class_workstationGeneric.inc:250
+#: plugins/admin/ogroups/class_termgroup.inc:209
+msgid "Rescan hardware"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:166
+#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_workstationGeneric.inc:257
+#: plugins/admin/systems/class_terminalGeneric.inc:264
+#: plugins/admin/systems/class_terminalGeneric.inc:268
+#: plugins/admin/ogroups/class_termgroup.inc:40
+msgid "Memory test"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:167
+#: plugins/admin/systems/class_servGeneric.inc:173
+#: plugins/admin/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_workstationGeneric.inc:258
+#: plugins/admin/systems/class_terminalGeneric.inc:265
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/ogroups/class_termgroup.inc:41
+msgid "System analysis"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:169
+#: plugins/admin/systems/class_workstationGeneric.inc:254
+#: plugins/admin/systems/class_terminalGeneric.inc:267
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Wake up"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:188
+msgid "Removing server failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:224
+msgid "The required field 'Server name' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:231
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:242
+#: plugins/admin/systems/class_workstationGeneric.inc:361
+#: plugins/admin/systems/class_terminalGeneric.inc:391
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_printGeneric.inc:618
+#: plugins/admin/systems/class_phoneGeneric.inc:312
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:300
+msgid "Saving server failed"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:1
+msgid "Network\tsettings"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:9
+msgid "IP-address"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:13
+msgid "MAC-address"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:19
+msgid "Autodetect"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:41
+msgid "Enable DNS for this device"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:50
+msgid "Zone"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/servdnseditzone.tpl:85
+msgid "TTL"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:63
+msgid "Dns records"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:32
+msgid "Domain name system service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:73
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:74
+#: plugins/admin/systems/class_inventory.inc:37
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:76
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr ""
+
+#: 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
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr ""
+
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
-msgid "not running"
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
-msgid "offline"
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network\tsettings"
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+msgid "Contact person"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:9
-msgid "IP-address"
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:13
-msgid "MAC-address"
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+msgid "Comment"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:19
-msgid "Autodetect"
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:41
-msgid "Enable DNS for this device"
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:50
-msgid "Zone"
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:58
-#: plugins/admin/systems/class_servDNS.inc:160
-#: plugins/admin/systems/servdnseditzone.tpl:85
-msgid "TTL"
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:63
-msgid "Dns records"
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+msgid "Attachments"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -7333,6 +7873,8 @@ msgid "SSH service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:119
+#: plugins/admin/systems/class_goCupsServer.inc:26
+#: plugins/admin/systems/class_goCupsServer.inc:46
 msgid "Print service"
 msgstr ""
 
@@ -7348,47 +7890,134 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
+#: plugins/admin/systems/printer.tpl:22 plugins/admin/systems/component.tpl:15
+#: plugins/admin/systems/server.tpl:17 plugins/admin/systems/terminal.tpl:19
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/workstation.tpl:25 plugins/admin/systems/phone.tpl:15
+msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-msgid "Contact person"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
+#: plugins/admin/systems/printer.tpl:39
+msgid "Printer location"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
+#: plugins/admin/systems/printer.tpl:51
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
+#: plugins/admin/systems/printer.tpl:63
+msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-msgid "Attachments"
+#: plugins/admin/systems/printer.tpl:70
+msgid "Users which are allowed to use this printer"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+msgid "Add user"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+msgid "Add group"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:86
+msgid "Users which are allowed to administrate this printer"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:87
+msgid "Admins"
 msgstr ""
 
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr ""
 
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:30 plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_goFonServer.inc:52
+msgid "Asterisk management"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:46 plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:54
+#: plugins/admin/systems/goFonServer.tpl:12
+msgid "Country dial prefix"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:58
+#: plugins/admin/systems/goFonServer.tpl:16
+msgid "Local dial prefix"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/goImapServer.tpl:7
+msgid "Server identifier"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/goImapServer.tpl:13
+msgid "Connect URL"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:91
+#: plugins/admin/systems/goImapServer.tpl:31
+msgid "Sieve port"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/class_goLogDBServer.inc:29
+#: plugins/admin/systems/class_goLogDBServer.inc:49
+msgid "Logging database"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+#: plugins/admin/systems/goLogDBServer.tpl:4
+#: plugins/admin/systems/goGlpiServer.tpl:4
+msgid "Logging DB user"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr ""
+
+#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/goGlpiServer.tpl:14
+msgid "Database"
+msgstr ""
+
 #: plugins/admin/systems/glpiPrinter.tpl:9
 msgid "Printer type"
 msgstr ""
@@ -7413,31 +8042,16 @@ msgstr ""
 msgid "Installed cartridges"
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
-
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
-msgid ""
-"Be careful editing record types with this dialog. All changes will be saved "
-"immediately when using the save button."
-msgstr ""
-
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_workstationStartup.inc:309
+#, php-format
 msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
-
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
-msgid "New entry"
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
-msgid "Create a new DNS zone entry"
+#: plugins/admin/systems/class_terminalStartup.inc:386
+msgid "Saving terminal startup settings failed"
 msgstr ""
 
 #: plugins/admin/systems/glpi_edit_type.tpl:1
@@ -7448,130 +8062,179 @@ msgstr ""
 #: 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_cartridge_type.tpl:7
 #: plugins/admin/systems/glpi_edit_os.tpl:9
 #: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
 msgid "Rename"
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-msgid "Please enter a new name"
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:44
+msgid "Start IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:51
+msgid "Start IMAP SSL service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:58
+msgid "Start POP3 service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:65
+msgid "Start POP3 SSL service"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:76
+#: plugins/admin/systems/goMailServer.tpl:149
+msgid "The server must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:78
+#: plugins/admin/systems/goMailServer.tpl:151
+msgid "The service must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:81
+#: plugins/admin/systems/goMailServer.tpl:154
+msgid "Set new status"
+msgstr ""
+
+#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/systems/goMailServer.tpl:160
+msgid "Set status"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:17
+#: plugins/admin/systems/class_divListSystemService.inc:18
+msgid "Installed services"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:22
+msgid ""
+"This menu allows you to add, remove and configure the properties of a "
+"specific service."
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:30
+msgid "Service name"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+msgid "Add service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+msgid "Add new service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+msgid "Start all services"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#: plugins/admin/systems/class_divListSystemService.inc:106
+msgid "Stop service"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+msgid "Stop all services"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:121
-msgid "unknown"
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#: plugins/admin/systems/class_divListSystemService.inc:112
+msgid "Restart service"
 msgstr ""
 
-#: 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_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_workstationGeneric.inc:110
-#: plugins/admin/systems/class_terminalGeneric.inc:105
-#: plugins/admin/systems/class_terminalGeneric.inc:246
-#: plugins/admin/systems/class_workstationStartup.inc:263
-#: plugins/admin/systems/class_workstationStartup.inc:281
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:785
-#: plugins/admin/systems/class_terminalStartup.inc:39
-#: plugins/admin/systems/class_terminalStartup.inc:111
-#: plugins/admin/systems/class_terminalStartup.inc:131
-msgid "inherited"
+#: plugins/admin/systems/class_divListSystemService.inc:58
+msgid "Restart all services"
 msgstr ""
 
-#: 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"
+#: plugins/admin/systems/class_divListSystemService.inc:86
+msgid "Stopped"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
+#: plugins/admin/systems/class_divListSystemService.inc:87
+msgid "Started"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
+#: plugins/admin/systems/class_divListSystemService.inc:88
+msgid "Restarting"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
+#: plugins/admin/systems/class_divListSystemService.inc:89
+msgid "User status"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
+#: plugins/admin/systems/class_divListSystemService.inc:100
+msgid "Start service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
+#: plugins/admin/systems/class_divListSystemService.inc:118
+msgid "Edit service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
+#: plugins/admin/systems/class_divListSystemService.inc:124
+msgid "Remove service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
+#: plugins/admin/systems/class_workstationService.inc:415
+msgid "Saving workstation services failed"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:303
-#: plugins/admin/systems/class_workstationService.inc:291
-msgid "Choose the phone located at the current terminal"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_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."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_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."
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:416
-msgid "Saving terminal service information failed"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/server.tpl:50 plugins/admin/systems/terminal.tpl:115
+#: plugins/admin/systems/workstation.tpl:93
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
+msgid "Action"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "New monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+msgid "M"
 msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:2
 msgid "Add/Edit monitor"
 msgstr ""
 
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
+msgstr ""
+
 #: plugins/admin/systems/glpi_devices.tpl:33
 msgid "Monitor size"
 msgstr ""
@@ -7730,26 +8393,6 @@ msgstr ""
 msgid "format"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:415
-msgid "Saving workstation services failed"
-msgstr ""
-
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr ""
-
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr ""
-
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:138
-#: plugins/admin/ogroups/class_phonequeue.inc:691
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -7822,12 +8465,6 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-#: plugins/admin/systems/printer.tpl:51
-msgid "Driver"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -7848,48 +8485,182 @@ msgstr ""
 msgid "Choose colordepth used in graphic mode"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:144
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+msgid "There is no server with valid glpi database service."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:154
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+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
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:323
+msgid "Rename failed, this system type name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:379
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:413
+msgid "Updating operating system failed, specifed name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+msgid "Remove inventory"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:566
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+msgid "Add inventory"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:569
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
+msgid "N/A"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:667
+msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
+#: plugins/admin/systems/class_workstationStartup.inc:416
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
+#: plugins/admin/systems/class_workstationStartup.inc:461
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
+#: plugins/admin/systems/class_workstationStartup.inc:519
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
+#: plugins/admin/systems/class_workstationStartup.inc:859
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
+#: plugins/admin/systems/class_workstationStartup.inc:870
+#, 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."
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
+#: plugins/admin/systems/class_workstationStartup.inc:1037
+msgid "Saving workstation startup settings failed"
 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_workstationStartup.inc:1087
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
+#: plugins/admin/systems/class_workstationStartup.inc:1089
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
+#, php-format
+msgid ""
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:62
@@ -7969,21 +8740,23 @@ msgstr ""
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
+#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/servservice.tpl:99
+msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:17 plugins/admin/systems/terminal.tpl:19
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
-#: plugins/admin/systems/component.tpl:15
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/printer.tpl:22
-msgid "Choose subtree to place terminal in"
+#: 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/workstation.tpl:39
 #: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/systems/workstation.tpl:39
 #: plugins/admin/ogroups/termgroup.tpl:38
 msgid "Mode"
 msgstr ""
@@ -7994,18 +8767,48 @@ msgstr ""
 msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:50 plugins/admin/systems/terminal.tpl:115
-#: plugins/admin/systems/workstation.tpl:93
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/ogroups/termgroup.tpl:75
-msgid "Action"
-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"
@@ -8062,55 +8865,6 @@ msgstr ""
 msgid "Mountpoint"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:67
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:68
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:70
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:71
-#: 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:159
-msgid "Reverse zone"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:223
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:261
-msgid "Removing DNS service failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:282
-msgid "Updating DNS service failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:291
-msgid "Removing DNS entries failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNS.inc:312
-msgid "Saving DNS entries failed"
-msgstr ""
-
 #: plugins/admin/systems/glpiDeviceManagement.tpl:6
 msgid "List of devices"
 msgstr ""
@@ -8128,57 +8882,12 @@ msgstr ""
 msgid "Regular expression for matching device names"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:320
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/class_servService.inc:379
-msgid "Saving server service object failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servService.inc:410
-msgid "Creating mount container failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servService.inc:424
-msgid "Removing mount container failed"
-msgstr ""
-
-#: plugins/admin/systems/class_servService.inc:436
-msgid "Saving mount container failed"
-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."
-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."
-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."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#: plugins/admin/systems/class_glpiAccount.inc:565
-msgid "Remove inventory"
-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:202
-#: plugins/admin/systems/class_glpiAccount.inc:568
-msgid "Add inventory"
-msgstr ""
-
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 msgid ""
 "This server has inventory features disabled. You can enable them by clicking "
@@ -8198,18 +8907,26 @@ msgstr ""
 msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
-#: plugins/admin/systems/class_glpiAccount.inc:633
-#: plugins/admin/systems/class_glpiAccount.inc:648
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
-msgid "N/A"
-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 ""
@@ -8266,1285 +8983,1173 @@ 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/servRepositorySetup.tpl:8
-msgid "Parent server"
-msgstr ""
-
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:249
-#: plugins/admin/systems/class_servRepository.inc:270
-msgid "Sections"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr ""
-
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:92
-#: plugins/admin/systems/class_servGeneric.inc:35
-#: plugins/admin/ogroups/class_termgroup.inc:38
-msgid "Activated"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:94
-#: plugins/admin/systems/class_servGeneric.inc:37
-#: plugins/admin/ogroups/class_termgroup.inc:40
-msgid "Memory test"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:95
-#: plugins/admin/systems/class_servGeneric.inc:38
-#: plugins/admin/ogroups/class_termgroup.inc:41
-msgid "System analysis"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:132
-#: plugins/admin/systems/class_servGeneric.inc:69
-#: plugins/admin/ogroups/class_termgroup.inc:154
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:136
-#: plugins/admin/systems/class_terminalGeneric.inc:132
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_terminalGeneric.inc:156
-#: plugins/admin/systems/class_servGeneric.inc:73
-#: plugins/admin/ogroups/class_termgroup.inc:158
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:146
-msgid "This 'dn' has no workstation features."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:201
-#: plugins/admin/systems/class_terminalGeneric.inc:223
-#: plugins/admin/systems/class_servGeneric.inc:125
-#: plugins/admin/ogroups/class_termgroup.inc:204
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Switch off"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:201
-#: plugins/admin/systems/class_terminalGeneric.inc:223
-#: plugins/admin/systems/class_servGeneric.inc:125
-#: plugins/admin/ogroups/class_termgroup.inc:205
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Reboot"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:202
-#: plugins/admin/systems/class_servGeneric.inc:126
-#: plugins/admin/ogroups/class_termgroup.inc:206
-msgid "Instant update"
+msgid "Select action to execute for this terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:203
-#: plugins/admin/systems/class_workstationGeneric.inc:209
-#: plugins/admin/systems/class_servGeneric.inc:127
-#: plugins/admin/systems/class_servGeneric.inc:133
-#: plugins/admin/ogroups/class_termgroup.inc:207
-msgid "Scheduled update"
+#: plugins/admin/systems/servRepository.tpl:6
+msgid "List of configured repositories."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:204
-#: plugins/admin/systems/class_workstationGeneric.inc:208
-#: plugins/admin/systems/class_servGeneric.inc:128
-#: plugins/admin/systems/class_servGeneric.inc:132
-#: plugins/admin/ogroups/class_termgroup.inc:208
-msgid "Reinstall"
+#: plugins/admin/systems/servRepository.tpl:11
+msgid "Add repository"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:205
-#: plugins/admin/systems/class_servGeneric.inc:129
-#: plugins/admin/ogroups/class_termgroup.inc:209
-msgid "Rescan hardware"
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:207
-#: plugins/admin/systems/class_terminalGeneric.inc:225
-#: plugins/admin/systems/class_servGeneric.inc:131
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Wake up"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:237
-msgid "Removing workstation failed"
+#: plugins/admin/systems/servkolab.tpl:9
+msgid "Postfix mydomain"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:106
-msgid "You have no permissions to create a workstation on this 'Base'."
+#: plugins/admin/systems/servkolab.tpl:16
+msgid "Postfix mydestination"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:292
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/servkolab.tpl:33
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:305
-#: plugins/admin/systems/class_componentGeneric.inc:165
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_terminalGeneric.inc:352
-#: plugins/admin/systems/class_servGeneric.inc:202
-#: plugins/admin/systems/class_phoneGeneric.inc:312
-#: plugins/admin/systems/class_printGeneric.inc:618
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/servkolab.tpl:41
+msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:315
-#: plugins/admin/systems/class_terminalGeneric.inc:362
-msgid ""
-"There must be at least one NTP server selected, or the inherit mode "
-"activated."
+#: plugins/admin/systems/servkolab.tpl:49
+msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/ogroups/class_termgroup.inc:290
-msgid "Saving workstation failed"
+#: plugins/admin/systems/servkolab.tpl:57
+msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:136
-#: plugins/admin/systems/class_servDB.inc:145
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:172
-#: plugins/admin/systems/class_servDB.inc:177
-#: plugins/admin/systems/class_servDB.inc:183
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
+#: plugins/admin/systems/servkolab.tpl:65
+msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:152
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+#: plugins/admin/systems/servkolab.tpl:73
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:156
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:167
-#, php-format
-msgid "The specified kerberos password is empty."
+#: plugins/admin/systems/servkolab.tpl:89
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:191
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/servkolab.tpl:100
+msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:245
-msgid "Saving server db settings failed"
+#: plugins/admin/systems/servkolab.tpl:116
+msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
+#: plugins/admin/systems/servkolab.tpl:121
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:8
-msgid "Workstation template"
+#: plugins/admin/systems/servkolab.tpl:136
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:10
-msgid "Workstation name"
+#: plugins/admin/systems/servkolab.tpl:141
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#: plugins/admin/systems/servkolab.tpl:157
+msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:179
-msgid "Please specify a valid path for your setup."
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:185
-msgid "Please specify a valid name for your share."
+#: plugins/admin/systems/servkolab.tpl:168
+msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:188
-msgid "Please specify a name for your share."
+#: plugins/admin/systems/servkolab.tpl:182
+msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:193
-msgid "Description contains invalid characters."
+#: plugins/admin/systems/servkolab.tpl:188
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:197
-msgid "Volume contains invalid characters."
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:201
-msgid "Path contains invalid characters."
+#: plugins/admin/systems/class_goKrbServer.inc:29
+msgid "Kerberos service"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:205
-msgid "Option contains invalid characters."
+#: plugins/admin/systems/class_goKrbServer.inc:49
+msgid "Kerberos kadmin access informations"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:351
-msgid "This zoneName is already in use"
+#: 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_servDNSeditZone.inc:354
-msgid "This reverse zone is already in use"
+#: plugins/admin/systems/class_goKrbServer.inc:138
+#, php-format
+msgid "The specified kerberos admin is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#: plugins/admin/systems/class_goKrbServer.inc:141
 #, php-format
-msgid "Please choose a valid zone name."
+msgid "The specified kerberos realm is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:363
-#, php-format
-msgid "Please choose a valid reverse zone name."
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:367
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:371
-msgid "Your specified mail address must end with '.' to be a valid record."
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/systems/class_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."
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:383
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:387
-msgid "Please specify a numeric value for serial number."
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:391
-msgid "Please specify a numeric value for refresh."
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:395
-msgid "Please specify a numeric value for ttl."
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:399
-msgid "Please specify a numeric value for expire."
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:403
-msgid "Please specify a numeric value for retry."
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:409
-#: plugins/admin/systems/class_termDNS.inc:365
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:94
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:100
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
 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/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
 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/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:199
-msgid "Removing kolab host entry failed"
+#: 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_servKolab.inc:215
-msgid "Removing server from kolab object failed"
+#: plugins/admin/systems/class_servService.inc:380
+msgid "Saving server service object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:254
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/class_servService.inc:411
+#: plugins/admin/systems/class_goShareServer.inc:287
+msgid "Creating mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:256
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/class_servService.inc:425
+#: plugins/admin/systems/class_goShareServer.inc:301
+msgid "Removing mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:260
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/class_servService.inc:437
+#: plugins/admin/systems/class_goShareServer.inc:313
+msgid "Saving mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:262
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:264
-msgid "Future days must be a value."
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:268
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:340
-msgid "Saving server to kolab object failed"
+#: plugins/admin/systems/servdnseditzone.tpl:27
+msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/servdnseditzone.tpl:39
+msgid "SOA record"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
+#: plugins/admin/systems/servdnseditzone.tpl:45
+msgid "Primary dns server for this zone"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
+#: 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/servdb.tpl:30
-msgid "FAX DB user"
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
+#: plugins/admin/systems/servdnseditzone.tpl:100
+msgid "MxRecords"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
+#: plugins/admin/systems/servdnseditzone.tpl:112
+msgid "Global zone records"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
+#: plugins/admin/systems/class_workstationGeneric.inc:184
+msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+msgid "Removing workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
+#: 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/servdb.tpl:74
-msgid "Server identifier"
+#: plugins/admin/systems/class_workstationGeneric.inc:348
+msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
+#: 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/servdb.tpl:91
-msgid "Sieve port"
+#: 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/servdb.tpl:100
-msgid "Logging database"
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+msgid "Parent server"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
+#: 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/servdb.tpl:119
-msgid "Glpi database"
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
+#: 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/terminalService.tpl:141
-msgid "Remote desktop"
+#: plugins/admin/systems/class_divListSystem.inc:58
+msgid "System / Department"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
+#: plugins/admin/systems/class_divListSystem.inc:64
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
+#: plugins/admin/systems/class_divListSystem.inc:67
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/class_divListSystem.inc:76
+msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:70
-msgid "Terminal Service"
+#: plugins/admin/systems/class_divListSystem.inc:109
+msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:75
-msgid "Temporary disable login"
+#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_systemManagement.inc:765
+msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:78
-msgid "Font path"
+#: plugins/admin/systems/class_divListSystem.inc:111
+msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:91
-msgid "Syslog Service"
+#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_systemManagement.inc:766
+msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:99
-msgid "Print Service"
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:113
+msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:107
-msgid "Mail server"
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/class_divListSystem.inc:115
+msgid "New Printer"
 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/class_divListSystem.inc:116
+#: plugins/admin/systems/class_divListSystem.inc:117
+msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:101
-msgid "Removing generic component failed"
+#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:119
+msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:139
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/class_divListSystem.inc:137
+msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:144
-#: plugins/admin/systems/class_phoneGeneric.inc:284
-msgid "The required field IP address is empty."
+#: plugins/admin/systems/class_divListSystem.inc:138
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:147
-#: plugins/admin/systems/class_phoneGeneric.inc:287
-msgid "The field IP address contains an invalid address."
+#: plugins/admin/systems/class_divListSystem.inc:139
+msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_winGeneric.inc:164
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/class_divListSystem.inc:140
+msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:223
-msgid "Saving generic component failed"
+#: plugins/admin/systems/class_divListSystem.inc:141
+msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:9
-msgid "Postfix mydomain"
+#: plugins/admin/systems/class_divListSystem.inc:142
+msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:16
-msgid "Postfix mydestination"
+#: plugins/admin/systems/class_divListSystem.inc:143
+msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:33
-msgid "POP3 service"
+#: plugins/admin/systems/class_divListSystem.inc:144
+msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:41
-msgid "POP3/SSL service"
+#: plugins/admin/systems/class_divListSystem.inc:145
+msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:49
-msgid "IMAP service"
+#: plugins/admin/systems/class_divListSystem.inc:146
+msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:57
-msgid "IMAP/SSL service"
+#: plugins/admin/systems/class_divListSystem.inc:163
+msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:65
-msgid "Sieve service"
+#: plugins/admin/systems/class_divListSystem.inc:164
+msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:73
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/class_divListSystem.inc:195
+msgid "Set root       password"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:89
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/class_servDB.inc:136
+#: plugins/admin/systems/class_servDB.inc:145
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:172
+#: plugins/admin/systems/class_servDB.inc:177
+#: plugins/admin/systems/class_servDB.inc:183
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:100
-msgid "Quota settings"
+#: plugins/admin/systems/class_servDB.inc:152
+#: plugins/admin/systems/class_goImapServer.inc:182
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:116
-msgid "Free/Busy settings"
+#: plugins/admin/systems/class_servDB.inc:156
+#: plugins/admin/systems/class_goImapServer.inc:186
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:121
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/class_servDB.inc:191
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:136
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/class_servDB.inc:245
+msgid "Saving server db settings failed"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:141
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:157
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:168
-msgid "Host used to relay mails"
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes all system and setup informations. Please double check if your "
+"really want to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:182
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/class_servNfs.inc:46
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:188
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_servNfs.inc:49
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
 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 and press the 'continue' button. If this "
-"system should be added to a group of system settings, specify the preferred "
-"object group below."
+#: plugins/admin/systems/class_servNfs.inc:179
+msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to "
-"be inherited."
+#: plugins/admin/systems/class_servNfs.inc:185
+msgid "Please specify a valid name for your share."
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:21
-msgid "Choose a system type"
+#: plugins/admin/systems/class_servNfs.inc:188
+msgid "Please specify a name for your share."
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Choose an object group as template"
+#: plugins/admin/systems/class_servNfs.inc:193
+msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose an object group"
+#: plugins/admin/systems/class_servNfs.inc:197
+msgid "Volume contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+#: plugins/admin/systems/class_servNfs.inc:201
+msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
+#: plugins/admin/systems/class_servNfs.inc:205
+msgid "Option contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
+#: plugins/admin/systems/servservice.tpl:70
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-msgid "New monitor"
+#: plugins/admin/systems/servservice.tpl:107
+msgid "Mail server"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-msgid "M"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
-msgid "Choose a base"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
 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."
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:51
-msgid "Filter entries with this syntax"
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:115
+#: plugins/admin/systems/class_serverService.inc:274
 #, php-format
-msgid "Select this base"
+msgid "The specified method '%s' can't executed for services."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
-#, php-format
+#: plugins/admin/systems/chooser.tpl:4
 msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
-msgid "Rename failed, this system type name is already used."
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
-msgid "Adding new operating system failed, specifed name is already used."
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
-#, php-format
-msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-msgid "Updating operating system failed, specifed name is already used."
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:566
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:569
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:667
-msgid "Can't remove glpi account, while mysql extension is missing."
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 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/servnfs.tpl:25
+msgid "Volume"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
+#: plugins/admin/systems/servnfs.tpl:94
+msgid "Codepage"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
+#: plugins/admin/systems/servnfs.tpl:104
+msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/class_servKolab.inc:99
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
+#: plugins/admin/systems/class_servKolab.inc:105
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/class_servKolab.inc:191
+msgid "Removing kolab host entry failed"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
+#: plugins/admin/systems/class_servKolab.inc:207
+msgid "Removing server from kolab object failed"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_servKolab.inc:246
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_servKolab.inc:248
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
+#: plugins/admin/systems/class_servKolab.inc:252
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
+#: plugins/admin/systems/class_servKolab.inc:254
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/systems/class_servKolab.inc:256
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/systems/class_servKolab.inc:260
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: plugins/admin/systems/class_servKolab.inc:332
+msgid "Saving server to kolab object failed"
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_servKolab.inc:354
+msgid "Kolab mail service"
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
+#: plugins/admin/systems/class_terminalGeneric.inc:98
+msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:132
-#, php-format
-msgid ""
-"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+#: plugins/admin/systems/class_terminalGeneric.inc:99
+msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:298
-msgid "The required field 'IP-address' is not set."
+#: plugins/admin/systems/class_terminalGeneric.inc:167
+msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:305
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/class_terminalGeneric.inc:179
+msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:312
-msgid "The required field 'MAC-address' is not set."
+#: plugins/admin/systems/class_terminalGeneric.inc:191
+msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid ""
-"The given macaddress is invalid. There must be 6 2byte segments seperated by "
-"':'."
+#: plugins/admin/systems/class_terminalGeneric.inc:319
+msgid "Removing terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:339
-#, php-format
-msgid "Found duplicate value for record type '%s'."
+#: plugins/admin/systems/class_terminalGeneric.inc:374
+msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:347
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
+#: plugins/admin/systems/class_terminalGeneric.inc:378
+msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: 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."
+#: plugins/admin/systems/class_terminalGeneric.inc:476
+msgid "Saving terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:448
-msgid "Saving terminal to DNS object failed"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
 msgstr ""
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid ""
-"This dialog allows you to select a user as technical responsible person."
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
-msgid "The selected name is already in use."
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
-#, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
-#, php-format
-msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
-msgid "There is no valid file uploaded."
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
-msgid "Upload wasn't successfull."
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-msgid "There is already a file with the same name uploaded."
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
-#, php-format
-msgid "Can't create file '%s'."
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
+#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:50
+msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
+#: plugins/admin/systems/class_winGeneric.inc:126
+msgid "Removing Samba workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
-msgid "Currently no file uploaded."
+#: plugins/admin/systems/class_winGeneric.inc:164
+#: plugins/admin/systems/class_componentGeneric.inc:155
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
-msgid "Mime"
+#: plugins/admin/systems/class_winGeneric.inc:224
+msgid "Saving Samba workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
+#: plugins/admin/systems/class_componentGeneric.inc:101
+msgid "Removing generic component failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-msgid "empty"
+#: plugins/admin/systems/class_componentGeneric.inc:139
+msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-msgid "Create new attachment"
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
+msgid "The required field IP address is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-msgid "New Attachment"
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
+msgid "The field IP address contains an invalid address."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
-msgid "Please specify a valid name for this attachment."
+#: plugins/admin/systems/class_componentGeneric.inc:223
+msgid "Saving generic component failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
 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/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:144
-#, 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."
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
 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/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:6
-msgid "List of configured repositories."
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:11
-msgid "Add repository"
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
+#: plugins/admin/systems/goMailServer.tpl:7
+msgid "Visible full qualified hostname"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
+#: plugins/admin/systems/goMailServer.tpl:10
+msgid "The full qualified host name."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
+#: plugins/admin/systems/goMailServer.tpl:14
+msgid "Max mail header size"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
+#: plugins/admin/systems/goMailServer.tpl:18
+msgid "This value specifies the maximal header size."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
+#: plugins/admin/systems/goMailServer.tpl:22
+msgid "Max mailbox size"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
+#: plugins/admin/systems/goMailServer.tpl:26
+msgid "Defines the maximal size of mail box."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:27
-msgid "Can't be edited because the zone wasn't saved right now."
+#: plugins/admin/systems/goMailServer.tpl:30
+msgid "Max message size"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:39
-msgid "SOA record"
+#: plugins/admin/systems/goMailServer.tpl:34
+msgid "Specify the maximal size of a message."
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:45
-msgid "Primary dns server for this zone"
+#: plugins/admin/systems/goMailServer.tpl:38
+msgid "Relay host"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:57
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/goMailServer.tpl:42
+msgid "Relay messages to following host:"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
+#: plugins/admin/systems/goMailServer.tpl:51
+msgid "Local networks"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
+#: plugins/admin/systems/goMailServer.tpl:52
+msgid "Postfix networks"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:100
-msgid "MxRecords"
+#: plugins/admin/systems/goMailServer.tpl:66
+msgid "Domains and routing"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:112
-msgid "Global zone records"
+#: plugins/admin/systems/goMailServer.tpl:74
+msgid "Domains to accept mail for"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:119
-msgid "Please enter a value for 'release'."
+#: plugins/admin/systems/goMailServer.tpl:75
+msgid "Postfix is responsible for the following domains:"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:123
-msgid "Please specify a valid value for 'url'."
+#: plugins/admin/systems/goMailServer.tpl:89
+msgid "Transports"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:170
-#, php-format
-msgid ""
-"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
+#: plugins/admin/systems/goMailServer.tpl:92
+msgid "Select a transport protocol."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:172
-#: plugins/admin/systems/class_workstationStartup.inc:1082
-#, php-format
-msgid ""
-"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
-"empty string."
+#: plugins/admin/systems/goMailServer.tpl:105
+msgid "Restrictions"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:126
-msgid "Removing Samba workstation failed"
+#: plugins/admin/systems/goMailServer.tpl:113
+msgid "Restrictions for sender"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:224
-msgid "Saving Samba workstation failed"
+#: plugins/admin/systems/goMailServer.tpl:116
+#: plugins/admin/systems/goMailServer.tpl:132
+msgid "Restriction filter"
 msgstr ""
 
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/systems/class_systemManagement.inc:738
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
+#: plugins/admin/systems/goMailServer.tpl:129
+msgid "Restrictions for recipient"
 msgstr ""
 
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/systems/class_systemManagement.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-msgid "Terminal"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
 msgstr ""
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/SelectDeviceType.tpl:3
 msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+"This is a new system which currently has no system type defined. Please "
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/SelectDeviceType.tpl:9
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
+#: plugins/admin/systems/SelectDeviceType.tpl:21
+msgid "Choose a system type"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: plugins/admin/systems/SelectDeviceType.tpl:32
+msgid "Choose an object group as template"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: plugins/admin/systems/SelectDeviceType.tpl:33
+msgid "Choose an object group"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
 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/glpiAttachmentEdit.tpl:46
+msgid "Filename"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
+#: plugins/admin/systems/class_termDNS.inc:132
+#, php-format
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
+#: plugins/admin/systems/class_termDNS.inc:298
+msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
+#: plugins/admin/systems/class_termDNS.inc:305
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/class_termDNS.inc:312
+msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
+#: plugins/admin/systems/class_termDNS.inc:319
+msgid ""
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
+"':'."
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
+#: plugins/admin/systems/class_termDNS.inc:339
+#, php-format
+msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:89
-msgid "text"
+#: plugins/admin/systems/class_termDNS.inc:347
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-msgid "graphic"
+#: 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 ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:128
-msgid "No WAKECMD definition found in your gosa.conf"
+#: 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 ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:140
-msgid "No REBOOTCMD definition found in your gosa.conf"
+#: plugins/admin/systems/class_termDNS.inc:448
+msgid "Saving terminal to DNS object failed"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:152
-msgid "No HALTCMD definition found in your gosa.conf"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-msgid "Removing terminal failed"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+msgid "The selected name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:335
-msgid "You have no permissions to create a terminal on this 'Base'."
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:339
-msgid "The required field 'Terminal name' is not set."
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:436
-msgid "Saving terminal failed"
+#: plugins/admin/systems/class_goNtpServer.inc:70
+msgid "NTP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:61
-msgid "This 'dn' has no server features."
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:148
-msgid "Removing server failed"
+#: plugins/admin/systems/class_servRepository.inc:35
+#: plugins/admin/systems/class_servRepository.inc:392
+msgid "Repository service"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:184
-msgid "The required field 'Server name' is not set."
+#: 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_servGeneric.inc:191
-msgid "You have no permissions to create a server on this 'Base'."
+#: 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_servGeneric.inc:260
-msgid "Saving server failed"
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:93
@@ -9673,65 +10278,13 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:109
-msgid "yes"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:110
-msgid "no"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:225
-msgid "dynamic"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:225
-msgid "Networksettings"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:240
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:247
-msgid "Removing phone failed"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:292
-msgid "The required field 'Phone name' is not set."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:295
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:302
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:397
-msgid "Saving phone failed"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-msgid "Select"
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "New entry"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
@@ -9781,93 +10334,189 @@ msgstr ""
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-msgid "Display members of department"
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-msgid "Display members matching"
+#: plugins/admin/systems/class_systemManagement.inc:236
+msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-msgid "Regular expression for matching member names"
+#: plugins/admin/systems/class_systemManagement.inc:253
+msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#: plugins/admin/systems/class_systemManagement.inc:307
 #, php-format
+msgid "You're about to delete all information about the component at '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:632
+msgid "New terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:634
+msgid "New workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:636
+msgid "New Device"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:651
+msgid "Terminal template for"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:663
+msgid "Workstation template for"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:751
+msgid "New System from incoming"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:754
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:379
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:755
+msgid "Workstation is installing"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:756
+msgid "Workstation is waiting for action"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:757
+msgid "Workstation installation failed"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:760
+msgid "Server is installing"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:761
+msgid "Server is waiting for action"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:762
+msgid "Server installation failed"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:763
+msgid "Winstation"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:764
+msgid "Network Device"
+msgstr ""
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
+msgid ""
+"Be careful editing record types with this dialog. All changes will be saved "
+"immediately when using the save button."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+msgid ""
+"This dialog can't be used until the currently edited zone was saved or the "
+"zone entry exists in the ldap database."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
-#, php-format
-msgid "Selected vendor '%s' does not exists in our list of ppds."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "Create a new DNS zone entry"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
-msgid "Printer ppd selection."
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:691
+#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
+msgid "This zoneName is already in use"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
+msgid "This reverse zone is already in use"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#, php-format
+msgid "Please choose a valid zone name."
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#, php-format
+msgid "Please choose a valid reverse zone name."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
+msgid "Your specified mail address must end with '.' to be a valid record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
+msgid "Only lowercase strings are allowed as zone name."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
+msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:33
-msgid "Volume"
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
+msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
+msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:94
-msgid "Codepage"
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
+msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:104
-msgid "Option"
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
+msgid "Please specify a numeric value for retry."
 msgstr ""
 
 #: plugins/admin/systems/class_printGeneric.inc:103
@@ -9965,356 +10614,278 @@ msgstr ""
 msgid "Saving printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
+msgid "Choose a base"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:236
-msgid "Passwords entered as new and repeated do not match!"
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:253
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:307
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
 #, php-format
-msgid "You're about to delete all information about the component at '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:616
-msgid "New terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:618
-msgid "New workstation"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:620
-msgid "New Device"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:635
-msgid "Terminal template for"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:647
-msgid "Workstation template for"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:735
-msgid "New System from incoming"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:739
-msgid "Workstation is installing"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:740
-msgid "Workstation is waiting for action"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:741
-msgid "Workstation installation failed"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:744
-msgid "Server is installing"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:745
-msgid "Server is waiting for action"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:746
-msgid "Server installation failed"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:747
-msgid "Winstation"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:748
-msgid "Network Device"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:749
-#: plugins/admin/systems/class_divListSystem.inc:96
-msgid "New Terminal"
+msgid "Select this base"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:750
-#: plugins/admin/systems/class_divListSystem.inc:98
-msgid "New Workstation"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:306
-#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
 #, php-format
 msgid ""
-"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
-"exist."
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:413
-msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+msgid "There is no valid file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:458
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:516
-msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:856
-#, 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/class_glpiAttachmentPool.inc:138
+msgid "There is already a file with the same name uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:867
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
 #, 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."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationStartup.inc:1030
-msgid "Saving workstation startup settings failed"
+msgid "Can't create file '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1080
-#, php-format
-msgid ""
-"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:386
-msgid "Saving terminal startup settings failed"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+msgid "Mime"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Details"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:39
-msgid "Printer location"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+msgid "empty"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:43
-msgid "Printer URL"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70
-msgid "Users which are allowed to use this printer"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
+msgid "Please specify a valid name for this attachment."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
-msgid "Add user"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
-msgid "Add group"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
+msgid ""
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:86
-msgid "Users which are allowed to administrate this printer"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:87
-msgid "Admins"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:37
-#: plugins/admin/systems/class_divListSystem.inc:38
-msgid "List of systems"
+#: plugins/admin/systems/class_goMailServer.inc:44
+msgid "Mail service (SMTP)"
 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."
+#: plugins/admin/systems/class_goMailServer.inc:482
+msgid "Postfix"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:52
-msgid "System / Department"
+#: plugins/admin/systems/class_goMailServer.inc:619
+msgid "Please specify a numeric value for header size limit."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:56
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/class_goMailServer.inc:623
+msgid "Please specify a numeric value for mailbox size limit."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:57
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/class_goMailServer.inc:627
+msgid "Please specify a numeric value for message size limit."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:57
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
+msgid "Please enter a value for 'release'."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:58
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
+msgid "Please specify a valid value for 'url'."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:58
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:59
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/class_goImapServer.inc:48
+msgid "IMAP/POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:59
-msgid "Show windows based workstations"
+#: plugins/admin/systems/class_goImapServer.inc:53
+msgid "Repair database"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:60
-msgid "Select to see network printers"
+#: plugins/admin/systems/class_goImapServer.inc:83
+msgid "Cyrus service"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:60
-msgid "Show network printers"
+#: plugins/admin/systems/class_goImapServer.inc:168
+msgid "Please specify a server identifier."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/class_goImapServer.inc:171
+msgid "Please specify a connect url."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/class_goImapServer.inc:174
+msgid "Please specify an admin user."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
-msgid "Select to see network devices"
+#: plugins/admin/systems/class_goImapServer.inc:177
+msgid "Please specify a password for the admin user."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
-msgid "Show network devices"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:70
-msgid "Display systems of user"
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:122
+msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:96
-msgid "New Terminal template"
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:123
+msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:98
-msgid "New Workstation template"
+#: plugins/admin/systems/class_phoneGeneric.inc:225
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:99
-#: plugins/admin/systems/class_divListSystem.inc:100
-msgid "New Server"
+#: plugins/admin/systems/class_phoneGeneric.inc:225
+msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:101
-#: plugins/admin/systems/class_divListSystem.inc:102
-msgid "New Printer"
+#: plugins/admin/systems/class_phoneGeneric.inc:240
+#, php-format
+msgid ""
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/systems/class_divListSystem.inc:104
-msgid "New Phone"
+#: plugins/admin/systems/class_phoneGeneric.inc:247
+msgid "Removing phone failed"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:105
-#: plugins/admin/systems/class_divListSystem.inc:106
-msgid "New Component"
+#: plugins/admin/systems/class_phoneGeneric.inc:292
+msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:123
-msgid "Cups Server"
+#: plugins/admin/systems/class_phoneGeneric.inc:295
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:124
-msgid "Log Db"
+#: plugins/admin/systems/class_phoneGeneric.inc:302
+msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:125
-msgid "Syslog Server"
+#: plugins/admin/systems/class_phoneGeneric.inc:397
+msgid "Saving phone failed"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:126
-msgid "Mail Server"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:127
-msgid "Imap Server"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:128
-msgid "Nfs Server"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:129
-msgid "Kerberos Server"
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member names"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:130
-msgid "Asterisk Server"
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:131
-msgid "Fax Server"
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:132
-msgid "Ldap Server"
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:135
-msgid "Edit system"
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#, php-format
+msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:136
-msgid "Delete system"
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+msgid "Printer ppd selection."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:173
-msgid "Set root       password"
+#: plugins/admin/systems/class_goShareServer.inc:31
+msgid "File service"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:58
-#: plugins/admin/ogroups/tabs_ogroups.inc:161
+#: plugins/admin/ogroups/tabs_ogroups.inc:61
+#: plugins/admin/ogroups/tabs_ogroups.inc:168
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:84
+#: plugins/admin/ogroups/tabs_ogroups.inc:87
 msgid "System"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
 msgid "Terminals"
 msgstr ""
 
@@ -10420,87 +10991,87 @@ msgid ""
 "large number of groups."
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:52
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Name of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:57
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
 msgid "Select to see groups containing users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:57
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
 msgid "Show groups containing users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:58
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
 msgid "Select to see groups containing groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:58
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
 msgid "Show groups containing groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
 msgid "Select to see groups containing applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
 msgid "Show groups containing applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
 msgid "Select to see groups containing departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
 msgid "Show groups containing departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:61
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
 msgid "Select to see groups containing servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:61
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
 msgid "Show groups containing servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:62
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
 msgid "Select to see groups containing workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:62
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
 msgid "Show groups containing workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:63
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
 msgid "Select to see groups containing terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:63
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
 msgid "Show groups containing terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:64
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
 msgid "Select to see groups containing printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:64
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
 msgid "Show groups containing printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:65
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
 msgid "Select to see groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:65
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
 msgid "Show groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#: plugins/admin/ogroups/class_divListOGroup.inc:122
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:163
+#: plugins/admin/ogroups/class_divListOGroup.inc:184
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
@@ -10898,28 +11469,42 @@ msgid ""
 "large number of macros."
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:47
+#: plugins/gofon/macro/class_divListMacros.inc:52
+msgid "macro name"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:53
 msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/macro/class_divListMacros.inc:60
 #: plugins/gofon/macro/headpage.tpl:41
 msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:83
+#: plugins/gofon/macro/class_divListMacros.inc:96
 msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:136
+msgid "Edit macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:118
+#: plugins/gofon/macro/class_divListMacros.inc:138
+msgid "Delete macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_divListMacros.inc:121
 msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:122
 msgid "visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:123
 msgid "invisible"
 msgstr ""
 
@@ -10927,13 +11512,13 @@ msgstr ""
 msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:209
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:215
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:242
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
 msgid "You are not allowed to delete this macro!"
 msgstr ""
 
@@ -11199,10 +11784,6 @@ msgstr ""
 msgid "Saving phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr ""
-
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
@@ -11252,28 +11833,28 @@ msgid ""
 "selectors on top of the conferences list."
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:46
+#: plugins/gofon/conference/class_divListConferences.inc:52
 msgid "Name - Number"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:48
+#: plugins/gofon/conference/class_divListConferences.inc:54
 #: plugins/gofon/conference/generic.tpl:112
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:55
+#: plugins/gofon/conference/class_divListConferences.inc:61
 msgid "Regular expression for matching conference names"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:90
 msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:90
 msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:135
+#: plugins/gofon/conference/class_divListConferences.inc:160
 msgid "Conference"
 msgstr ""
 
@@ -11387,11 +11968,6 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/welcome/main.inc:24
-#, php-format
-msgid "Welcome %s!"
-msgstr ""
-
 #: plugins/generic/welcome/welcome.tpl:4
 msgid ""
 "This is the GOsa main menu. You can select your tasks from the menu on the "
@@ -11409,6 +11985,11 @@ msgstr ""
 msgid "The GOsa team"
 msgstr ""
 
+#: plugins/generic/welcome/main.inc:24
+#, php-format
+msgid "Welcome %s!"
+msgstr ""
+
 #: include/class_mail-methods-cyrus.inc:39
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
@@ -11419,45 +12000,45 @@ msgid ""
 "settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:127
+#: include/class_mail-methods-cyrus.inc:129
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:146
+#: include/class_mail-methods-cyrus.inc:148
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:172
+#: include/class_mail-methods-cyrus.inc:174
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:190
+#: include/class_mail-methods-cyrus.inc:192
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:212
+#: include/class_mail-methods-cyrus.inc:214
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:240
+#: include/class_mail-methods-cyrus.inc:242
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:253
+#: include/class_mail-methods-cyrus.inc:255
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:324
+#: include/class_mail-methods-cyrus.inc:326
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:328
+#: include/class_mail-methods-cyrus.inc:330
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
@@ -11466,17 +12047,81 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr ""
 
-#: include/class_password-methods.inc:165
+#: include/class_plugin.inc:401
 #, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
+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_password-methods.inc:181 include/class_plugin.inc:577
+#: 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."
@@ -11909,7 +12554,6 @@ msgstr ""
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
 #: include/functions_setup.inc:1061 html/index.php:244
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -12008,6 +12652,24 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
+#: include/class_MultiSelectWindow.inc:393
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:494
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:494
+msgid "Create a new snapshot from this object"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:498
+msgid "Restore snapshot"
+msgstr ""
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -12036,7 +12698,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:375
+#: include/php_setup.inc:71 html/main.php:380
 msgid "Toggle information"
 msgstr ""
 
@@ -12044,166 +12706,32 @@ msgstr ""
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:87
-msgid "class"
-msgstr ""
-
-#: include/php_setup.inc:93
-msgid "function"
-msgstr ""
-
-#: include/php_setup.inc:98
-msgid "static"
-msgstr ""
-
-#: include/php_setup.inc:102
-msgid "method"
-msgstr ""
-
-#: include/php_setup.inc:129
-msgid "Trace"
-msgstr ""
-
-#: include/php_setup.inc:130
-msgid "Line"
-msgstr ""
-
-#: include/php_setup.inc:131
-msgid "Arguments"
-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_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-
-#: include/class_pluglist.inc:115
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-msgstr ""
-
-#: include/class_pluglist.inc:129 include/class_pluglist.inc:130
-#: include/class_pluglist.inc:229
-msgid "Unknown"
-msgstr ""
-
-#: include/class_pluglist.inc:137 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:152
-#, php-format
-msgid "You are going to copy the entry '%s'."
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:216
-msgid "Paste"
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:218
-msgid "Can't paste"
-msgstr ""
-
-#: include/class_ldap.inc:195
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:227
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:447
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: include/class_ldap.inc:450
-msgid "Processing"
-msgstr ""
-
-#: include/class_ldap.inc:490
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: include/class_ldap.inc:553
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr ""
-
-#: include/class_ldap.inc:701
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-
-#: include/class_ldap.inc:770
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr ""
-
-#: include/class_ldap.inc:772
-#, php-format
-msgid "while operating on LDAP server %s"
+#: include/php_setup.inc:87
+msgid "class"
 msgstr ""
 
-#: include/class_ldap.inc:968
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+#: include/php_setup.inc:93
+msgid "function"
 msgstr ""
 
-#: include/class_ldap.inc:981
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+#: include/php_setup.inc:98
+msgid "static"
 msgstr ""
 
-#: include/class_ldap.inc:997
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+#: include/php_setup.inc:102
+msgid "method"
 msgstr ""
 
-#: include/class_config.inc:70
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+#: include/php_setup.inc:129
+msgid "Trace"
 msgstr ""
 
-#: include/class_config.inc:197 html/index.php:203
-msgid "Can't bind to LDAP. Please contact the system administrator."
+#: include/php_setup.inc:130
+msgid "Line"
 msgstr ""
 
-#: include/class_config.inc:456
-msgid "SID and/or RIDBASE missing in your configuration!"
+#: include/php_setup.inc:131
+msgid "Arguments"
 msgstr ""
 
 #: include/functions.inc:298
@@ -12329,10 +12857,23 @@ msgstr ""
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:376
+#: 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 ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
+"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
@@ -12340,41 +12881,121 @@ msgstr ""
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_plugin.inc:397
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_pluglist.inc:115
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr ""
+
+#: include/class_pluglist.inc:129 include/class_pluglist.inc:130
+#: include/class_pluglist.inc:229
+msgid "Unknown"
+msgstr ""
+
+#: include/class_pluglist.inc:137 ihtml/themes/default/framework.tpl:14
+#: ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:152
+#, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:216
+msgid "Paste"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:218
+msgid "Can't paste"
+msgstr ""
+
+#: include/class_config.inc:70
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:197 html/index.php:203
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:461
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr ""
+
+#: include/class_ldap.inc:196
 #, php-format
 msgid ""
-"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
 msgstr ""
 
-#: include/class_plugin.inc:543
+#: include/class_ldap.inc:228
 #, php-format
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:448
+#, php-format
+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 ""
 
-#: include/class_plugin.inc:611
+#: include/class_ldap.inc:702
 #, php-format
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
 
-#: include/class_plugin.inc:917
+#: include/class_ldap.inc:771
 #, php-format
-msgid "Object '%s' is already tagged"
+msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:924
+#: include/class_ldap.inc:773
 #, php-format
-msgid "Adding tag (%s) to object '%s'"
+msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_plugin.inc:938 include/class_plugin.inc:967
-msgid "Handle object tagging failed"
+#: include/class_ldap.inc:995
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
 
-#: include/class_plugin.inc:954
+#: include/class_ldap.inc:1024
 #, php-format
-msgid "Removing tag from object '%s'"
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_ldap.inc:1146
+msgid "Ldap import failed"
+msgstr ""
+
+#: include/class_SnapShotDialog.inc:79
+msgid "Please specify a valid description for this snapshot."
 msgstr ""
 
 #: html/getvcard.php:36
@@ -12497,180 +13118,253 @@ msgstr ""
 msgid "Computers of %s on %s"
 msgstr ""
 
-#: html/getfax.php:53
-msgid "Could not connect to database server!"
+#: html/index.php:49 html/index.php:331
+msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/getfax.php:55
-msgid "Could not select database!"
+#: html/index.php:49 html/index.php:331
+msgid "Enter SSL session"
 msgstr ""
 
-#: html/getfax.php:60 html/getfax.php:68
-msgid "Database query failed!"
+#: html/index.php:113
+#, php-format
+msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/getkiosk.php:25
+#: html/index.php:134
 #, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
+msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
+#: html/index.php:215
+msgid ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
 msgstr ""
 
-#: html/get_attachment.php:47
+#: html/index.php:224
 msgid ""
-"Can't connect to glpi database, there is no mysl extension available in your "
-"php setup."
+"Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/get_attachment.php:55
+#: html/index.php:252
+msgid "Please specify a valid username!"
+msgstr ""
+
+#: html/index.php:254
+msgid "Please specify your password!"
+msgstr ""
+
+#: html/index.php:261
+msgid "Please check the username/password combination."
+msgstr ""
+
+#: html/index.php:285
+msgid "Account locked. Please contact your system administrator."
+msgstr ""
+
+#: html/index.php:337
 msgid ""
-"Can't connect to specified database, please check your glpi configuration."
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
 msgstr ""
 
-#: html/get_attachment.php:64
-msgid "Can't get specified attachment file, there is no entry with this id."
+#: html/helpviewer.php:67
+msgid "Help browser"
 msgstr ""
 
-#: html/get_attachment.php:69
+#: html/helpviewer.php:118
+msgid "There is no helpfile specified for this class"
+msgstr ""
+
+#: html/helpviewer.php:265
 #, php-format
-msgid "Can't open file '%s'."
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
-#: html/main.php:159
+#: html/getfax.php:53
+msgid "Could not connect to database server!"
+msgstr ""
+
+#: html/getfax.php:55
+msgid "Could not select database!"
+msgstr ""
+
+#: html/getfax.php:60 html/getfax.php:68
+msgid "Database query failed!"
+msgstr ""
+
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr ""
+
+#: html/getkiosk.php:30
+#, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr ""
+
+#: html/main.php:164
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:201
+#: html/main.php:206
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:336
+#: html/main.php:341
 #, php-format
 msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:351
+#: html/main.php:356
 msgid "Your password is about to expire, please change your password"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:380
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
 msgstr ""
 
-#: html/index.php:49 html/index.php:331
-msgid "Session will not be encrypted."
+#: html/get_attachment.php:47
+msgid ""
+"Can't connect to glpi database, there is no mysl extension available in your "
+"php setup."
 msgstr ""
 
-#: html/index.php:49 html/index.php:331
-msgid "Enter SSL session"
+#: html/get_attachment.php:55
+msgid ""
+"Can't connect to specified database, please check your glpi configuration."
 msgstr ""
 
-#: html/index.php:113
-#, php-format
-msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
+#: html/get_attachment.php:64
+msgid "Can't get specified attachment file, there is no entry with this id."
 msgstr ""
 
-#: html/index.php:134
+#: html/get_attachment.php:69
 #, php-format
-msgid "Directory '%s' specified as compile directory is not accessible!"
+msgid "Can't open file '%s'."
 msgstr ""
 
-#: html/index.php:215
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:4
 msgid ""
-"GOsa cannot retrieve information about the installed schema files. Please "
-"make sure, that this is possible."
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:21
+msgid "Operation complete"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
 
-#: html/index.php:224
-msgid ""
-"Your ldap setup contains old schema definitions. Please re-run the setup."
+#: ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
 msgstr ""
 
-#: html/index.php:252
-msgid "Please specify a valid username!"
+#: ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' button."
 msgstr ""
 
-#: html/index.php:254
-msgid "Please specify your password!"
+#: ihtml/themes/default/framework.tpl:15
+msgid "Main"
 msgstr ""
 
-#: html/index.php:261
-msgid "Please check the username/password combination."
+#: ihtml/themes/default/framework.tpl:20
+msgid "Help"
 msgstr ""
 
-#: html/index.php:285
-msgid "Account locked. Please contact your system administrator."
+#: ihtml/themes/default/framework.tpl:25
+msgid "Sign out"
 msgstr ""
 
-#: html/index.php:337
-msgid ""
-"Your browser has cookies disabled. Please enable cookies and reload this "
-"page before logging in!"
+#: ihtml/themes/default/framework.tpl:33
+msgid "Signed in:"
 msgstr ""
 
-#: html/helpviewer.php:67
-msgid "Help browser"
+#: ihtml/themes/default/setup_finish.tpl:1
+msgid "Setup finished"
 msgstr ""
 
-#: html/helpviewer.php:118
-msgid "There is no helpfile specified for this class"
+#: ihtml/themes/default/setup_finish.tpl:3
+msgid ""
+"Basically the setup is finished. You can check the result of the schema "
+"check here and download the autogenerated gosa.conf below."
 msgstr ""
 
-#: html/helpviewer.php:265
-#, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+#: ihtml/themes/default/setup_finish.tpl:7
+msgid "Schema Configuration"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
-msgid "Session conflict detected"
+#: ihtml/themes/default/setup_finish.tpl:12
+msgid "Configuration File"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/setup_finish.tpl:14
 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."
+"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/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
-msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+#: ihtml/themes/default/setup_finish.tpl:17
+msgid "Download configuration"
 msgstr ""
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
-msgid "Logout"
+#: ihtml/themes/default/setup_finish.tpl:20
+msgid ""
+"After placing the file under /etc/gosa, place make sure that the webserver "
+"user is able to read gosa.conf, while other users shouldn't. You may want to "
+"execute these commands to achieve this requirement:"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
 "configuration by performing three major steps: first we'll check the PHP "
 "installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
+"needed programms and after you've provided basic information for your LDAP "
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_introduction.tpl:17
+msgid ""
+"You can also use the new and more-advanced way of inspecting your PHP-"
+"installation. It will give you information about the exact function that "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
+msgstr ""
+
 #: ihtml/themes/default/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
@@ -12679,24 +13373,38 @@ msgid ""
 "create the missing entries."
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:14
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
+#: ihtml/themes/default/login.tpl:14
+msgid "Please use your username and password to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
 #: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+#: ihtml/themes/default/login.tpl:57
 msgid "Sign in"
 msgstr ""
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+#: ihtml/themes/default/login.tpl:58
 msgid "Click here to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:10
+msgid "Sign in again"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl:3
 msgid ""
 "The size limit option makes LDAP operations faster and saves the LDAP server "
 "from getting too much load. The easiest way to handle big databases without "
@@ -12704,69 +13412,59 @@ msgid ""
 "filters to get the entries you are looking for."
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+#: ihtml/themes/default/sizelimit.tpl:6
 msgid "Please choose the way to react for this session"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+#: ihtml/themes/default/sizelimit.tpl:9
 msgid "ignore this error and show all entries the LDAP server returns"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
 #: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15
-msgid "Main"
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+msgid "Setup continued..."
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20
-msgid "Help"
+#: ihtml/themes/default/setup_step2.tpl:4
+msgid ""
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25
-msgid "Sign out"
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
 msgstr ""
 
-#: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33
-msgid "Signed in:"
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+msgid "Old Password"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+msgid "New Password"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+msgid "Verify Password"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
+#: ihtml/themes/default/accountexpired.tpl:51
+msgid "Change Password"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
-msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
+#: ihtml/themes/default/accountexpired.tpl:52
+msgid "Click here to Change your password"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
@@ -12776,31 +13474,26 @@ msgid ""
 "is organized will be asked later on."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step3.tpl:10
 #: ihtml/themes/default/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
+"(Example: ldap://your.server:389)."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:2
 #: ihtml/themes/default/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:7
 #: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:11
 #: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:18
 #: ihtml/themes/default/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
@@ -12808,17 +13501,14 @@ msgid ""
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
 #: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
 #: ihtml/themes/default/setup_step4.tpl:27
 msgid "Admin password"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -12826,32 +13516,26 @@ msgid ""
 "values below if the fit your needs."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:39
 #: ihtml/themes/default/setup_step4.tpl:39
 msgid "Base "
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:43
 #: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:47
 #: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:55
 #: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:59
 #: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:67
 #: ihtml/themes/default/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
@@ -12859,12 +13543,10 @@ msgid ""
 "used here, too."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:72
 #: ihtml/themes/default/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:83
 #: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
@@ -12872,177 +13554,80 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:88
 #: ihtml/themes/default/setup_step4.tpl:88
 msgid "Mail method"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
 "GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting. "
-"(But it  could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
 msgid "Display PHP errors"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
 msgid "true"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
 msgid "false"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
-msgid "Setup finished"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
-msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
-msgid "Schema Configuration"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:12
-#: ihtml/themes/default/setup_finish.tpl:12
-msgid "Configuration File"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:14
-#: ihtml/themes/default/setup_finish.tpl:14
-msgid ""
-"GOsa setup has collected all data needed to create an initial configuration "
-"file. Save the the link below as your gosa.conf and place that file in /etc/"
-"gosa. Change it as needed."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:17
-#: ihtml/themes/default/setup_finish.tpl:17
-msgid "Download configuration"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_finish.tpl:20
-#: ihtml/themes/default/setup_finish.tpl:20
-msgid ""
-"After placing the file under /etc/gosa, place make sure that the webserver "
-"user is able to read gosa.conf, while other users shouldn't. You may want to "
-"execute these commands to achieve this requirement:"
-msgstr ""
-
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
-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."
-msgstr ""
-
-#: ihtml/themes/default/copyPasteDialog.tpl:21
-msgid "Operation complete"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""
-
-#: ihtml/themes/default/islocked.tpl: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."
-msgstr ""
-
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic information for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+#: ihtml/themes/default/conflict.tpl:2
+msgid "Session conflict detected"
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/default/conflict.tpl:6
 msgid ""
-"You can also use the new and more-advanced way of inspecting your PHP-"
-"installation. It will give you information about the exact function that "
-"could not be found (functions that could be found are not mentioned). This "
-"is useful if you know what you're doing."
-msgstr ""
-
-#: ihtml/themes/default/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
-msgstr ""
-
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
+"Probably there's another active instance of your session. Multiple window "
+"operation is technical not possible and heavily depends on the browser "
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
+"possible. Pressing the Logout button will close this session."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:7
+#: ihtml/themes/default/conflict.tpl:10
 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."
+"Ignoring this message will change/destroy the data you're currently editing, "
+"so please close multiple windows and log in again."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:10
-msgid "Sign in again"
+#: ihtml/themes/default/conflict.tpl:14
+msgid "Logout"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:15
-msgid "Your Password has expired !! Choose a new Password"
+#: ihtml/themes/default/snapshotdialog.tpl:3
+msgid "Restoring an object snapshot"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:23
-#: ihtml/themes/default/accountexpired.tpl:27
-msgid "Old Password"
+#: ihtml/themes/default/snapshotdialog.tpl:6
+#: ihtml/themes/default/snapshotdialog.tpl:57
+msgid "This procedure will create a working snapshot of the selected object."
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:32
-#: ihtml/themes/default/accountexpired.tpl:36
-msgid "New Password"
+#: ihtml/themes/default/snapshotdialog.tpl:13
+#: ihtml/themes/default/snapshotdialog.tpl:62
+msgid "You will be able to restore from"
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:41
-#: ihtml/themes/default/accountexpired.tpl:45
-msgid "Verify Password"
+#: ihtml/themes/default/snapshotdialog.tpl:15
+msgid "There are no available snapshots."
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:51
-msgid "Change Password"
+#: ihtml/themes/default/snapshotdialog.tpl:25
+msgid "There is no snapshot available that could be restored."
 msgstr ""
 
-#: ihtml/themes/default/accountexpired.tpl:52
-msgid "Click here to Change your password"
+#: ihtml/themes/default/snapshotdialog.tpl:27
+msgid "Choose a snapshot and click continue, to restore the snapshot."
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
+#: ihtml/themes/default/snapshotdialog.tpl:54
+msgid "Creating an object snapshot"
 msgstr ""