update spanish translation

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index f09d262df266e60421fc9c8fd457ccbd9d3f051d..8a554d61fe3970ee1792443908ec5a48ee480005 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-16 12:07+0200\n"
+"POT-Creation-Date: 2007-09-19 19:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,23 +24,28 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:79
+#: contrib/gosa.conf:89
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
-#: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:120 contrib/gosa.conf:144 contrib/gosa.conf:148
+#: contrib/gosa.conf:157 contrib/gosa.conf:163 contrib/gosa.conf:168
+#: contrib/gosa.conf:174 contrib/gosa.conf:184 contrib/gosa.conf:213
+#: contrib/gosa.conf:228 contrib/gosa.conf:234 contrib/gosa.conf:257
+#: contrib/gosa.conf:263 contrib/gosa.conf:269 contrib/gosa.conf:273
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
-#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/addons/gotomasses/goto_task.tpl:4 plugins/admin/groups/mail.tpl:7
+#: plugins/admin/systems/dhcp_host.tpl:2 plugins/admin/systems/servkolab.tpl:6
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/glpi.tpl:6 plugins/admin/systems/dhcp_group.tpl:2
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:2
+#: plugins/admin/systems/dhcp_subnet.tpl:2
 #: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/systems/dhcp_pool.tpl:2
+#: plugins/admin/systems/dhcp_service.tpl:1
 #: plugins/admin/systems/glpiPrinter.tpl:6
 #: plugins/admin/mimetypes/paste_generic.tpl:4
 #: plugins/admin/mimetypes/generic.tpl:4 plugins/admin/ogroups/termgroup.tpl:6
@@ -62,55 +67,55 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:105
+#: contrib/gosa.conf:121
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:106 contrib/gosa.conf:133
+#: contrib/gosa.conf:122 contrib/gosa.conf:149
 #: plugins/admin/groups/class_divListGroup.inc:131
-#: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
+#: plugins/admin/users/class_divListUsers.inc:144
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
 #: plugins/personal/environment/class_environment.inc:7
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:107 contrib/gosa.conf:135
+#: contrib/gosa.conf:123 contrib/gosa.conf:151
 #: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/users/class_divListUsers.inc:146
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/ogroups/tabs_ogroups.inc:77
-#: plugins/admin/ogroups/tabs_ogroups.inc:210
+#: plugins/admin/ogroups/tabs_ogroups.inc:79
+#: plugins/admin/ogroups/tabs_ogroups.inc:209
 #: plugins/admin/ogroups/paste_mail.tpl:4
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:108 plugins/admin/groups/class_divListGroup.inc:125
-#: plugins/admin/users/class_divListUsers.inc:149
+#: contrib/gosa.conf:124 plugins/admin/groups/class_divListGroup.inc:125
+#: plugins/admin/users/class_divListUsers.inc:152
 #: plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:110 contrib/gosa.conf:113
-#: plugins/admin/users/class_divListUsers.inc:151
+#: contrib/gosa.conf:126 contrib/gosa.conf:129
+#: plugins/admin/users/class_divListUsers.inc:154
 #: plugins/personal/netatalk/class_netatalk.inc:36
 msgid "Netatalk"
 msgstr ""
 
-#: contrib/gosa.conf:116
+#: contrib/gosa.conf:132
 #: plugins/personal/connectivity/class_connectivity.inc:15
 #: plugins/personal/connectivity/main.inc:143
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:117 plugins/gofax/faxaccount/paste_generic.tpl:8
+#: contrib/gosa.conf:133 plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39
-#: plugins/admin/users/class_divListUsers.inc:147
+#: plugins/admin/users/class_divListUsers.inc:150
 #: plugins/admin/departments/generic.tpl:67
 #: plugins/personal/generic/generic.tpl:271
 #: plugins/personal/generic/generic.tpl:402 html/getxls.php:174
@@ -118,7 +123,7 @@ msgstr ""
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:118 plugins/addons/addressbook/address_edit.tpl:85
+#: contrib/gosa.conf:134 plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
@@ -126,7 +131,7 @@ msgstr ""
 #: plugins/admin/groups/class_divListGroup.inc:129
 #: plugins/admin/systems/class_systemManagement.inc:869
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/users/class_divListUsers.inc:148
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/personal/generic/generic.tpl:254
@@ -136,33 +141,33 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:120 plugins/personal/scalix/class_scalixAccount.inc:16
+#: contrib/gosa.conf:136 plugins/personal/scalix/class_scalixAccount.inc:16
 msgid "Scalix"
 msgstr ""
 
-#: contrib/gosa.conf:123 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:139 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:134
+#: contrib/gosa.conf:150
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:89
 #: plugins/admin/mimetypes/generic.tpl:130
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:136
+#: contrib/gosa.conf:152
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:153 contrib/gosa.conf:159 contrib/gosa.conf:164
+#: contrib/gosa.conf:170 contrib/gosa.conf:180 contrib/gosa.conf:209
+#: contrib/gosa.conf:224 contrib/gosa.conf:230 contrib/gosa.conf:236
+#: contrib/gosa.conf:259 contrib/gosa.conf:265
 msgid "References"
 msgstr ""
 
-#: contrib/gosa.conf:142 plugins/admin/systems/class_servRepository.inc:282
+#: contrib/gosa.conf:158 plugins/admin/systems/class_servRepository.inc:283
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/applications/generic.tpl:73
 #: plugins/admin/ogroups/phonequeue.tpl:35
@@ -170,21 +175,21 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:153 plugins/gofon/phoneaccount/class_phoneAccount.inc:870
+#: contrib/gosa.conf:169 plugins/gofon/phoneaccount/class_phoneAccount.inc:865
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: contrib/gosa.conf:175 contrib/gosa.conf:185 contrib/gosa.conf:214
+#: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
-#: plugins/admin/ogroups/tabs_ogroups.inc:104
+#: contrib/gosa.conf:176 contrib/gosa.conf:215
+#: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:177 contrib/gosa.conf:216
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/personal/environment/environment.tpl:171
@@ -192,9 +197,8 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:178 contrib/gosa.conf:207 contrib/gosa.conf:217
 #: plugins/gofax/blocklists/generic.tpl:75
-#: plugins/addons/godfs/contents.tpl:22
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
@@ -211,40 +215,48 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:179 contrib/gosa.conf:208 contrib/gosa.conf:223
+#: contrib/gosa.conf:229 contrib/gosa.conf:235 contrib/gosa.conf:258
+#: contrib/gosa.conf:264
 msgid "Inventory"
 msgstr ""
 
-#: contrib/gosa.conf:170
+#: contrib/gosa.conf:186
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:171 plugins/admin/systems/servkolab.tpl:33
+#: contrib/gosa.conf:187 plugins/admin/systems/servkolab.tpl:33
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:173
+#: contrib/gosa.conf:189
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr ""
 
-#: contrib/gosa.conf:175 plugins/admin/systems/servRepositorySetup.tpl:1
+#: contrib/gosa.conf:191 plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:193 contrib/gosa.conf:195 contrib/gosa.conf:219
+#: contrib/gosa.conf:221
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:198 contrib/gosa.conf:200
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:203 contrib/gosa.conf:205
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:286
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:298 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -254,11 +266,12 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:299
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:274 plugins/addons/ldapmanager/contentcsv.tpl:109
+#: contrib/gosa.conf:300 plugins/addons/gotomasses/goto_task.tpl:129
+#: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/admin/applications/generic.tpl:101
@@ -269,15 +282,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:301
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/admin/applications/generic.tpl:99
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -285,73 +298,36 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:314 contrib/gosa.conf:344
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:318 contrib/gosa.conf:348
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:322 contrib/gosa.conf:352
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:326 contrib/gosa.conf:356
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 #: plugins/personal/environment/environment.tpl:7
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
-#: plugins/admin/ogroups/tabs_ogroups.inc:109
+#: contrib/gosa.conf:327 contrib/gosa.conf:357
+#: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:331 contrib/gosa.conf:361
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:498 plugins/admin/ogroups/class_phonequeue.inc:262
-#: setup/class_setupStep_Language.inc:48
-msgid "German"
-msgstr ""
-
-#: contrib/gosa.conf:499 setup/class_setupStep_Language.inc:52
-msgid "Russian"
-msgstr ""
-
-#: contrib/gosa.conf:500 setup/class_setupStep_Language.inc:51
-msgid "Chinese"
-msgstr ""
-
-#: contrib/gosa.conf:501
-msgid "Spanish"
-msgstr ""
-
-#: contrib/gosa.conf:502 setup/class_setupStep_Language.inc:49
-msgid "French"
-msgstr ""
-
-#: contrib/gosa.conf:503
-msgid "Dutch"
-msgstr ""
-
-#: contrib/gosa.conf:504 setup/class_setupStep_Language.inc:50
-msgid "English"
-msgstr ""
-
-#: contrib/gosa.conf:505
-msgid "Italian"
-msgstr ""
-
-#: contrib/gosa.conf:506
-msgid "Polish"
-msgstr ""
-
 #: plugins/gofax/faxreports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr ""
@@ -359,9 +335,10 @@ msgstr ""
 #: plugins/gofax/faxreports/class_faxreport.inc:7
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/addons/gotomasses/class_goto_task.inc:7
+#: plugins/addons/gotomasses/class_gotomasses.inc:7
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/addons/logview/class_logview.inc:7
-#: plugins/addons/godfs/class_dfsManagment.inc:11
 #: plugins/addons/addressbook/class_addressbook.inc:7
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
 #: plugins/addons/ldapmanager/class_export.inc:7
@@ -489,7 +466,7 @@ msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/systems/class_printGeneric.inc:858
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -579,14 +556,16 @@ msgstr ""
 #: plugins/admin/departments/dep_iframe.tpl:19
 #: plugins/admin/fai/faiNewBranch.tpl:51
 #: plugins/personal/password/changed.tpl:9
-#: plugins/personal/generic/main.inc:172 include/functions.inc:1582
-#: setup/class_setup.inc:275 setup/class_setup.inc:277
+#: plugins/personal/generic/main.inc:172 include/functions.inc:1567
+#: setup/class_setup.inc:261 setup/class_setup.inc:263
 msgid "Back"
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/gotomasses/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_dhcp.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
 #: plugins/admin/systems/remove_ppd.tpl:2
 #: plugins/admin/applications/remove.tpl:2 plugins/admin/users/remove.tpl:2
 #: plugins/admin/mimetypes/remove.tpl:2 plugins/admin/departments/remove.tpl:2
@@ -599,7 +578,7 @@ msgstr ""
 #: setup/class_setupStep_Migrate.inc:461 setup/class_setupStep_Migrate.inc:596
 #: setup/class_setupStep_Migrate.inc:726 ihtml/themes/default/conflict.tpl:6
 #: ihtml/themes/default/islocked.tpl:6 html/password.php:274 html/index.php:55
-#: html/index.php:352 html/index.php:358
+#: html/index.php:346 html/index.php:352
 msgid "Warning"
 msgstr ""
 
@@ -612,6 +591,7 @@ msgid ""
 msgstr ""
 
 #: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/gotomasses/remove.tpl:10
 #: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
 #: plugins/admin/applications/remove.tpl:9 plugins/admin/users/remove.tpl:10
 #: plugins/admin/mimetypes/remove.tpl:9 plugins/admin/ogroups/remove.tpl:10
@@ -623,32 +603,38 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
+#: plugins/addons/gotomasses/remove.tpl:15
+#: plugins/addons/gotomasses/remove.tpl:17
 #: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/paste_mail.tpl:31
-#: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:52
-#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/generic.tpl:110
+#: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/groups/mail.tpl:70
+#: plugins/admin/groups/mail.tpl:115 plugins/admin/groups/generic.tpl:110
 #: plugins/admin/systems/printer.tpl:78 plugins/admin/systems/printer.tpl:96
+#: plugins/admin/systems/dhcp_network.tpl:68
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_termDNS.inc:493
+#: plugins/admin/systems/remove_dhcp.tpl:14
+#: plugins/admin/systems/dhcp_advanced.tpl:23
+#: plugins/admin/systems/dhcp_advanced.tpl:36
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:164
+#: plugins/admin/systems/class_termDNS.inc:682
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/glpi_edit_os.tpl:10
-#: plugins/admin/systems/class_servDNSeditZone.inc:317
-#: plugins/admin/systems/class_servDNSeditZone.inc:547
+#: plugins/admin/systems/class_servDNSeditZone.inc:326
+#: plugins/admin/systems/class_servDNSeditZone.inc:559
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
-#: plugins/admin/systems/terminal.tpl:107
+#: plugins/admin/systems/terminal.tpl:111
 #: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/remove_ppd.tpl:12
-#: plugins/admin/systems/workstation.tpl:86
+#: plugins/admin/systems/workstation.tpl:92
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/workstationStartup.tpl:106
-#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:105
+#: plugins/admin/systems/workstationStartup.tpl:128
 #: plugins/admin/applications/remove.tpl:13 plugins/admin/users/remove.tpl:14
 #: plugins/admin/mimetypes/remove.tpl:14 plugins/admin/mimetypes/remove.tpl:18
 #: plugins/admin/departments/remove.tpl:14 plugins/admin/ogroups/remove.tpl:14
@@ -662,7 +648,7 @@ msgstr ""
 #: plugins/personal/mail/copypaste.tpl:62 plugins/personal/mail/generic.tpl:59
 #: plugins/personal/mail/generic.tpl:212
 #: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/personal/environment/class_environment.inc:648
+#: plugins/personal/environment/class_environment.inc:654
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -681,7 +667,8 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:87
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/godfs/class_dfsManagment.inc:249
+#: plugins/addons/gotomasses/remove.tpl:19
+#: plugins/addons/gotomasses/goto_task.tpl:200
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/address_edit.tpl:234
@@ -692,20 +679,28 @@ msgstr ""
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/systems/SelectDeviceType.tpl:45
+#: plugins/admin/systems/class_dhcpService.inc:95
+#: plugins/admin/systems/class_dhcpPool.inc:71
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/gencd.tpl:11
 #: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/remove_dhcp.tpl:16
+#: plugins/admin/systems/class_dhcpSubnet.inc:90
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/class_systemManagement.inc:599
+#: plugins/admin/systems/dhcpNewSection.tpl:17
+#: plugins/admin/systems/class_dhcpHost.inc:83
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:68
 #: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:89
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
 #: plugins/admin/systems/glpi_edit_os.tpl:29
 #: plugins/admin/systems/goSpamServer.tpl:103
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
 #: plugins/admin/systems/goSpamServerRule.tpl:24
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/class_dhcpGroup.inc:56
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/glpi_edit_type.tpl:29
@@ -720,10 +715,10 @@ msgstr ""
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/users/password.tpl:23 plugins/admin/mimetypes/remove.tpl:16
 #: plugins/admin/mimetypes/remove.tpl:20
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:394
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:411
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:299
 #: plugins/admin/ogroups/remove.tpl:16
@@ -731,8 +726,8 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/remove.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:603
-#: plugins/admin/fai/class_faiManagement.inc:608
+#: plugins/admin/fai/class_faiManagement.inc:610
+#: plugins/admin/fai/class_faiManagement.inc:615
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/fai/faiPackageEntry.tpl:57
@@ -810,10 +805,11 @@ msgid "Department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:47
+#: plugins/addons/gotomasses/class_goto_task.inc:214
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_divListGroup.inc:51
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:198
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:183
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:199
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:184
 #: plugins/admin/systems/class_divListSystem.inc:58
 #: plugins/admin/applications/class_divListApplication.inc:45
 #: plugins/admin/users/class_divListUsers.inc:52
@@ -843,6 +839,7 @@ msgid "Show receive blocklists"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:54
+#: plugins/addons/gotomasses/class_target_list.inc:54
 #: plugins/admin/groups/class_divListGroup.inc:62
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #: plugins/admin/systems/class_divListSystem.inc:71
@@ -859,6 +856,7 @@ msgid "Select to search within subtrees"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:54
+#: plugins/addons/gotomasses/class_target_list.inc:54
 #: plugins/admin/groups/class_divListGroup.inc:62
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #: plugins/admin/systems/class_divListSystem.inc:71
@@ -869,7 +867,7 @@ msgstr ""
 #: plugins/admin/ogroups/class_divListOGroup.inc:69
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/personal/environment/selectPrinterDialog.tpl:42
-#: plugins/personal/posix/posix_groups.tpl:46
+#: plugins/personal/posix/posix_groups.tpl:68
 #: plugins/gofon/macro/class_divListMacros.inc:51
 #: plugins/gofon/conference/class_divListConferences.inc:52
 msgid "Search in subtrees"
@@ -889,7 +887,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:79
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/addons/gotomasses/class_target_list.inc:124
 #: plugins/admin/groups/class_divListGroup.inc:96
 #: plugins/admin/groups/generic.tpl:21 plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/printer.tpl:20 plugins/admin/systems/component.tpl:13
@@ -899,17 +897,17 @@ msgstr ""
 #: plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/class_divListSystem.inc:106
 #: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/applications/class_divListApplication.inc:93
 #: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/users/class_divListUsers.inc:99
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:103
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
 #: plugins/admin/mimetypes/generic.tpl:38
 #: plugins/admin/departments/class_divListDepartment.inc:72
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/ogroups/class_divListOGroup.inc:102
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/fai/class_divListFai.inc:150
+#: plugins/admin/fai/class_divListFai.inc:153
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofon/macro/class_divListMacros.inc:76
 #: plugins/gofon/macro/generic.tpl:20
@@ -919,37 +917,37 @@ msgid "Base"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/addons/gotomasses/class_target_list.inc:126
 #: plugins/admin/groups/class_divListGroup.inc:98
 #: plugins/admin/systems/class_divListSystem.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/applications/class_divListApplication.inc:95
 #: plugins/admin/users/class_divListUsers.inc:101
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:105
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
 #: plugins/admin/departments/class_divListDepartment.inc:74
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
-#: plugins/admin/fai/class_divListFai.inc:151
+#: plugins/admin/fai/class_divListFai.inc:154
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
 msgid "Submit department"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/addons/gotomasses/class_target_list.inc:126
 #: plugins/admin/groups/class_divListGroup.inc:98
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/systems/class_divListSystem.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_glpiSelectUser.inc:161
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/applications/class_divListApplication.inc:95
 #: plugins/admin/users/class_divListUsers.inc:101
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:105
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
 #: plugins/admin/departments/class_divListDepartment.inc:74
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
-#: plugins/admin/fai/class_divListFai.inc:151
+#: plugins/admin/fai/class_divListFai.inc:154
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
-#: include/class_MultiSelectWindow.inc:211
+#: include/class_MultiSelectWindow.inc:212
 msgid "Submit"
 msgstr ""
 
@@ -959,29 +957,29 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:147
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
 #: plugins/admin/applications/class_divListApplication.inc:156
-#: plugins/admin/users/class_divListUsers.inc:184
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/ogroups/class_divListOGroup.inc:142
-#: plugins/admin/fai/class_faiScript.inc:245
-#: plugins/admin/fai/class_faiScript.inc:248
-#: plugins/admin/fai/class_faiHook.inc:266
-#: plugins/admin/fai/class_faiHook.inc:269
-#: plugins/admin/fai/class_faiTemplate.inc:241
-#: plugins/admin/fai/class_faiTemplate.inc:244
-#: plugins/admin/fai/class_divListFai.inc:220
-#: plugins/admin/fai/class_divListFai.inc:225
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiScript.inc:310
+#: plugins/admin/fai/class_faiHook.inc:282
+#: plugins/admin/fai/class_faiHook.inc:285
+#: plugins/admin/fai/class_faiTemplate.inc:256
+#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/fai/class_divListFai.inc:230
+#: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/gofon/macro/class_divListMacros.inc:93
 #: plugins/gofon/conference/class_divListConferences.inc:94
 msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr ""
 
@@ -989,16 +987,16 @@ msgstr ""
 #: plugins/addons/mailqueue/contents.tpl:93
 #: plugins/admin/groups/class_divListGroup.inc:161
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:132
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:149
 #: plugins/admin/applications/class_divListApplication.inc:163
-#: plugins/admin/users/class_divListUsers.inc:195
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:150
+#: plugins/admin/users/class_divListUsers.inc:218
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:170
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/fai/class_faiScript.inc:249
-#: plugins/admin/fai/class_faiHook.inc:270
-#: plugins/admin/fai/class_faiTemplate.inc:245
-#: plugins/admin/fai/class_divListFai.inc:227
+#: plugins/admin/fai/class_faiScript.inc:311
+#: plugins/admin/fai/class_faiHook.inc:286
+#: plugins/admin/fai/class_faiTemplate.inc:260
+#: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/gofon/macro/class_divListMacros.inc:95
 #: plugins/gofon/conference/class_divListConferences.inc:96
 #: plugins/gofon/conference/class_divListConferences.inc:98
@@ -1006,10 +1004,28 @@ msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr ""
 
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+msgid "Number of listed blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:120
+#: plugins/admin/groups/class_divListGroup.inc:213
+#: plugins/admin/systems/class_divListSystem.inc:226
+#: plugins/admin/applications/class_divListApplication.inc:196
+#: plugins/admin/users/class_divListUsers.inc:299
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
+#: plugins/admin/departments/class_divListDepartment.inc:128
+#: plugins/admin/ogroups/class_divListOGroup.inc:184
+#: plugins/admin/fai/class_divListFai.inc:269
+#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/conference/class_divListConferences.inc:167
+msgid "Number of listed departments"
+msgstr ""
+
 #: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
 msgid "Blocklist management"
 msgstr ""
@@ -1051,6 +1067,7 @@ msgid "Select a base"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/addons/gotomasses/class_gotomasses.inc:211
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
@@ -1060,9 +1077,9 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:200
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
 #: plugins/admin/fai/class_faiSummaryTab.inc:334
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:181
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:195
 msgid "Type"
 msgstr ""
 
@@ -1070,9 +1087,10 @@ msgstr ""
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/systems/wingeneric.tpl:25
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/addons/gotomasses/goto_task.tpl:12
+#: plugins/addons/gotomasses/class_goto_task.inc:325
+#: plugins/admin/groups/generic.tpl:13 plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/printer.tpl:13 plugins/admin/systems/component.tpl:30
 #: plugins/admin/systems/phone.tpl:30 plugins/admin/systems/servnfs.tpl:17
 #: plugins/admin/systems/server.tpl:10
@@ -1110,40 +1128,45 @@ msgstr ""
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/gofax/faxaccount/generic.tpl:76
+#: plugins/addons/gotomasses/goto_task.tpl:112
+#: plugins/addons/gotomasses/goto_task.tpl:187
 #: plugins/admin/groups/application.tpl:27
 #: 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:568
-#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/groups/class_groupMail.inc:578
+#: plugins/admin/groups/mail.tpl:69 plugins/admin/groups/mail.tpl:113
 #: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/group_objects.tpl:55
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:394
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:447
+#: plugins/admin/systems/dhcp_network.tpl:67
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/glpiManufacturer.tpl:6
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
+#: plugins/admin/systems/dhcp_advanced.tpl:22
+#: plugins/admin/systems/dhcp_advanced.tpl:35
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:67
-#: plugins/admin/systems/class_termDNS.inc:479
-#: plugins/admin/systems/class_termDNS.inc:499
+#: plugins/admin/systems/class_termDNS.inc:668
+#: plugins/admin/systems/class_termDNS.inc:688
 #: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/goSpamServer.tpl:36
 #: plugins/admin/systems/goSpamServer.tpl:88
-#: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/class_servDNSeditZone.inc:553
+#: plugins/admin/systems/servdns.tpl:26
+#: plugins/admin/systems/class_servDNSeditZone.inc:565
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
 #: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/terminal.tpl:105
+#: plugins/admin/systems/terminal.tpl:109
 #: plugins/admin/systems/glpi_edit_type.tpl:8
-#: plugins/admin/systems/workstation.tpl:84 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/workstation.tpl:90 plugins/admin/systems/glpi.tpl:100
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/servdnseditzone.tpl:115
-#: plugins/admin/systems/workstationStartup.tpl:105
-#: plugins/admin/systems/workstationStartup.tpl:128
-#: plugins/admin/systems/workstationStartup.tpl:147
+#: plugins/admin/systems/workstationStartup.tpl:104
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:146
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
 #: plugins/admin/mimetypes/generic.tpl:86
@@ -1153,7 +1176,7 @@ msgstr ""
 #: plugins/admin/ogroups/phonequeue.tpl:28
 #: plugins/admin/ogroups/generic.tpl:43 plugins/admin/ogroups/termgroup.tpl:23
 #: plugins/admin/fai/faiHook.tpl:43 plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:42 plugins/admin/fai/faiProfile.tpl:38
 #: plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiTemplate.tpl:35 plugins/personal/scalix/generic.tpl:82
@@ -1189,22 +1212,28 @@ msgstr ""
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
 #: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/systems/class_dhcpService.inc:94
+#: plugins/admin/systems/class_dhcpPool.inc:70
 #: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/class_dhcpSubnet.inc:89
 #: plugins/admin/systems/class_systemManagement.inc:597
+#: plugins/admin/systems/class_dhcpHost.inc:82
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/systems/servnfs.tpl:120
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:88
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goSpamServer.tpl:101
 #: plugins/admin/systems/goSpamServerRule.tpl:22
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/class_dhcpGroup.inc:55
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
 #: plugins/admin/systems/servdnseditzone.tpl:128
 #: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/applications/class_applicationManagement.inc:360
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#: plugins/admin/fai/class_faiManagement.inc:601
+#: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/personal/scalix/main.inc:105 plugins/personal/mail/main.inc:105
 #: plugins/personal/connectivity/main.inc:119
@@ -1219,7 +1248,7 @@ msgstr ""
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:233
 #: include/sieve/templates/management.tpl:24
 #: include/sieve/templates/edit_frame_base.tpl:39
-#: include/class_MultiSelectWindow.inc:78
+#: include/class_MultiSelectWindow.inc:79
 #: ihtml/themes/default/copyPasteDialog.tpl:15
 msgid "Save"
 msgstr ""
@@ -1320,33 +1349,33 @@ msgstr ""
 msgid "back"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:633
 msgid "Removing FAX account failed"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:647
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:661
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:662
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:667
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:668
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:750
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:751
 msgid "Saving FAX account failed"
 msgstr ""
 
@@ -1354,7 +1383,7 @@ msgstr ""
 msgid "Select numbers to add"
 msgstr ""
 
-#: plugins/gofax/faxaccount/locals.tpl:19 plugins/addons/godfs/contents.tpl:31
+#: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/groups/group_objects.tpl:20
@@ -1427,11 +1456,12 @@ msgid "Add the list to the blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/addons/gotomasses/goto_task.tpl:198
 #: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:391
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:408
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiPackageEntry.tpl:56
@@ -1463,13 +1493,13 @@ msgstr ""
 #: plugins/gofax/faxaccount/main.inc:97
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
+#: plugins/addons/gotomasses/class_gotomasses.inc:219
 #: plugins/addons/logview/contents.tpl:62 plugins/admin/systems/printer.tpl:52
 #: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:186
-#: plugins/admin/systems/servdns.tpl:7 plugins/admin/systems/glpi.tpl:48
-#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
+#: plugins/admin/systems/glpi.tpl:85 plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servdnseditzone.tpl:40
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82
@@ -1543,7 +1573,7 @@ msgid "Alternate fax numbers"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:96
+#: plugins/admin/groups/paste_mail.tpl:42 plugins/admin/groups/mail.tpl:114
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/personal/mail/generic.tpl:210
 msgid "Add local"
@@ -1561,6 +1591,374 @@ msgstr ""
 msgid "Blocklists for outgoing fax"
 msgstr ""
 
+#: plugins/addons/gotomasses/remove.tpl:6 plugins/admin/users/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:20
+msgid "Object group membership"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:32
+msgid "Configure DNS"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:43
+msgid "Configure DHCP"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:58
+#: plugins/addons/gotomasses/class_goto_task.inc:325
+#: plugins/addons/gotomasses/class_gotomasses.inc:213
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:159
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/systems/server.tpl:51 plugins/admin/systems/terminal.tpl:128
+#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/ogroups/termgroup.tpl:75
+#: plugins/admin/fai/class_faiScript.inc:301
+msgid "Action"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:79
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:97
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:103
+#: plugins/addons/gotomasses/class_goto_task.inc:213
+#: plugins/addons/addressbook/class_addressbook.inc:522
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/admin/systems/dhcp_host.tpl:8
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: 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/class_glpiAttachmentPool.inc:197
+#: plugins/admin/systems/goSpamServerRule.tpl:6
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/dhcp_group.tpl:6
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:10
+#: plugins/admin/systems/dhcp_pool.tpl:6 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiScript.inc:296
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/class_faiSummaryTab.inc:329
+#: plugins/admin/fai/paste_fai_object.tpl:1
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/gofon/macro/parameter.tpl:5
+#: setup/setup_feedback.tpl:24 setup/setup_migrate.tpl:207 html/getxls.php:174
+#: html/getxls.php:233
+msgid "Name"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:109
+msgid "IP address"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:119
+msgid "CSV import from file"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:142
+#: plugins/addons/gotomasses/class_gotomasses.inc:209
+msgid "Schedule"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:147
+#: plugins/addons/gotomasses/class_goto_task.inc:322
+msgid "Minute"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:151
+#: plugins/addons/gotomasses/class_goto_task.inc:323
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+msgid "Hour"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:155
+#: plugins/addons/gotomasses/class_goto_task.inc:323
+msgid "Day"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:159
+#: plugins/addons/gotomasses/class_goto_task.inc:324
+msgid "Month"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:163
+#: plugins/addons/gotomasses/class_goto_task.inc:324
+msgid "Week day"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:174
+#: plugins/addons/gotomasses/class_goto_task.inc:211
+msgid "Target systems"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:188
+msgid "Add from list"
+msgstr ""
+
+#: plugins/addons/gotomasses/goto_task.tpl:196
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:405
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: setup/setup_checks.tpl:27 setup/setup_checks.tpl:87
+#: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:392
+#: setup/class_setupStep_Migrate.inc:468 setup/class_setupStep_Migrate.inc:539
+#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:722
+#: setup/class_setupStep_Migrate.inc:854
+#: setup/class_setupStep_Migrate.inc:1623
+msgid "Ok"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_goto_task.inc:6
+msgid "System mass deployment"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_goto_task.inc:72
+msgid "Keep current"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_goto_task.inc:212
+msgid "IP"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_goto_task.inc:322
+#: plugins/addons/gotomasses/class_target_list.inc:175
+#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_goto_task.inc:329
+#, php-format
+msgid "The given value for attribute '%s' is invalid."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_goto_task.inc:333
+#: plugins/addons/gotomasses/class_goto_task.inc:336
+#, php-format
+msgid "You must specify at least one target"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:34
+msgid "Select the target objects for your scheduled action."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:35
+#: plugins/addons/gotomasses/class_target_list.inc:36
+msgid "Available targets"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:45
+#: plugins/generic/references/contents.tpl:11
+msgid "Object name"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:48
+msgid "Select to see object groups"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:48
+msgid "Show object groups"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:49
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:49
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:50
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Select to see workstations"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:50
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:57
+#: plugins/admin/groups/class_divListGroup.inc:65
+#: plugins/admin/departments/class_divListDepartment.inc:49
+#: plugins/admin/ogroups/class_divListOGroup.inc:72
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:171
+#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/systems/class_systemManagement.inc:870
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/personal/mail/generic.tpl:11
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_target_list.inc:173
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/systems/class_systemManagement.inc:865
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr ""
+
+#: plugins/addons/gotomasses/main.inc:42
+#: plugins/addons/gotomasses/class_gotomasses.inc:6
+msgid "System deployment"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:72
+#: plugins/addons/gotomasses/class_gotomasses.inc:104
+msgid "You are not allowed to remove a task."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:85
+#: plugins/addons/gotomasses/class_gotomasses.inc:108
+#, php-format
+msgid "Your are about to delete the following tasks: %s"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:181
+msgid "List of system deployment tasks"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:185
+msgid ""
+"This menu allows you to add, remove and change the properties of system "
+"deployment tasks."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:208
+msgid "Target"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:221
+#: plugins/admin/groups/class_groupMail.inc:582
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:448
+#: plugins/admin/systems/printer.tpl:53
+#: plugins/admin/systems/glpiManufacturer.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:81
+#: plugins/admin/systems/goSpamServer.tpl:37
+#: plugins/admin/systems/workstationStartup.tpl:147
+#: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/applications/class_applicationParameters.inc:108
+#: plugins/admin/fai/faiPackage.tpl:73
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
+#: plugins/personal/connectivity/class_kolabAccount.inc:240
+#: plugins/personal/environment/kioskManagement.tpl:15
+#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/generic/generic_certs.tpl:17
+#: plugins/personal/generic/generic_certs.tpl:37
+#: plugins/personal/generic/generic_certs.tpl:57
+msgid "Remove"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:266
+#: include/class_pluglist.inc:130 include/class_pluglist.inc:131
+#: include/class_pluglist.inc:241
+msgid "Unknown"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:277
+#, php-format
+msgid "Can't locate or read gotomasses storage file '%s'."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:284
+#: plugins/addons/gotomasses/class_gotomasses.inc:395
+#, php-format
+msgid "Can't read gotomasses storage file '%s'."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:320
+msgid "Entry broken, skipped."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:388
+#, php-format
+msgid "Can't locate or write gotomasses storage file '%s'."
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:447
+#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_terminalGeneric.inc:285
+#: plugins/admin/systems/class_workstationGeneric.inc:268
+#: plugins/admin/ogroups/class_termgroup.inc:263
+msgid "Reboot"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:448
+msgid "Localboot"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:449
+msgid "Halt system"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:450
+msgid "Initial installation"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:451
+#: plugins/admin/applications/generic.tpl:63
+#: plugins/admin/mimetypes/generic.tpl:63
+msgid "Update"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:452
+msgid "(Re)Install"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:453
+msgid "Rescan"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:454
+msgid "Wake"
+msgstr ""
+
+#: plugins/addons/gotomasses/class_gotomasses.inc:455
+msgid "Memory check"
+msgstr ""
+
 #: plugins/addons/mailqueue/main.inc:38
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
@@ -1622,15 +2020,6 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/systems/class_systemManagement.inc:870
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/personal/mail/generic.tpl:11
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr ""
-
 #: plugins/addons/mailqueue/contents.tpl:54
 #: plugins/admin/systems/glpi_devices.tpl:293
 #: plugins/admin/systems/glpi_devices.tpl:420
@@ -1656,6 +2045,7 @@ msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr ""
@@ -1854,133 +2244,6 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsManagment.inc:10
-msgid "DFS Managment"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:151
-msgid "Removing DFS share failed"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:170
-msgid "No DFS entries found"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-msgid "Go up one dfs share"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_servDNSeditZone.inc:314
-#: plugins/admin/systems/class_glpiSelectUser.inc:157
-#: plugins/admin/ogroups/phonequeue.tpl:21
-#: plugins/admin/fai/class_faiProfile.inc:305
-#: include/sieve/templates/object_container_clear.tpl:8
-#: include/sieve/templates/object_container.tpl:8
-#: include/class_MultiSelectWindow.inc:196
-#: include/class_MultiSelectWindow.inc:198
-msgid "Up"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-msgid "Go to dfs root"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/systems/class_glpiSelectUser.inc:155
-#: include/class_MultiSelectWindow.inc:188
-#: include/class_MultiSelectWindow.inc:190
-msgid "Root"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:215
-msgid "Create new dfs share"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:247
-#: plugins/personal/netatalk/main.inc:104 setup/class_setupStep_Finish.inc:37
-#: ihtml/themes/default/copyPasteDialog.tpl:24
-msgid "Finish"
-msgstr ""
-
-#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
-msgid "Distributed File System Administration"
-msgstr ""
-
-#: plugins/addons/godfs/contents.tpl:8
-msgid "DFS Shares"
-msgstr ""
-
-#: plugins/addons/godfs/contents.tpl:26
-msgid ""
-"This menu allows you to create, delete and edit selected dfs shares. Having "
-"a large numbers of dfs shares, you might prefer the range selectors on top "
-"of the dfs share list."
-msgstr ""
-
-#: plugins/addons/godfs/contents.tpl:40
-msgid "Display dfs shares matching"
-msgstr ""
-
-#: plugins/addons/godfs/contents.tpl:44
-msgid "Regular expression for matching dfs share names"
-msgstr ""
-
-#: plugins/addons/godfs/generic.tpl:4
-msgid "DFS Properties"
-msgstr ""
-
-#: plugins/addons/godfs/generic.tpl:8
-msgid "Name of dfs Share"
-msgstr ""
-
-#: plugins/addons/godfs/generic.tpl:16
-msgid "Fileserver"
-msgstr ""
-
-#: plugins/addons/godfs/generic.tpl:20
-msgid "Share on Fileserver"
-msgstr ""
-
-#: plugins/addons/godfs/generic.tpl:30
-msgid "DFS Location"
-msgstr ""
-
-#: plugins/addons/godfs/generic.tpl:34
-#: plugins/admin/systems/workstation.tpl:17
-#: plugins/admin/departments/generic.tpl:47
-#: plugins/admin/departments/generic.tpl:55
-#: plugins/personal/generic/generic.tpl:287 html/getxls.php:174
-msgid "Location"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:97
-#: plugins/addons/godfs/class_dfsgeneric.inc:99
-msgid "Dfs share already exists."
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:112
-msgid "Required Field \"Name of dfs Share\" is not set."
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:115
-msgid "Required Field \"Description\" is not set."
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:118
-msgid "Required Field \"Fileserver\" is not set."
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:121
-msgid "Required Field \"Share on fileserver\" is not set."
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:124
-msgid "Required Field \"Location\" is not set."
-msgstr ""
-
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -2160,44 +2423,6 @@ msgstr ""
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:522
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: 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/class_glpiAttachmentPool.inc:196
-#: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiHook.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/class_faiSummaryTab.inc:329
-#: plugins/admin/fai/paste_fai_object.tpl:1
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/gofon/macro/parameter.tpl:5
-#: setup/setup_feedback.tpl:24 setup/setup_migrate.tpl:207 html/getxls.php:174
-#: html/getxls.php:233
-msgid "Name"
-msgstr ""
-
 #: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
@@ -2222,52 +2447,52 @@ msgid "User ID"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
-#: plugins/personal/generic/class_user.inc:1032
+#: plugins/admin/users/class_userManagement.inc:582
+#: plugins/personal/generic/class_user.inc:1037
 msgid "The required field 'Name' is not set."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
-#: plugins/personal/generic/class_user.inc:1047
+#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/personal/generic/class_user.inc:1052
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:565
 #: plugins/addons/addressbook/class_addressbook.inc:593
 #: plugins/admin/departments/class_departmentGeneric.inc:243
-#: plugins/personal/generic/class_user.inc:1068
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1073
+#: plugins/personal/generic/class_user.inc:1098
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:568
 #: plugins/addons/addressbook/class_addressbook.inc:590
-#: plugins/personal/generic/class_user.inc:1071
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1095
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:573
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/admin/departments/class_departmentGeneric.inc:246
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1081
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/admin/departments/class_departmentGeneric.inc:249
-#: plugins/personal/generic/class_user.inc:1079
+#: plugins/personal/generic/class_user.inc:1084
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:582
-#: plugins/personal/generic/class_user.inc:1082
+#: plugins/personal/generic/class_user.inc:1087
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:585
-#: plugins/personal/generic/class_user.inc:1085
+#: plugins/personal/generic/class_user.inc:1090
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
@@ -2566,7 +2791,8 @@ msgid "Groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 msgid "You are not allowed to execute this method!"
 msgstr ""
@@ -2710,52 +2936,60 @@ msgstr ""
 msgid "Application options"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:446
+#: plugins/admin/groups/acl_definition.inc:442
 msgid "Scalix Mail node"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:447
+#: plugins/admin/groups/acl_definition.inc:443
 msgid "Mailbox class"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:448
+#: plugins/admin/groups/acl_definition.inc:444
 msgid "Server language"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:449
-#: plugins/personal/environment/class_environment.inc:1144
+#: plugins/admin/groups/acl_definition.inc:445
+#: plugins/personal/environment/class_environment.inc:1150
 msgid "Administrator"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:450
+#: plugins/admin/groups/acl_definition.inc:446
 msgid "Mailbox administrator"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:451
+#: plugins/admin/groups/acl_definition.inc:447
 msgid "Hide user entry in Scalix"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:452
+#: plugins/admin/groups/acl_definition.inc:448
 msgid "Mailbox size limitations"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:453
+#: plugins/admin/groups/acl_definition.inc:449
 msgid "Limit outbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:454
+#: plugins/admin/groups/acl_definition.inc:450
 msgid "Limit inbound"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:455
+#: plugins/admin/groups/acl_definition.inc:451
 msgid "Notify user"
 msgstr ""
 
-#: plugins/admin/groups/acl_definition.inc:456
+#: plugins/admin/groups/acl_definition.inc:452
 #: plugins/personal/scalix/generic.tpl:74
 msgid "Scalix email addresses"
 msgstr ""
 
+#: plugins/admin/groups/acl_definition.inc:453
+msgid "Create/edit new task"
+msgstr ""
+
+#: plugins/admin/groups/acl_definition.inc:453
+msgid "Remove tasks"
+msgstr ""
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr ""
@@ -2777,7 +3011,7 @@ msgid "Available applications"
 msgstr ""
 
 #: plugins/admin/groups/paste_mail.tpl:1 plugins/personal/mail/copypaste.tpl:1
-#: setup/setup_config2.tpl:118
+#: setup/setup_config2.tpl:179
 msgid "Mail settings"
 msgstr ""
 
@@ -2791,19 +3025,19 @@ msgstr ""
 msgid "Primary mail address for this shared folder"
 msgstr ""
 
-#: plugins/admin/groups/paste_mail.tpl:23 plugins/admin/groups/mail.tpl:44
+#: plugins/admin/groups/paste_mail.tpl:23 plugins/admin/groups/mail.tpl:62
 #: plugins/personal/mail/copypaste.tpl:25 plugins/personal/mail/generic.tpl:49
 msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/admin/groups/paste_mail.tpl:24 plugins/admin/groups/mail.tpl:45
+#: plugins/admin/groups/paste_mail.tpl:24 plugins/admin/groups/mail.tpl:63
 #: plugins/admin/systems/phonesettings.tpl:170
 #: plugins/admin/systems/phonesettings.tpl:185
 #: plugins/personal/mail/copypaste.tpl:55 plugins/personal/mail/generic.tpl:51
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:88
+#: plugins/admin/groups/paste_mail.tpl:34 plugins/admin/groups/mail.tpl:106
 msgid "Forward messages to non group members"
 msgstr ""
 
@@ -2904,15 +3138,8 @@ msgstr ""
 msgid "Show functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:65
-#: plugins/admin/departments/class_divListDepartment.inc:49
-#: plugins/admin/ogroups/class_divListOGroup.inc:72
-#: plugins/personal/posix/posix_groups.tpl:57
-msgid "Regular expression for matching group names"
-msgstr ""
-
 #: plugins/admin/groups/class_divListGroup.inc:66
-#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/personal/posix/posix_groups.tpl:59
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -2927,13 +3154,13 @@ msgid "New"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/users/class_divListUsers.inc:142
 msgid "Posix"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:127
 #: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:118
+#: plugins/admin/ogroups/tabs_ogroups.inc:117
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/generic/references/class_reference.inc:42
 #: plugins/gofon/fonreports/contents.tpl:34
@@ -2942,39 +3169,43 @@ msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/applications/class_divListApplication.inc:147
-#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
-#: plugins/admin/fai/class_divListFai.inc:213
+#: plugins/admin/fai/class_divListFai.inc:223
 msgid "cut"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/applications/class_divListApplication.inc:147
-#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
-#: plugins/admin/fai/class_divListFai.inc:213
+#: plugins/admin/fai/class_divListFai.inc:223
 msgid "Cut this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:154
 #: plugins/admin/applications/class_divListApplication.inc:151
-#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
-#: plugins/admin/fai/class_divListFai.inc:216
+#: plugins/admin/fai/class_divListFai.inc:226
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:154
 #: plugins/admin/applications/class_divListApplication.inc:151
-#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
-#: plugins/admin/fai/class_divListFai.inc:216
+#: plugins/admin/fai/class_divListFai.inc:226
 msgid "Copy this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:157
 #: plugins/admin/applications/class_divListApplication.inc:156
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/ogroups/class_divListOGroup.inc:142
 #: plugins/gofon/conference/class_divListConferences.inc:94
@@ -2983,7 +3214,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:161
 #: plugins/admin/applications/class_divListApplication.inc:163
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:150
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:170
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/gofon/conference/class_divListConferences.inc:96
@@ -2991,6 +3222,10 @@ msgstr ""
 msgid "Delete this entry"
 msgstr ""
 
+#: plugins/admin/groups/class_divListGroup.inc:212
+msgid "Number of listed groups"
+msgstr ""
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr ""
@@ -2999,95 +3234,95 @@ msgstr ""
 msgid "Select a specific department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:78
+#: plugins/admin/groups/class_groupMail.inc:80
 #: plugins/personal/mail/class_mailAccount.inc:88
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:297
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:288
+#: plugins/admin/groups/class_groupMail.inc:298
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:289
+#: plugins/admin/groups/class_groupMail.inc:299
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:290
+#: plugins/admin/groups/class_groupMail.inc:300
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:291
+#: plugins/admin/groups/class_groupMail.inc:301
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:292
+#: plugins/admin/groups/class_groupMail.inc:302
 msgid "admin"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:293
+#: plugins/admin/groups/class_groupMail.inc:303
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:388
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:389
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/ogroups/class_ogroup.inc:281
 msgid "none"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:325
+#: plugins/admin/groups/class_groupMail.inc:335
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:333
+#: plugins/admin/groups/class_groupMail.inc:343
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 #: plugins/personal/mail/class_mailAccount.inc:296
 #: plugins/personal/mail/class_mailAccount.inc:299
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:334
+#: plugins/admin/groups/class_groupMail.inc:344
 #: plugins/personal/mail/class_mailAccount.inc:300
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:346
 #: plugins/admin/ogroups/class_mailogroup.inc:50
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:337
+#: plugins/admin/groups/class_groupMail.inc:347
 #: plugins/personal/mail/class_mailAccount.inc:303
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:349
+#: plugins/admin/groups/class_groupMail.inc:359
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:350
+#: plugins/admin/groups/class_groupMail.inc:360
 msgid "Remove the shared folder and all its contents after saving this account"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:405
+#: plugins/admin/groups/class_groupMail.inc:415
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:411
+#: plugins/admin/groups/class_groupMail.inc:421
 #: plugins/personal/mail/class_mailAccount.inc:359
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:439
+#: plugins/admin/groups/class_groupMail.inc:449
 #: plugins/personal/scalix/class_scalixAccount.inc:158
 #: plugins/personal/scalix/class_scalixAccount.inc:163
 #: plugins/personal/mail/class_mailAccount.inc:397
@@ -3097,77 +3332,108 @@ msgid ""
 "addresses."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:444
+#: plugins/admin/groups/class_groupMail.inc:454
 #: plugins/personal/scalix/class_scalixAccount.inc:173
 #: plugins/personal/mail/class_mailAccount.inc:412
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:572
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:395
-#: plugins/admin/systems/printer.tpl:53
-#: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:81
-#: plugins/admin/systems/goSpamServer.tpl:37
-#: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:148
-#: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/applications/class_applicationParameters.inc:108
-#: plugins/admin/fai/faiPackage.tpl:73
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:274
-#: plugins/personal/connectivity/class_kolabAccount.inc:240
-#: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/personal/environment/environment.tpl:120
-#: plugins/personal/generic/generic_certs.tpl:17
-#: plugins/personal/generic/generic_certs.tpl:37
-#: plugins/personal/generic/generic_certs.tpl:57
-msgid "Remove"
+#: plugins/admin/groups/class_groupMail.inc:613
+#: plugins/admin/groups/class_groupMail.inc:619
+msgid "Unspecified"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:613
+msgid "Mails"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:614
+msgid "Tasks"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:614
+msgid "Journals"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:615
+msgid "Events"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:615
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+msgid "Contacts"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:616
+msgid "Notes"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:619
+msgid "Inbox"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:620
+msgid "Drafts"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:620
+msgid "Sent items"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:621
+msgid "Junk mail"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:623
+#: include/sieve/class_sieveElement_If.inc:27
+#: include/sieve/class_sieveElement_If.inc:33
+msgid "Default"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:642
+#: plugins/admin/groups/class_groupMail.inc:675
 msgid "Removing group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:830
+#: plugins/admin/groups/class_groupMail.inc:877
 msgid "Saving group mail settings failed"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:856
+#: plugins/admin/groups/class_groupMail.inc:903
 #: plugins/personal/mail/class_mailAccount.inc:945
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:859
+#: plugins/admin/groups/class_groupMail.inc:906
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:865
+#: plugins/admin/groups/class_groupMail.inc:912
 #: plugins/admin/ogroups/class_mailogroup.inc:85
 #: plugins/personal/mail/class_mailAccount.inc:959
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:871
+#: plugins/admin/groups/class_groupMail.inc:918
 #: plugins/personal/mail/class_mailAccount.inc:965
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:927
 #: plugins/personal/mail/class_mailAccount.inc:974
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:888
+#: plugins/admin/groups/class_groupMail.inc:935
 #: plugins/personal/mail/class_mailAccount.inc:984
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:892
+#: plugins/admin/groups/class_groupMail.inc:939
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:896
+#: plugins/admin/groups/class_groupMail.inc:943
 msgid "Please select a valid mail server."
 msgstr ""
 
@@ -3234,7 +3500,6 @@ msgstr ""
 
 #: plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:164
-#: plugins/admin/systems/class_printGeneric.inc:502
 #: plugins/personal/mail/generic.tpl:30
 msgid "not defined"
 msgstr ""
@@ -3243,15 +3508,23 @@ msgstr ""
 msgid "Quota size"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:63
+#: plugins/admin/groups/mail.tpl:43
+msgid "Folder type"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:53 setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:81
 msgid "IMAP shared folders"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:67
+#: plugins/admin/groups/mail.tpl:85
 msgid "Default permission"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:76
+#: plugins/admin/groups/mail.tpl:94
 msgid "Member permission"
 msgstr ""
 
@@ -3334,12 +3607,12 @@ msgid "Value specified as 'Name' is already used."
 msgstr ""
 
 #: plugins/admin/groups/class_groupGeneric.inc:814
-#: plugins/personal/posix/class_posixAccount.inc:939
+#: plugins/personal/posix/class_posixAccount.inc:937
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
 #: plugins/admin/groups/class_groupGeneric.inc:817
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:940
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
@@ -3379,12 +3652,6 @@ msgstr ""
 msgid "Select users to add"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr ""
-
 #: plugins/admin/groups/group_objects.tpl:30
 msgid "Search within subtree"
 msgstr ""
@@ -3408,54 +3675,54 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:77
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:106
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
 msgid "New entry"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:172
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:220
 #, php-format
 msgid ""
 "Can't rename '%s' to '%s' there is already an entry with the same name in "
 "our zone editing dialog."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:205
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
 #, php-format
 msgid "Entry name '%s' contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:214
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:262
 #, php-format
 msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:220
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
 #, php-format
 msgid "Can not create '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:229
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:277
 #, php-format
 msgid "The name '%s' is used more than once."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:237
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:285
 #, php-format
 msgid "The host name '%s' should be written in lowercase."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:254
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:302
 #, php-format
 msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:261
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:309
 #, php-format
 msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:269
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
@@ -3475,7 +3742,7 @@ msgstr ""
 #: 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:178
+#: plugins/admin/systems/class_divListSystem.inc:184
 #: plugins/personal/password/class_password.inc:24
 #: plugins/personal/generic/paste_generic.tpl:20 setup/setup_migrate.tpl:223
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
@@ -3512,6 +3779,7 @@ msgid "IMAP admin access"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:16
 msgid "Server identifier"
 msgstr ""
 
@@ -3545,6 +3813,7 @@ msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:82
+#: plugins/admin/systems/class_printGeneric.inc:505
 msgid "Can't get ppd informations."
 msgstr ""
 
@@ -3583,7 +3852,7 @@ msgstr ""
 #: plugins/admin/systems/class_printerPPDDialog.inc:248
 #, php-format
 msgid ""
-"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"The given ppd file '%s' seams to be invalid, can't get any model or vendor "
 "informations."
 msgstr ""
 
@@ -3602,6 +3871,7 @@ msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:408
+#: plugins/admin/systems/dhcpNewSection.tpl:9
 #: plugins/admin/fai/faiPackage.tpl:41
 msgid "Section"
 msgstr ""
@@ -3694,7 +3964,7 @@ msgid "Users which are allowed to use this printer"
 msgstr ""
 
 #: plugins/admin/systems/printer.tpl:72
-#: plugins/admin/systems/class_glpiSelectUser.inc:107
+#: plugins/admin/systems/class_glpiSelectUser.inc:108
 #: plugins/admin/users/class_userManagement.inc:28 html/getxls.php:68
 #: html/getxls.php:70 html/getxls.php:243
 msgid "Users"
@@ -3724,9 +3994,9 @@ msgstr ""
 #: plugins/admin/systems/class_terminalInfo.inc:62
 #: plugins/admin/systems/class_terminalStartup.inc:168
 #: plugins/admin/systems/class_terminalService.inc:255
-#: plugins/admin/systems/class_workstationStartup.inc:514
+#: plugins/admin/systems/class_workstationStartup.inc:519
 #: plugins/admin/systems/class_workstationService.inc:247
-#: plugins/admin/systems/class_terminalGeneric.inc:246
+#: plugins/admin/systems/class_terminalGeneric.inc:251
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -3759,13 +4029,6 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/systems/class_systemManagement.inc:865
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr ""
-
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
 #: plugins/admin/systems/class_systemManagement.inc:864
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
@@ -3807,13 +4070,148 @@ msgstr ""
 #: plugins/admin/users/template.tpl:48
 #: plugins/admin/departments/class_departmentGeneric.inc:431
 #: plugins/admin/departments/class_departmentGeneric.inc:523
-#: plugins/admin/fai/class_faiManagement.inc:436
-#: plugins/admin/fai/class_faiManagement.inc:607
+#: plugins/admin/fai/class_faiManagement.inc:441
+#: plugins/admin/fai/class_faiManagement.inc:614
 #: include/sieve/templates/select_test_type.tpl:11
-#: include/sieve/templates/add_element.tpl:11 setup/class_setup.inc:280
+#: include/sieve/templates/add_element.tpl:11 setup/class_setup.inc:266
 msgid "Continue"
 msgstr ""
 
+#: plugins/admin/systems/dhcp_network.tpl:5
+msgid "Network configuration"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:8
+msgid "Router"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:11
+msgid "Enter name or IP address of router to be used in this section"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:15
+#: plugins/admin/systems/class_dhcpSubnet.inc:152
+#: plugins/admin/systems/dhcp_subnet.tpl:12
+#: plugins/admin/systems/class_dhcpNetwork.inc:204
+#: plugins/admin/systems/servdnseditzone.tpl:19
+msgid "Netmask"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:21
+#: plugins/admin/systems/class_dhcpNetwork.inc:204
+msgid "Broadcast"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:29
+msgid "Bootup"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:32
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:35
+msgid ""
+"Enter name of file that will be loaded via tftp after client has started"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:39
+msgid "Next server"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:42
+msgid "Enter name of server to retrieve bootimages from"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:49
+msgid "Domain Name Service"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:52
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:55
+msgid "Name of domain"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:61
+msgid "DNS server"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:62
+msgid "List of DNS servers to be propagated"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:66
+msgid "DNS server do be added"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:67
+msgid "Click here add the selected server to the list"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:68
+msgid "Click here remove the selected servers from the list"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:73
+msgid "Domain Name Service options"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:74
+msgid "Assign hostnames found via reverse mapping"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:76
+msgid "Assign hostnames from host declarations"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpService.inc:140
+msgid "Default lease time needs to be numeric."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpService.inc:143
+msgid "Maximum lease time needs to be numeric."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpService.inc:146
+msgid "Default lease time needs to smaller than the maximum lease time."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:104
+#: plugins/admin/systems/class_dhcpHost.inc:132
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:143
+#: plugins/admin/systems/class_dhcpGroup.inc:88
+#: plugins/admin/applications/class_applicationGeneric.inc:362
+msgid "Required field 'Name' is not filled."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:112
+#: plugins/admin/systems/class_dhcpSubnet.inc:145
+msgid "The name for this section is already used!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:119
+msgid "Required field 'Range' is not filled."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:123
+msgid "Field 'Range' contains invalid IP addresses."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:127
+#: plugins/admin/systems/class_dhcpSubnet.inc:161
+msgid "Field 'Range' contains invalid IP range."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:141
+#: plugins/admin/systems/class_dhcpSubnet.inc:167
+msgid "'Range' is not inside the configured network."
+msgstr ""
+
 #: plugins/admin/systems/class_phoneGeneric.inc:103
 msgid "This 'dn' has no phone features."
 msgstr ""
@@ -3833,54 +4231,54 @@ msgid "dynamic"
 msgstr ""
 
 #: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "Networksettings"
+msgid "Network settings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:240
+#: plugins/admin/systems/class_phoneGeneric.inc:248
 #, php-format
 msgid ""
-"Can't delete because there are user which are depending on this phone. One "
+"Can't delete because there are users which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:247
+#: plugins/admin/systems/class_phoneGeneric.inc:255
 msgid "Removing phone failed"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:284
-#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_phoneGeneric.inc:292
+#: plugins/admin/systems/class_componentGeneric.inc:153
 msgid "The required field IP address is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:287
-#: plugins/admin/systems/class_componentGeneric.inc:148
+#: plugins/admin/systems/class_phoneGeneric.inc:295
+#: plugins/admin/systems/class_componentGeneric.inc:156
 msgid "The field IP address contains an invalid address."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:292
+#: plugins/admin/systems/class_phoneGeneric.inc:300
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:295
+#: plugins/admin/systems/class_phoneGeneric.inc:303
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:302
+#: plugins/admin/systems/class_phoneGeneric.inc:310
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:312
-#: plugins/admin/systems/class_componentGeneric.inc:166
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/systems/class_servGeneric.inc:256
-#: plugins/admin/systems/class_winGeneric.inc:177
-#: plugins/admin/systems/class_terminalGeneric.inc:428
-#: plugins/admin/systems/class_workstationGeneric.inc:389
+#: plugins/admin/systems/class_phoneGeneric.inc:325
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_printGeneric.inc:672
+#: plugins/admin/systems/class_servGeneric.inc:263
+#: plugins/admin/systems/class_winGeneric.inc:188
+#: plugins/admin/systems/class_terminalGeneric.inc:443
+#: plugins/admin/systems/class_workstationGeneric.inc:404
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:398
+#: plugins/admin/systems/class_phoneGeneric.inc:411
 msgid "Saving phone failed"
 msgstr ""
 
@@ -3899,7 +4297,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_servRepositorySetup.inc:184
-#: plugins/admin/systems/class_workstationStartup.inc:1136
+#: plugins/admin/systems/class_workstationStartup.inc:1147
 #, php-format
 msgid ""
 "The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
@@ -3996,8 +4394,10 @@ msgid ""
 "back."
 msgstr ""
 
-#: plugins/admin/systems/remove.tpl:10 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10
+#: plugins/admin/systems/remove_dhcp.tpl:10
+#: plugins/admin/departments/remove.tpl:10 plugins/admin/fai/remove.tpl:11
+#: plugins/gofon/conference/remove.tpl:10
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "contents of your LDAP tree in a file. So - if you've done so - press "
@@ -4023,7 +4423,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/fai/class_faiSummaryTab.inc:227
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: include/class_MultiSelectWindow.inc:79 setup/setup_migrate.tpl:79
+#: include/class_MultiSelectWindow.inc:80 setup/setup_migrate.tpl:79
 msgid "Close"
 msgstr ""
 
@@ -4129,6 +4529,26 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
+#: plugins/admin/systems/dhcp_host.tpl:11
+msgid "Name of host"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_host.tpl:15
+msgid "Fixed address"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_host.tpl:19
+msgid "Use hostname or IP-address to assign fixed address"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_host.tpl:27
+msgid "Hardware type"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_host.tpl:35
+msgid "Hardware address"
+msgstr ""
+
 #: plugins/admin/systems/gencd.tpl:2
 msgid "CD-Install-Image generation"
 msgstr ""
@@ -4194,9 +4614,9 @@ msgstr ""
 #: include/sieve/templates/element_envelope.tpl:41
 #: include/sieve/templates/element_address.tpl:40
 #: include/sieve/templates/element_header.tpl:41 setup/setup_feedback.tpl:55
-#: setup/setup_feedback.tpl:73 setup/class_setupStep_Config3.inc:76
+#: setup/setup_feedback.tpl:73 setup/class_setupStep_Config3.inc:80
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Schema.inc:63
-#: setup/class_setupStep_Config1.inc:87 setup/class_setupStep_Config2.inc:125
+#: setup/class_setupStep_Config1.inc:87 setup/class_setupStep_Config2.inc:146
 msgid "Yes"
 msgstr ""
 
@@ -4210,9 +4630,9 @@ msgstr ""
 #: include/sieve/templates/element_envelope.tpl:43
 #: include/sieve/templates/element_address.tpl:42
 #: include/sieve/templates/element_header.tpl:43 setup/setup_feedback.tpl:57
-#: setup/setup_feedback.tpl:75 setup/class_setupStep_Config3.inc:76
+#: setup/setup_feedback.tpl:75 setup/class_setupStep_Config3.inc:80
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Schema.inc:63
-#: setup/class_setupStep_Config1.inc:87 setup/class_setupStep_Config2.inc:125
+#: setup/class_setupStep_Config1.inc:87 setup/class_setupStep_Config2.inc:146
 msgid "No"
 msgstr ""
 
@@ -4333,10 +4753,6 @@ msgstr ""
 msgid "Add/Edit network interface"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-msgid "MAC address"
-msgstr ""
-
 #: plugins/admin/systems/glpi_devices.tpl:596
 #: plugins/personal/connectivity/pureftpd.tpl:15
 msgid "Bandwidth"
@@ -4382,31 +4798,41 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:19
+#: plugins/admin/systems/network.tpl:17
 msgid "Autodetect"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:42
-msgid "Enable DNS for this device"
+#: plugins/admin/systems/network.tpl:33 plugins/admin/systems/network.tpl:41
+msgid "Enable DHCP for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:43
-#: plugins/admin/systems/servdnseditzone.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:76
-msgid "Refresh"
+#: plugins/admin/systems/network.tpl:41 plugins/admin/systems/network.tpl:116
+msgid "not configured"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:50
+msgid "Parent node"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:55
+msgid "Edit settings"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:85 plugins/admin/systems/network.tpl:116
+msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:51
+#: plugins/admin/systems/network.tpl:94
 msgid "Zone"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:163
+#: plugins/admin/systems/network.tpl:102
+#: plugins/admin/systems/class_servDNS.inc:250
 #: plugins/admin/systems/servdnseditzone.tpl:94
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:64
+#: plugins/admin/systems/network.tpl:107
 msgid "Dns records"
 msgstr ""
 
@@ -4420,20 +4846,20 @@ msgstr ""
 msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:102
+#: plugins/admin/systems/class_componentGeneric.inc:110
 msgid "Removing generic component failed"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:140
+#: plugins/admin/systems/class_componentGeneric.inc:148
 msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:156
-#: plugins/admin/systems/class_winGeneric.inc:167
+#: plugins/admin/systems/class_componentGeneric.inc:164
+#: plugins/admin/systems/class_winGeneric.inc:175
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:225
+#: plugins/admin/systems/class_componentGeneric.inc:236
 msgid "Saving generic component failed"
 msgstr ""
 
@@ -4448,19 +4874,19 @@ msgid "Boot kernel"
 msgstr ""
 
 #: plugins/admin/systems/terminalStartup.tpl:17
-#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/workstationStartup.tpl:16
 msgid "Custom options"
 msgstr ""
 
 #: plugins/admin/systems/terminalStartup.tpl:19
-#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/workstationStartup.tpl:18
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
 msgstr ""
 
 #: plugins/admin/systems/terminalStartup.tpl:22
-#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/workstationStartup.tpl:21
 msgid "LDAP server"
 msgstr ""
 
@@ -4489,27 +4915,58 @@ msgid "use debug mode for startup"
 msgstr ""
 
 #: plugins/admin/systems/terminalStartup.tpl:53
-#: plugins/admin/systems/workstationStartup.tpl:119
+#: plugins/admin/systems/workstationStartup.tpl:118
 msgid "Kernel modules (format: name parameters)"
 msgstr ""
 
 #: plugins/admin/systems/terminalStartup.tpl:55
-#: plugins/admin/systems/workstationStartup.tpl:121
+#: plugins/admin/systems/workstationStartup.tpl:120
 msgid "Add additional modules to load on startup"
 msgstr ""
 
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/servservice.tpl:11
-#: plugins/admin/systems/workstationStartup.tpl:133
+#: plugins/admin/systems/workstationStartup.tpl:132
 #: plugins/personal/environment/environment.tpl:106
 msgid "Shares"
 msgstr ""
 
 #: plugins/admin/systems/terminalStartup.tpl:79
-#: plugins/admin/systems/workstationStartup.tpl:146
+#: plugins/admin/systems/workstationStartup.tpl:145
 msgid "Mountpoint"
 msgstr ""
 
+#: plugins/admin/systems/remove_dhcp.tpl:6
+msgid ""
+"This includes 'all' DHCP subsections that are located within this section. "
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:134
+msgid "Required field 'Network address' is not filled."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:137
+msgid "Required field 'Netmask' is not filled."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:152
+#: plugins/admin/systems/dhcp_subnet.tpl:8
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:152
+#: plugins/admin/systems/dhcp_pool.tpl:11
+msgid "Range"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:154
+#, php-format
+msgid "The field '%s' contains an invalid IP address"
+msgstr ""
+
 #: plugins/admin/systems/glpiSelectUser.tpl:6
 #: plugins/admin/users/class_divListUsers.inc:35
 #: plugins/admin/users/class_divListUsers.inc:36
@@ -4521,10 +4978,6 @@ msgid ""
 "This dialog allows you to select a user as technical responsible person."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr ""
-
 #: plugins/admin/systems/class_systemManagement.inc:220
 msgid "You can't edit this object type yet!"
 msgstr ""
@@ -4561,7 +5014,7 @@ msgstr ""
 #: plugins/admin/systems/class_systemManagement.inc:500
 #, php-format
 msgid ""
-"Can't set gotoMode to status 'avtice', the current object couldn't be "
+"Can't set gotoMode to status 'active', the current object couldn't be "
 "identified."
 msgstr ""
 
@@ -4652,7 +5105,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printGeneric.inc:252
 msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
+"Could not initialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
@@ -4709,8 +5162,8 @@ msgstr ""
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:505
-msgid "can't get ppd informations."
+#: plugins/admin/systems/class_printGeneric.inc:502
+msgid "Not defined"
 msgstr ""
 
 #: plugins/admin/systems/class_printGeneric.inc:518
@@ -4723,20 +5176,22 @@ msgstr ""
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:578
+#: plugins/admin/systems/class_printGeneric.inc:587
 msgid "Removing printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:642
+#: plugins/admin/systems/class_printGeneric.inc:651
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:821
+#: plugins/admin/systems/class_printGeneric.inc:833
 msgid "Saving printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:841
-#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/systems/class_printGeneric.inc:853
+#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_servDHCP.inc:38
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
@@ -4744,29 +5199,45 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_printGeneric.inc:878
 #, php-format
 msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:888
+#: plugins/admin/systems/class_printGeneric.inc:900
 #, php-format
 msgid "Can't add '%s' to the list of members, it is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:896
+#: plugins/admin/systems/class_printGeneric.inc:908
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
 
+#: plugins/admin/systems/dhcp_advanced.tpl:8
+msgid "Hide advanced settings"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_advanced.tpl:15
+msgid "DHCP statements"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_advanced.tpl:28
+msgid "DHCP options"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_advanced.tpl:43
+msgid "Show advanced settings"
+msgstr ""
+
 #: plugins/admin/systems/class_servGeneric.inc:47
-#: plugins/admin/systems/class_workstationGeneric.inc:117
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/ogroups/class_termgroup.inc:47
 msgid "Activated"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:48
-#: plugins/admin/systems/class_workstationGeneric.inc:118
+#: plugins/admin/systems/class_workstationGeneric.inc:125
 #: plugins/admin/ogroups/class_termgroup.inc:48
 #: plugins/personal/connectivity/opengw.tpl:34
 msgid "Locked"
@@ -4777,109 +5248,102 @@ msgid "This 'dn' has no server features."
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:81
-#: plugins/admin/systems/class_workstationGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:163
 #: plugins/admin/ogroups/class_termgroup.inc:212
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/systems/class_terminalGeneric.inc:187
-#: plugins/admin/systems/class_terminalGeneric.inc:199
-#: plugins/admin/systems/class_terminalGeneric.inc:211
-#: plugins/admin/systems/class_workstationGeneric.inc:160
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_workstationGeneric.inc:167
 #: plugins/admin/ogroups/class_termgroup.inc:216
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:170
-#: plugins/admin/systems/class_terminalGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:261
+#: plugins/admin/systems/class_terminalGeneric.inc:284
+#: plugins/admin/systems/class_workstationGeneric.inc:268
 #: plugins/admin/ogroups/class_termgroup.inc:262
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:170
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:261
-#: plugins/admin/ogroups/class_termgroup.inc:263
-msgid "Reboot"
-msgstr ""
-
 #: plugins/admin/systems/class_servGeneric.inc:171
-#: plugins/admin/systems/class_workstationGeneric.inc:262
+#: plugins/admin/systems/class_workstationGeneric.inc:269
 #: plugins/admin/ogroups/class_termgroup.inc:264
 msgid "Instant update"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:172
 #: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_workstationGeneric.inc:263
-#: plugins/admin/systems/class_workstationGeneric.inc:272
+#: plugins/admin/systems/class_workstationGeneric.inc:270
+#: plugins/admin/systems/class_workstationGeneric.inc:279
 #: plugins/admin/ogroups/class_termgroup.inc:265
 msgid "Scheduled update"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:173
 #: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:264
 #: plugins/admin/systems/class_workstationGeneric.inc:271
+#: plugins/admin/systems/class_workstationGeneric.inc:278
 #: plugins/admin/ogroups/class_termgroup.inc:266
 msgid "Reinstall"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:174
-#: plugins/admin/systems/class_workstationGeneric.inc:265
+#: plugins/admin/systems/class_workstationGeneric.inc:272
 #: plugins/admin/ogroups/class_termgroup.inc:267
 msgid "Rescan hardware"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:175
 #: plugins/admin/systems/class_servGeneric.inc:182
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_workstationGeneric.inc:266
+#: plugins/admin/systems/class_terminalGeneric.inc:286
+#: plugins/admin/systems/class_terminalGeneric.inc:290
 #: plugins/admin/systems/class_workstationGeneric.inc:273
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 #: plugins/admin/ogroups/class_termgroup.inc:49
 msgid "Memory test"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:176
 #: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:267
 #: plugins/admin/systems/class_workstationGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:281
 msgid "Force localboot"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:177
 #: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_workstationGeneric.inc:268
+#: plugins/admin/systems/class_terminalGeneric.inc:287
+#: plugins/admin/systems/class_terminalGeneric.inc:291
 #: plugins/admin/systems/class_workstationGeneric.inc:275
+#: plugins/admin/systems/class_workstationGeneric.inc:282
 #: plugins/admin/ogroups/class_termgroup.inc:50
 msgid "System analysis"
 msgstr ""
 
 #: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_terminalGeneric.inc:284
-#: plugins/admin/systems/class_workstationGeneric.inc:270
+#: plugins/admin/systems/class_terminalGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:277
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:202
+#: plugins/admin/systems/class_servGeneric.inc:209
 msgid "Removing server failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:238
+#: plugins/admin/systems/class_servGeneric.inc:245
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:252
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_servGeneric.inc:322
 msgid "Saving server failed"
 msgstr ""
 
@@ -4887,6 +5351,45 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
+#: plugins/admin/systems/dhcpNewSection.tpl:2
+msgid "Create new DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/dhcpNewSection.tpl:6
+msgid "Please choose one of the following DHCP section types."
+msgstr ""
+
+#: plugins/admin/systems/dhcpNewSection.tpl:10
+msgid "Choose section type to create"
+msgstr ""
+
+#: plugins/admin/systems/dhcpNewSection.tpl:15
+#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:860
+msgid "Create"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpHost.inc:62
+msgid "Ethernet"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpHost.inc:63
+msgid "FDDI"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpHost.inc:64
+msgid "Token Ring"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpHost.inc:140
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:161
+#: plugins/admin/systems/class_dhcpGroup.inc:99
+msgid "The name for this host section is already used!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpHost.inc:149
+msgid "The hardware address specified by you is not valid!"
+msgstr ""
+
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:1
 msgid "Add/Edit manufacturer"
 msgstr ""
@@ -4903,7 +5406,7 @@ msgid "Phone number"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalStartup.inc:88
-#: plugins/admin/systems/class_workstationStartup.inc:345
+#: plugins/admin/systems/class_workstationStartup.inc:353
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -4927,9 +5430,9 @@ msgstr ""
 #: plugins/admin/systems/class_terminalService.inc:224
 #: plugins/admin/systems/class_terminalService.inc:227
 #: plugins/admin/systems/class_terminalService.inc:230
-#: plugins/admin/systems/class_workstationStartup.inc:320
-#: plugins/admin/systems/class_workstationStartup.inc:324
-#: plugins/admin/systems/class_workstationStartup.inc:828
+#: plugins/admin/systems/class_workstationStartup.inc:328
+#: plugins/admin/systems/class_workstationStartup.inc:332
+#: plugins/admin/systems/class_workstationStartup.inc:837
 #: plugins/admin/systems/class_workstationService.inc:196
 #: plugins/admin/systems/class_workstationService.inc:199
 #: plugins/admin/systems/class_workstationService.inc:202
@@ -4944,16 +5447,16 @@ msgstr ""
 #: plugins/admin/systems/class_workstationService.inc:228
 #: plugins/admin/systems/class_workstationService.inc:229
 #: plugins/admin/systems/class_workstationService.inc:230
-#: plugins/admin/systems/class_terminalGeneric.inc:126
-#: plugins/admin/systems/class_terminalGeneric.inc:297
-#: plugins/admin/systems/class_workstationGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:131
+#: plugins/admin/systems/class_terminalGeneric.inc:303
+#: plugins/admin/systems/class_workstationGeneric.inc:140
 msgid "inherited"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalStartup.inc:204
-#: plugins/admin/systems/class_workstationStartup.inc:642
-#: plugins/personal/environment/class_environment.inc:551
-#: plugins/personal/environment/class_environment.inc:564
+#: plugins/admin/systems/class_workstationStartup.inc:647
+#: plugins/personal/environment/class_environment.inc:557
+#: plugins/personal/environment/class_environment.inc:570
 msgid "You must specify a valid mount point."
 msgstr ""
 
@@ -5028,25 +5531,17 @@ msgid ""
 "'%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:157
-msgid "Cartridges"
-msgstr ""
-
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:158
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/systems/server.tpl:51 plugins/admin/systems/terminal.tpl:124
-#: plugins/admin/systems/workstation.tpl:103
-#: plugins/admin/ogroups/termgroup.tpl:75
-msgid "Action"
+msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:205
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:220
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:206
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:221
 msgid "New monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:205
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:220
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:206
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:221
 msgid "M"
 msgstr ""
 
@@ -5101,61 +5596,75 @@ msgstr ""
 msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:129
+#: plugins/admin/systems/class_winGeneric.inc:137
 msgid "Removing Samba workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:228
+#: plugins/admin/systems/class_winGeneric.inc:239
 msgid "Saving Samba workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:70
+#: plugins/admin/systems/class_servDNS.inc:122
+#, php-format
+msgid "You are going to migrate the DNS setup from server '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:124
+#: plugins/admin/systems/class_servDHCP.inc:124
+msgid ""
+"The migration will be started when you save this system. To cancel this "
+"action, use the cancel button below."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:149
 #: plugins/admin/systems/class_inventory.inc:32
 msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:71
+#: plugins/admin/systems/class_servDNS.inc:150
 #: plugins/admin/systems/class_inventory.inc:33
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:73
+#: plugins/admin/systems/class_servDNS.inc:152
 #: plugins/admin/systems/class_inventory.inc:35
 msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:74
+#: plugins/admin/systems/class_servDNS.inc:153
 #: plugins/admin/systems/class_inventory.inc:36
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:162
+#: plugins/admin/systems/class_servDNS.inc:249
 msgid "Reverse zone"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:164
+#: plugins/admin/systems/class_servDNS.inc:251
+#: plugins/admin/systems/class_servDHCP.inc:35
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
 msgid "Class"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:229
+#: plugins/admin/systems/class_servDNS.inc:316
 #, 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:297
+#: plugins/admin/systems/class_servDNS.inc:422
 msgid "Updating DNS service failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:306
+#: plugins/admin/systems/class_servDNS.inc:433
 msgid "Removing DNS entries failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:327
+#: plugins/admin/systems/class_servDNS.inc:456
+#: plugins/admin/systems/class_servDNS.inc:465
 msgid "Saving DNS entries failed"
 msgstr ""
 
@@ -5163,66 +5672,125 @@ msgstr ""
 msgid "Your browser does not supprt iframes."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:190
 #, php-format
 msgid ""
 "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:224
+#: plugins/admin/systems/class_termDNS.inc:324
 msgid "Not matching"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:309
+#: plugins/admin/systems/class_termDNS.inc:420
+msgid "You have not configured your dhcp settings yet."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:430
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:316
+#: plugins/admin/systems/class_termDNS.inc:437
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:322
+#: plugins/admin/systems/class_termDNS.inc:443
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:328
+#: plugins/admin/systems/class_termDNS.inc:449
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:341
+#: plugins/admin/systems/class_termDNS.inc:462
 #, php-format
 msgid ""
 "The specified IP address '%s' is not matching the selected reverse zone "
 "entry '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:356
+#: plugins/admin/systems/class_termDNS.inc:477
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:364
+#: plugins/admin/systems/class_termDNS.inc:485
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:375
+#: plugins/admin/systems/class_termDNS.inc:496
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
 "please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:382
-#: plugins/admin/systems/class_servDNSeditZone.inc:428
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+#: plugins/admin/systems/class_termDNS.inc:503
+#: plugins/admin/systems/class_servDNSeditZone.inc:437
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:547
+msgid "Removing dhcp entry for this object failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:559
+#: plugins/admin/systems/class_termDNS.inc:574
+msgid "Tried to add new dhcp entry failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:577
+msgid "Removing old dhcp entry failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:589
+msgid "Modifying dhcp entry failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:656
+msgid "Saving terminal to DNS object failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:25
+msgid "SSH systems keys"
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:26
+msgid "This plugin store ssh public keys for systems"
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:88
+msgid "Remove SSH keys"
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:89
+msgid ""
+"This server has SSH features enabled. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:91
+msgid "Add SSH keys"
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:92
+msgid ""
+"This server has SSH features disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:129
+msgid "Removing SSH key failed"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:467
-msgid "Saving terminal to DNS object failed"
+#: plugins/admin/systems/class_servSsh.inc:150
+msgid "Value specified as 'SSH Key' is not valid."
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:176
+msgid "Saving SSH key failed"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:68
@@ -5271,34 +5839,34 @@ msgstr ""
 msgid "Currently no file uploaded."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:197
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:198
 msgid "Mime"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:200
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:217
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:218
 #: include/sieve/class_sieveElement_If.inc:447
 msgid "empty"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:254
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:255
 msgid "Create new attachment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:255
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:256
 msgid "New Attachment"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:346
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:347
 #: plugins/admin/systems/class_servRepository.inc:240
-#: plugins/admin/fai/class_faiManagement.inc:357
+#: plugins/admin/fai/class_faiManagement.inc:362
 msgid "This name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:350
 msgid "Please specify a valid name for this attachment."
 msgstr ""
 
@@ -5309,26 +5877,119 @@ msgid ""
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:31
+#: plugins/admin/systems/class_servDHCP.inc:33
+msgid "Logging"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:312
+#: plugins/admin/systems/class_servDHCP.inc:577
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:26
+msgid "Global options"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:28
+msgid "Subclass"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:37
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:29
+msgid "Host"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:39
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:31
+msgid "Pool"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:40
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:32
+msgid "Subnet"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:41
+msgid "Failover peer"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:42
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:33
+msgid "Shared network"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:123
+#, php-format
+msgid "You are going to migrate the DHCP setup from server '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:240
+msgid "You're not allowed to remove DHCP sections!"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:274
+#, php-format
+msgid "You're about to delete the DHCP section '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:298
 msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:32
+#: plugins/admin/systems/class_servDHCP.inc:299
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:317
 msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:35
+#: plugins/admin/systems/class_servDHCP.inc:318
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
+#: plugins/admin/systems/class_servDHCP.inc:338
+#: plugins/admin/systems/class_servDHCP.inc:341
+msgid "Insert new DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:339
+#: plugins/admin/systems/class_servDHCP.inc:342
+#: plugins/admin/systems/class_servDHCP.inc:343
+msgid "Edit DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:340
+#: plugins/admin/systems/class_servDHCP.inc:344
+msgid "Remove DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:392
+#: plugins/admin/systems/class_servDHCP.inc:407
+msgid "Removing DHCP entries failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:460
+msgid "Can't remove DHCP object!"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:513
+#: plugins/admin/systems/class_servDHCP.inc:516
+msgid "Can't save DHCP object!"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:538
+msgid "Saving DHCP service failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:654
+msgid ""
+"DHCP configuration set is unknown. Please contact your system administrator."
+msgstr ""
+
 #: plugins/admin/systems/class_terminalService.inc:65
 #: plugins/admin/systems/class_workstationService.inc:87
 #: plugins/admin/systems/workstationService.tpl:121
@@ -5337,7 +5998,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:91
 #: plugins/admin/systems/class_workstationService.inc:83
-#: plugins/personal/environment/class_environment.inc:204
+#: plugins/personal/environment/class_environment.inc:205
 #, php-format
 msgid ""
 "You have specified an external resolution hook which can't be read, please "
@@ -5385,9 +6046,11 @@ msgid "ICA client"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:190
-#: plugins/admin/systems/class_workstationStartup.inc:829
+#: plugins/admin/systems/class_workstationStartup.inc:840
 #: plugins/admin/systems/class_workstationService.inc:177
-#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_dhcpAdvanced.inc:78
+#: plugins/admin/systems/class_dhcpAdvanced.inc:87
+#: plugins/personal/posix/class_posixAccount.inc:200
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:248
 msgid "automatic"
 msgstr ""
@@ -5441,15 +6104,15 @@ msgid ""
 "You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:182
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:183
 msgid "devices"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:222
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:223
 msgid "New mainbord"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:222
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:223
 #: plugins/personal/scalix/generic.tpl:51
 #: plugins/personal/mail/generic.tpl:176
 #: plugins/personal/connectivity/class_proxyAccount.inc:90
@@ -5458,142 +6121,161 @@ msgstr ""
 msgid "MB"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:224
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 msgid "New processor"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:224
-#: plugins/admin/fai/class_divListFai.inc:124
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/fai/class_divListFai.inc:127
 msgid "P"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:226
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "New case"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:226
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:228
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "New network interface"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:228
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "NI"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:230
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 msgid "New ram"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:230
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 msgid "R"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:232
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 msgid "New hard disk"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:232
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
 msgid "HDD"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:234
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 msgid "New drive"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:234
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 msgid "D"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:236
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 msgid "New controller"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:236
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 msgid "CS"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:238
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:238
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 msgid "GC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:240
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 msgid "New sound card"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:240
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:242
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
 msgid "New power supply"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:242
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
 msgid "PS"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:244
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 msgid "New misc device"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:244
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:342
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:343
 msgid "You have to specify a valid name for this device."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:362
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:365
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:363
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
 msgid "This device name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:401
-#: plugins/personal/environment/class_environment.inc:467
-#: plugins/personal/environment/class_environment.inc:800
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:402
+#: plugins/personal/environment/class_environment.inc:216
+#: plugins/personal/environment/class_environment.inc:457
+#: plugins/personal/environment/class_environment.inc:806
 msgid "None"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:401
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:402
 msgid "Other"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:449
+#: plugins/admin/systems/servdhcp.tpl:5
+msgid ""
+"DHCP take over will take place when saving this entry. Choose 'Cancel' to "
+"abort."
+msgstr ""
+
+#: plugins/admin/systems/servdhcp.tpl:14
+msgid "Take over DHCP configuration from"
+msgstr ""
+
+#: plugins/admin/systems/servdhcp.tpl:18 plugins/admin/systems/servdns.tpl:18
+msgid "Take over"
+msgstr ""
+
+#: plugins/admin/systems/servdhcp.tpl:24
+msgid "DHCP sections"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:454
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:494
+#: plugins/admin/systems/class_workstationStartup.inc:499
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:554
+#: plugins/admin/systems/class_workstationStartup.inc:559
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:748
+#: plugins/admin/systems/class_workstationStartup.inc:753
 msgid "Not available in current setup"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:900
+#: plugins/admin/systems/class_workstationStartup.inc:911
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:913
+#: plugins/admin/systems/class_workstationStartup.inc:924
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -5601,11 +6283,11 @@ msgid ""
 "reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1084
+#: plugins/admin/systems/class_workstationStartup.inc:1095
 msgid "Saving workstation startup settings failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1134
+#: plugins/admin/systems/class_workstationStartup.inc:1145
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
@@ -5633,8 +6315,8 @@ msgstr ""
 #: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiDeviceManagement.tpl:51
-#: plugins/admin/systems/class_glpiSelectUser.inc:108
-#: plugins/admin/systems/class_glpiSelectUser.inc:135
+#: plugins/admin/systems/class_glpiSelectUser.inc:109
+#: plugins/admin/systems/class_glpiSelectUser.inc:136
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
 msgid "Use"
 msgstr ""
@@ -6004,53 +6686,74 @@ msgstr ""
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:109
-#: plugins/personal/posix/class_posixAccount.inc:560
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:147
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:49
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
+msgid "Default lease time"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:148
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:56
+msgid "Max. lease time"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:149
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:63
+msgid "Min. lease time"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:152
+#, php-format
+msgid "The value specified as '%s' is not numeric!"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
-#: setup/setup_config2.tpl:126
+#: setup/setup_config2.tpl:187
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:110
+#: plugins/admin/systems/class_terminalGeneric.inc:115
 msgid "text"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:111
+#: plugins/admin/systems/class_terminalGeneric.inc:116
 msgid "graphic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:183
+#: plugins/admin/systems/class_terminalGeneric.inc:188
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:195
+#: plugins/admin/systems/class_terminalGeneric.inc:200
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:207
+#: plugins/admin/systems/class_terminalGeneric.inc:212
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:337
+#: plugins/admin/systems/class_terminalGeneric.inc:352
 msgid "Removing terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:403
+#: plugins/admin/systems/class_terminalGeneric.inc:418
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:407
+#: plugins/admin/systems/class_terminalGeneric.inc:422
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:438
-#: plugins/admin/systems/class_workstationGeneric.inc:400
+#: plugins/admin/systems/class_terminalGeneric.inc:453
+#: plugins/admin/systems/class_workstationGeneric.inc:415
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:522
+#: plugins/admin/systems/class_terminalGeneric.inc:537
 msgid "Saving terminal failed"
 msgstr ""
 
@@ -6152,33 +6855,52 @@ msgid "Choose a base"
 msgstr ""
 
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/systems/class_glpiSelectUser.inc:155
-#: include/class_MultiSelectWindow.inc:188
+#: plugins/admin/systems/class_glpiSelectUser.inc:156
+#: include/class_MultiSelectWindow.inc:189
 msgid "Go to root department"
 msgstr ""
 
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_glpiSelectUser.inc:156
+#: include/class_MultiSelectWindow.inc:189
+#: include/class_MultiSelectWindow.inc:191
+msgid "Root"
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_glpiSelectUser.inc:157
-#: include/class_MultiSelectWindow.inc:196
+#: plugins/admin/systems/class_glpiSelectUser.inc:158
+#: include/class_MultiSelectWindow.inc:197
 msgid "Go up one department"
 msgstr ""
 
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_servDNSeditZone.inc:323
+#: plugins/admin/systems/class_glpiSelectUser.inc:158
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: plugins/admin/fai/class_faiProfile.inc:305
+#: include/sieve/templates/object_container_clear.tpl:8
+#: include/sieve/templates/object_container.tpl:8
+#: include/class_MultiSelectWindow.inc:197
+#: include/class_MultiSelectWindow.inc:199
+msgid "Up"
+msgstr ""
+
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_glpiSelectUser.inc:159
-#: include/class_MultiSelectWindow.inc:204
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: include/class_MultiSelectWindow.inc:205
 msgid "Go to users department"
 msgstr ""
 
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_glpiSelectUser.inc:159
-#: include/class_MultiSelectWindow.inc:204
-#: include/class_MultiSelectWindow.inc:206
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: include/class_MultiSelectWindow.inc:205
+#: include/class_MultiSelectWindow.inc:207
 msgid "Home"
 msgstr ""
 
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: include/class_MultiSelectWindow.inc:211
+#: plugins/admin/systems/class_glpiSelectUser.inc:161
+#: include/class_MultiSelectWindow.inc:212
 msgid "Reload list"
 msgstr ""
 
@@ -6270,30 +6992,40 @@ msgstr ""
 msgid "Set status flag for server services/anti virus with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:202
+#: plugins/admin/systems/class_workstationGeneric.inc:209
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:310
+#: plugins/admin/systems/class_workstationGeneric.inc:325
 msgid "Removing workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:367
+#: plugins/admin/systems/class_workstationGeneric.inc:382
 #: plugins/admin/ogroups/class_termgroup.inc:115
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:371
+#: plugins/admin/systems/class_workstationGeneric.inc:386
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:472
-#: plugins/admin/systems/class_workstationGeneric.inc:496
+#: plugins/admin/systems/class_workstationGeneric.inc:487
+#: plugins/admin/systems/class_workstationGeneric.inc:511
 #: plugins/admin/ogroups/class_termgroup.inc:334
 msgid "Saving workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/servdns.tpl:1
+#: plugins/admin/systems/servdns.tpl:5
+msgid ""
+"DNS take over will take place when saving this entry. Choose 'Cancel' to "
+"abort."
+msgstr ""
+
+#: plugins/admin/systems/servdns.tpl:14
+msgid "Take over DNS configuration from"
+msgstr ""
+
+#: plugins/admin/systems/servdns.tpl:24
 msgid "Zones"
 msgstr ""
 
@@ -6306,7 +7038,7 @@ msgid "Attachment"
 msgstr ""
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:181
+#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:195
 msgid "File"
 msgstr ""
 
@@ -6317,10 +7049,6 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr ""
-
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:54
 msgid "Mime-type"
 msgstr ""
@@ -6363,22 +7091,22 @@ msgid ""
 "Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:280
+#: plugins/admin/systems/class_servRepository.inc:281
 #: plugins/admin/systems/servRepositorySetup.tpl:17
-#: plugins/admin/systems/workstationStartup.tpl:47
-#: plugins/admin/systems/workstationStartup.tpl:77
+#: plugins/admin/systems/workstationStartup.tpl:46
+#: plugins/admin/systems/workstationStartup.tpl:76
 #: plugins/admin/fai/faiPackage.tpl:33
 msgid "Release"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:281
-#: plugins/admin/systems/class_servRepository.inc:300
-#: plugins/admin/systems/class_servRepository.inc:304
+#: plugins/admin/systems/class_servRepository.inc:282
+#: plugins/admin/systems/class_servRepository.inc:301
+#: plugins/admin/systems/class_servRepository.inc:305
 #: plugins/admin/systems/servRepositorySetup.tpl:33
 msgid "Sections"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:315
+#: plugins/admin/systems/class_servDNSeditZone.inc:324
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: plugins/admin/fai/class_faiProfile.inc:306
 #: include/sieve/templates/object_container_clear.tpl:12
@@ -6386,67 +7114,67 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:394
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
 #, php-format
 msgid "Please choose a valid zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:398
+#: plugins/admin/systems/class_servDNSeditZone.inc:407
 #, php-format
 msgid "Please choose a valid reverse zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:402
+#: plugins/admin/systems/class_servDNSeditZone.inc:411
 msgid "Only lowercase strings are allowed as zone name."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:406
+#: plugins/admin/systems/class_servDNSeditZone.inc:415
 msgid "Please specify a numeric value for serial number."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:410
+#: plugins/admin/systems/class_servDNSeditZone.inc:419
 msgid "Please specify a numeric value for refresh."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:414
+#: plugins/admin/systems/class_servDNSeditZone.inc:423
 msgid "Please specify a numeric value for ttl."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:418
+#: plugins/admin/systems/class_servDNSeditZone.inc:427
 msgid "Please specify a numeric value for expire."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:422
+#: plugins/admin/systems/class_servDNSeditZone.inc:431
 msgid "Please specify a numeric value for retry."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:437
+#: plugins/admin/systems/class_servDNSeditZone.inc:446
 msgid ""
 "The given network address is not a valid, please specify a valid IP address."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:444
+#: plugins/admin/systems/class_servDNSeditZone.inc:453
 #, php-format
 msgid ""
 "The specified network address is not matching with the specified zone class, "
 "try it this way x.0.0.0"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:450
+#: plugins/admin/systems/class_servDNSeditZone.inc:459
 #, php-format
 msgid ""
 "The specified network address is not matching with the specified zone class, "
 "try it this way x.x.0.0"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:456
+#: plugins/admin/systems/class_servDNSeditZone.inc:465
 #, php-format
 msgid ""
 "The specified network address is not matching with the specified zone class, "
 "try it this way x.x.x.0"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:460
+#: plugins/admin/systems/class_servDNSeditZone.inc:469
 #, php-format
 msgid "The given network class '%s' is not valid."
 msgstr ""
@@ -6465,14 +7193,18 @@ msgstr ""
 msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:61 plugins/admin/systems/terminal.tpl:134
-#: plugins/admin/systems/workstation.tpl:113
+#: plugins/admin/systems/server.tpl:61 plugins/admin/systems/terminal.tpl:138
+#: plugins/admin/systems/workstation.tpl:119
 #: plugins/admin/applications/generic.tpl:17
 #: plugins/admin/ogroups/termgroup.tpl:85
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
 msgstr ""
 
+#: plugins/admin/systems/class_dhcpGroup.inc:91
+msgid "Field 'Name' contains illegal characters."
+msgstr ""
+
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
@@ -6545,25 +7277,26 @@ msgstr ""
 msgid "Choose NFS filesystem to place swap files on"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:92
-#: plugins/admin/systems/workstation.tpl:71
+#: plugins/admin/systems/terminal.tpl:93 plugins/admin/systems/terminal.tpl:95
+#: plugins/admin/systems/workstation.tpl:74
+#: plugins/admin/systems/workstation.tpl:76
 msgid "Inherit time server attributes"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:96
-#: plugins/admin/systems/workstation.tpl:75
+#: plugins/admin/systems/terminal.tpl:100
+#: plugins/admin/systems/workstation.tpl:81
 #: plugins/admin/ogroups/termgroup.tpl:14
 msgid "NTP server"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:98
-#: plugins/admin/systems/workstation.tpl:77
+#: plugins/admin/systems/terminal.tpl:102
+#: plugins/admin/systems/workstation.tpl:83
 #: plugins/admin/ogroups/termgroup.tpl:16
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:128
-#: plugins/admin/systems/workstation.tpl:107
+#: plugins/admin/systems/terminal.tpl:132
+#: plugins/admin/systems/workstation.tpl:113
 #: plugins/admin/ogroups/termgroup.tpl:79
 msgid "Select action to execute for this terminal"
 msgstr ""
@@ -6651,12 +7384,15 @@ msgstr ""
 msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:287 html/getxls.php:174
+msgid "Location"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
@@ -6698,11 +7434,6 @@ msgstr ""
 msgid "System / Department"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr ""
-
 #: plugins/admin/systems/class_divListSystem.inc:62
 msgid "Select to see Linux terminals"
 msgstr ""
@@ -6716,11 +7447,6 @@ msgstr ""
 msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:63
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr ""
-
 #: plugins/admin/systems/class_divListSystem.inc:64
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
@@ -6827,26 +7553,62 @@ msgstr ""
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:147
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:149
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:178
-msgid "Set root       password"
+#: plugins/admin/systems/class_divListSystem.inc:184
+msgid "Set root password"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:190
 msgid "Create CD"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:190
 msgid "Create FAI CD"
 msgstr ""
 
+#: plugins/admin/systems/class_divListSystem.inc:218
+msgid "Number of listed servers"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:219
+msgid "Number of listed workstations"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:220
+msgid "Number of listed terminals"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:221
+msgid "Number of listed phones"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:222
+msgid "Number of listed printers"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:223
+msgid "Number of listed network components"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:224
+msgid "Number of listed new devices"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:225
+msgid "Number of listed windows workstations"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_group.tpl:10
+msgid "Name of group"
+msgstr ""
+
 #: plugins/admin/systems/servservice.tpl:37
 msgid "Time Service"
 msgstr ""
@@ -6891,6 +7653,68 @@ msgstr ""
 msgid "New driver"
 msgstr ""
 
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:12
+msgid "Name for shared network"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:19
+msgid "Propagated server identifier for this shared network"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:31
+msgid "Select if this server is authoritative for this shared network"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:31
+msgid "Authoritative server"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:46
+msgid "Leases"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+msgid "seconds"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
+msgid "Maximum lease time"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:66
+msgid "Minimum lease time"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:74
+msgid "Access control"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:79
+msgid "Select if unknown clients should get dynamic IP addresses"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:79
+msgid "Allow unknown clients"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:85
+msgid "Select if bootp clients should get dynamic IP addresses"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:85
+msgid "Allow bootp clients"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:91
+msgid "Select if clients are allowed to boot using this DHCP server"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:91
+msgid "Allow booting"
+msgstr ""
+
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:6
 msgid "List of available cartridge type for this type of printer"
 msgstr ""
@@ -6912,6 +7736,10 @@ msgstr ""
 msgid "Regular expression for matching cartridge types"
 msgstr ""
 
+#: plugins/admin/systems/dhcp_subnet.tpl:20
+msgid "Range for dynamic address assignment"
+msgstr ""
+
 #: plugins/admin/systems/glpiDeviceManagement.tpl:6
 msgid "List of devices"
 msgstr ""
@@ -7007,6 +7835,15 @@ msgstr ""
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_dhcpNetwork.inc:42
+msgid "The name of the DNS server your're going to add is not valid!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpNetwork.inc:211
+#, php-format
+msgid "Error in definition of '%s'!"
+msgstr ""
+
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
 msgstr ""
@@ -7045,10 +7882,6 @@ msgstr ""
 msgid "Other network component"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:860
-msgid "Create"
-msgstr ""
-
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -7139,14 +7972,6 @@ msgstr ""
 msgid "Zone name"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
-msgstr ""
-
-#: plugins/admin/systems/servdnseditzone.tpl:19
-msgid "Netmask"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:33
 msgid "Zone records"
 msgstr ""
@@ -7173,6 +7998,11 @@ msgstr ""
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
+#: plugins/admin/systems/servdnseditzone.tpl:76
+#: plugins/gofon/phoneaccount/generic.tpl:76
+msgid "Refresh"
+msgstr ""
+
 #: plugins/admin/systems/servdnseditzone.tpl:82
 #: plugins/admin/ogroups/phonequeue.tpl:67
 msgid "Retry"
@@ -7190,17 +8020,17 @@ msgstr ""
 msgid "Global zone records"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:43
-#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/workstationStartup.tpl:42
+#: plugins/admin/systems/workstationStartup.tpl:72
 msgid "FAI server"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:65
-#: plugins/admin/systems/workstationStartup.tpl:97
+#: plugins/admin/systems/workstationStartup.tpl:64
+#: plugins/admin/systems/workstationStartup.tpl:96
 msgid "Assigned FAI classes"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:87
+#: plugins/admin/systems/workstationStartup.tpl:86
 msgid "set"
 msgstr ""
 
@@ -7242,6 +8072,46 @@ msgstr ""
 msgid "Option contains invalid characters."
 msgstr ""
 
+#: plugins/admin/systems/dhcp_pool.tpl:8
+msgid "Name of pool"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpAdvanced.inc:53
+msgid "Can't delete automatic statements. Please use the fields above."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpAdvanced.inc:66
+msgid "Can't delete automatic options. Please use the fields above."
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:6
+msgid "Authoritative service"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:8
+msgid "Dynamic DNS update"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:9
+msgid "Dynamic DNS update style"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:18
+msgid "Default lease time (s)"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:20
+msgid "Enter default lease time in seconds."
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:24
+msgid "Maximum lease time (s)"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_service.tpl:26
+msgid "Enter maximum lease time in seconds."
+msgstr ""
+
 #: plugins/admin/systems/goVirusServer.tpl:5
 msgid "Generic virus filtering"
 msgstr ""
@@ -7319,13 +8189,13 @@ msgstr ""
 msgid "Saving mount container failed"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:107
+#: plugins/admin/systems/class_glpiSelectUser.inc:108
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_divListOGroup.inc:52
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:135
+#: plugins/admin/systems/class_glpiSelectUser.inc:136
 msgid "use"
 msgstr ""
 
@@ -7383,7 +8253,7 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/class_divListApplication.inc:89
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:98
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:105
 #: plugins/admin/ogroups/class_divListOGroup.inc:99
 msgid "new"
 msgstr ""
@@ -7392,6 +8262,10 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
+#: plugins/admin/applications/class_divListApplication.inc:195
+msgid "Number of listed applications"
+msgstr ""
+
 #: plugins/admin/applications/class_applicationGeneric.inc:91
 msgid "no example"
 msgstr ""
@@ -7426,10 +8300,6 @@ msgstr ""
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:362
-msgid "Required field 'Name' is not filled."
-msgstr ""
-
 #: plugins/admin/applications/class_applicationGeneric.inc:366
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
@@ -7545,11 +8415,6 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:63
-#: plugins/admin/mimetypes/generic.tpl:63
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/applications/generic.tpl:63
 msgid "Reload picture from LDAP"
 msgstr ""
@@ -7577,19 +8442,13 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:103
 #: plugins/admin/fai/class_faiScriptEntry.inc:84
 #: plugins/admin/fai/class_faiHookEntry.inc:79
-#: plugins/admin/fai/class_faiScript.inc:258
-#: plugins/admin/fai/class_faiHook.inc:279
-#: plugins/admin/fai/class_faiTemplate.inc:257
+#: plugins/admin/fai/class_faiScript.inc:299
+#: plugins/admin/fai/class_faiScript.inc:320
+#: plugins/admin/fai/class_faiHook.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:272
 msgid "Download"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-
 #: plugins/admin/users/template.tpl:2
 msgid "Creating a new user using templates"
 msgstr ""
@@ -7607,12 +8466,20 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/admin/users/class_userManagement.inc:284
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84 html/password.php:186
 msgid ""
@@ -7620,23 +8487,23 @@ msgid ""
 "do not match."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:248
+#: plugins/admin/users/class_userManagement.inc:289
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -7718,58 +8585,66 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:137
+#: plugins/admin/users/class_divListUsers.inc:140
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:138
+#: plugins/admin/users/class_divListUsers.inc:141
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:140
+#: plugins/admin/users/class_divListUsers.inc:143
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:142
+#: plugins/admin/users/class_divListUsers.inc:145
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:144
+#: plugins/admin/users/class_divListUsers.inc:147
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:146
+#: plugins/admin/users/class_divListUsers.inc:149
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:148
+#: plugins/admin/users/class_divListUsers.inc:151
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:150
+#: plugins/admin/users/class_divListUsers.inc:153
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:152
+#: plugins/admin/users/class_divListUsers.inc:155
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:153
+#: plugins/admin/users/class_divListUsers.inc:156
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:154
+#: plugins/admin/users/class_divListUsers.inc:157
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:184
+msgid "Deactivated"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr ""
 
+#: plugins/admin/users/class_divListUsers.inc:298
+msgid "Number of listed users"
+msgstr ""
+
 #: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
 msgid "User administration"
 msgstr ""
@@ -7838,16 +8713,20 @@ msgstr ""
 msgid "Display mime types matching"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:99
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:106
 msgid "Create new mime type"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
 #: plugins/admin/mimetypes/paste_generic.tpl:13
 #: plugins/admin/mimetypes/generic.tpl:12
 msgid "Mime type"
 msgstr ""
 
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+msgid "Number of listed mimetypes"
+msgstr ""
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Mime types"
 msgstr ""
@@ -7856,38 +8735,26 @@ msgstr ""
 msgid "Manage mime types"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:290
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:307
 #, php-format
 msgid "You're about to delete the following entry %s"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:292
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:309
 #, php-format
 msgid "You're about to delete the following entries %s"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:326
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
 #, php-format
 msgid "You're about to delete the mime type '%s'."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:333
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:363
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:350
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:380
 msgid "You are not allowed to delete this mime type!"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:388
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
-#: setup/setup_checks.tpl:27 setup/setup_checks.tpl:87
-#: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:392
-#: setup/class_setupStep_Migrate.inc:468 setup/class_setupStep_Migrate.inc:539
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:722
-#: setup/class_setupStep_Migrate.inc:854
-#: setup/class_setupStep_Migrate.inc:1623
-msgid "Ok"
-msgstr ""
-
 #: plugins/admin/mimetypes/main.inc:42 plugins/admin/mimetypes/main.inc:44
 msgid "Mimetype management"
 msgstr ""
@@ -8235,21 +9102,20 @@ msgstr ""
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:160
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
+#: plugins/admin/ogroups/class_divListOGroup.inc:183
+msgid "Number of listed object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:63
-#: plugins/admin/ogroups/tabs_ogroups.inc:200
+#: plugins/admin/ogroups/tabs_ogroups.inc:65
+#: plugins/admin/ogroups/tabs_ogroups.inc:199
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:89
+#: plugins/admin/ogroups/tabs_ogroups.inc:91
 msgid "System"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:178
 msgid "Terminals"
 msgstr ""
 
@@ -8291,10 +9157,6 @@ msgstr ""
 msgid "Show applications"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
-msgstr ""
-
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to see terminals"
 msgstr ""
@@ -8449,7 +9311,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1116
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1123
 msgid "Please select a valid goFonHomeServer."
 msgstr ""
 
@@ -8475,8 +9337,8 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:342
 #: plugins/admin/ogroups/class_phonequeue.inc:391
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:299
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:860
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -8513,8 +9375,8 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:761
 #: plugins/admin/ogroups/class_phonequeue.inc:763
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1378
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1380
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1389
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1391
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:565
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
 #, php-format
@@ -8883,7 +9745,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/fai/faiHook.tpl:34 plugins/admin/fai/faiScript.tpl:34
-#: plugins/admin/fai/class_faiProfileEntry.inc:170
+#: plugins/admin/fai/class_faiProfileEntry.inc:171
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
 #: plugins/admin/fai/faiTemplate.tpl:29
@@ -8943,12 +9805,12 @@ msgstr ""
 msgid "Please enter your search string here"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:43
+#: plugins/admin/fai/class_faiPackageEntry.inc:44
 msgid ""
 "This list displays all assigned package names for this repository settings."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:122
+#: plugins/admin/fai/class_faiPackageEntry.inc:123
 #, php-format
 msgid ""
 "Your specified search string '%s' returned too many results. Only the first "
@@ -8967,7 +9829,7 @@ msgstr ""
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:74 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:74 include/functions.inc:659
 msgid "Configure"
 msgstr ""
 
@@ -8988,24 +9850,24 @@ msgstr ""
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:282
+#: plugins/admin/fai/class_faiManagement.inc:284
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:285
+#: plugins/admin/fai/class_faiManagement.inc:287
 msgid "You are not allowed to delete this release!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:348
+#: plugins/admin/fai/class_faiManagement.inc:353
 msgid "Specified branch name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:350
+#: plugins/admin/fai/class_faiManagement.inc:355
 msgid "Specified freeze name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:36
+#: plugins/admin/fai/faiScript.tpl:35
 msgid "List of scripts"
 msgstr ""
 
@@ -9017,80 +9879,84 @@ msgstr ""
 msgid "Choose a priority"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "primary"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "logical"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:201
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:206
 msgid "FS type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:202
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:207
 #: plugins/admin/fai/class_faiSummaryTab.inc:333
 msgid "Mount point"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:203
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:208
 #: plugins/admin/fai/class_faiSummaryTab.inc:332
 msgid "Size in MB"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:204
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:209
 #: plugins/admin/fai/class_faiSummaryTab.inc:331
 msgid "Mount options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:210
 msgid "FS option"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:206
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:211
 msgid "Preserve"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:362
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:359
+msgid "Please specify a valid disk name"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:372
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:377
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:372
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:394
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:404
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:399
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:409
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:424
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -9126,12 +9992,12 @@ msgstr ""
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:167
+#: plugins/admin/fai/class_faiProfileEntry.inc:168
 #: plugins/admin/fai/class_faiProfile.inc:291
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:169
+#: plugins/admin/fai/class_faiProfileEntry.inc:170
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr ""
@@ -9142,6 +10008,7 @@ msgid "Script attributes"
 msgstr ""
 
 #: plugins/admin/fai/faiScriptEntry.tpl:34
+#: plugins/admin/fai/class_faiScript.inc:297
 #: plugins/personal/environment/logonManagement.tpl:24
 msgid "Priority"
 msgstr ""
@@ -9283,11 +10150,16 @@ msgstr ""
 msgid "sticky"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:320
+#: plugins/admin/fai/class_faiScript.inc:282
+#: plugins/admin/fai/class_faiScript.inc:284
+msgid "Sort direction"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:384
 msgid "Removing FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:356
+#: plugins/admin/fai/class_faiScript.inc:432
 #: plugins/admin/fai/class_faiProfile.inc:396
 #, php-format
 msgid ""
@@ -9295,39 +10167,39 @@ msgid ""
 "given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:389
+#: plugins/admin/fai/class_faiScript.inc:465
 msgid "Creating FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:473
+#: plugins/admin/fai/class_faiScript.inc:549
 msgid "Removing FAI script failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:492
+#: plugins/admin/fai/class_faiScript.inc:568
 msgid "Saving FAI script failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:346
+#: plugins/admin/fai/class_faiHook.inc:364
 msgid "Removing FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:382
+#: plugins/admin/fai/class_faiHook.inc:400
 #, php-format
 msgid ""
 "Can't insert a fai hook named '%s' in '%s' there is already a hook with the "
 "given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:415
+#: plugins/admin/fai/class_faiHook.inc:433
 msgid "Saving FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:505
+#: plugins/admin/fai/class_faiHook.inc:523
 msgid "Removing FAI hook failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:511
-#: plugins/admin/fai/class_faiHook.inc:521
+#: plugins/admin/fai/class_faiHook.inc:529
+#: plugins/admin/fai/class_faiHook.inc:539
 msgid "Saving FAI hook failed"
 msgstr ""
 
@@ -9374,26 +10246,26 @@ msgstr ""
 msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:353
+#: plugins/admin/fai/class_faiTemplate.inc:370
 #, php-format
 msgid ""
 "Can't insert a fai template named '%s' in '%s' there is already a template "
 "with the given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:386
+#: plugins/admin/fai/class_faiTemplate.inc:403
 msgid "Saving FAI template base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:464
+#: plugins/admin/fai/class_faiTemplate.inc:481
 msgid "Removing FAI template entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:469
+#: plugins/admin/fai/class_faiTemplate.inc:486
 msgid "Modifying FAI template entry failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:482
+#: plugins/admin/fai/class_faiTemplate.inc:499
 msgid "Creating FAI template entry failed"
 msgstr ""
 
@@ -9548,7 +10420,7 @@ msgid "Please enter a valid name."
 msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:420
-msgid "There is already a profile with this class name defined."
+msgid "There is already a FAI object with this class name defined."
 msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:459
@@ -9676,67 +10548,95 @@ msgstr ""
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:124
+#: plugins/admin/fai/class_divListFai.inc:127
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:129
+#: plugins/admin/fai/class_divListFai.inc:132
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:129
+#: plugins/admin/fai/class_divListFai.inc:132
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:132
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:132
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:135
+#: plugins/admin/fai/class_divListFai.inc:138
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:135
+#: plugins/admin/fai/class_divListFai.inc:138
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:138
+#: plugins/admin/fai/class_divListFai.inc:141
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:138
+#: plugins/admin/fai/class_divListFai.inc:141
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:141
+#: plugins/admin/fai/class_divListFai.inc:144
 msgid "New templates"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:141
+#: plugins/admin/fai/class_divListFai.inc:144
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:147
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:147
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:221
-#: plugins/admin/fai/class_divListFai.inc:226
+#: plugins/admin/fai/class_divListFai.inc:231
+#: plugins/admin/fai/class_divListFai.inc:236
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:228
+#: plugins/admin/fai/class_divListFai.inc:238
 msgid "Delete class"
 msgstr ""
 
+#: plugins/admin/fai/class_divListFai.inc:262
+msgid "Number of listed profiles"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:263
+msgid "Number of listed partitions"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:264
+msgid "Number of listed scripts"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:265
+msgid "Number of listed hooks"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:266
+msgid "Number of listed variables"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:267
+msgid "Number of listed templates"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:268
+msgid "Number of listed packages"
+msgstr ""
+
 #: plugins/admin/fai/faiTemplate.tpl:31
 msgid "List of template files"
 msgstr ""
@@ -10036,7 +10936,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:559
-#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
@@ -10046,7 +10946,7 @@ msgid "January"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:559
-#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
@@ -10056,7 +10956,7 @@ msgid "February"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:559
-#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
@@ -10066,7 +10966,7 @@ msgid "March"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:559
-#: plugins/personal/posix/class_posixAccount.inc:477
+#: plugins/personal/posix/class_posixAccount.inc:476
 #: plugins/personal/samba/class_sambaAccount.inc:393
 #: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/samba/class_sambaAccount.inc:429
@@ -10076,7 +10976,7 @@ msgid "April"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:560
-#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
@@ -10086,7 +10986,7 @@ msgid "May"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:560
-#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
@@ -10096,7 +10996,7 @@ msgid "June"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:560
-#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
@@ -10106,7 +11006,7 @@ msgid "July"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:560
-#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
@@ -10116,7 +11016,7 @@ msgid "August"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:560
-#: plugins/personal/posix/class_posixAccount.inc:478
+#: plugins/personal/posix/class_posixAccount.inc:477
 #: plugins/personal/samba/class_sambaAccount.inc:394
 #: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/samba/class_sambaAccount.inc:430
@@ -10126,7 +11026,7 @@ msgid "September"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:561
-#: plugins/personal/posix/class_posixAccount.inc:479
+#: plugins/personal/posix/class_posixAccount.inc:478
 #: plugins/personal/samba/class_sambaAccount.inc:395
 #: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/samba/class_sambaAccount.inc:431
@@ -10136,7 +11036,7 @@ msgid "October"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:561
-#: plugins/personal/posix/class_posixAccount.inc:479
+#: plugins/personal/posix/class_posixAccount.inc:478
 #: plugins/personal/samba/class_sambaAccount.inc:395
 #: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/samba/class_sambaAccount.inc:431
@@ -10146,7 +11046,7 @@ msgid "November"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:561
-#: plugins/personal/posix/class_posixAccount.inc:479
+#: plugins/personal/posix/class_posixAccount.inc:478
 #: plugins/personal/samba/class_sambaAccount.inc:395
 #: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/samba/class_sambaAccount.inc:431
@@ -10186,6 +11086,11 @@ msgid ""
 "methods."
 msgstr ""
 
+#: plugins/personal/netatalk/main.inc:104 setup/class_setupStep_Finish.inc:37
+#: ihtml/themes/default/copyPasteDialog.tpl:24
+msgid "Finish"
+msgstr ""
+
 #: plugins/personal/netatalk/main.inc:121
 msgid "Netatalk settings"
 msgstr ""
@@ -10724,7 +11629,7 @@ msgstr ""
 #: plugins/personal/environment/class_kioskManagementDialog.inc:90
 #: plugins/personal/environment/class_kioskManagementDialog.inc:109
 #, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgid "Can't delete '%s'. Error was: file doesn't exist."
 msgstr ""
 
 #: plugins/personal/environment/class_kioskManagementDialog.inc:151
@@ -10821,88 +11726,88 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:182
+#: plugins/personal/environment/class_environment.inc:183
 msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:344
+#: plugins/personal/environment/class_environment.inc:305
+#: plugins/personal/environment/class_environment.inc:349
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:301
-#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:350
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:310
 #: plugins/personal/environment/class_environment.inc:315
-#: plugins/personal/environment/class_environment.inc:350
+#: plugins/personal/environment/class_environment.inc:320
 #: plugins/personal/environment/class_environment.inc:355
+#: plugins/personal/environment/class_environment.inc:360
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:311
-#: plugins/personal/environment/class_environment.inc:351
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:356
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:316
-#: plugins/personal/environment/class_environment.inc:356
+#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:361
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:553
+#: plugins/personal/environment/class_environment.inc:559
 msgid "Spaces are not allowed in the mount path!"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:634
-#: plugins/personal/environment/class_environment.inc:635
-#: plugins/personal/environment/class_environment.inc:643
-#: plugins/personal/environment/class_environment.inc:644
+#: plugins/personal/environment/class_environment.inc:640
+#: plugins/personal/environment/class_environment.inc:641
+#: plugins/personal/environment/class_environment.inc:649
+#: plugins/personal/environment/class_environment.inc:650
 msgid "Reset password hash"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:649
+#: plugins/personal/environment/class_environment.inc:655
 msgid "Delete share entry"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:803
+#: plugins/personal/environment/class_environment.inc:809
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:849
+#: plugins/personal/environment/class_environment.inc:855
 msgid "Removing environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:901
+#: plugins/personal/environment/class_environment.inc:907
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:908
+#: plugins/personal/environment/class_environment.inc:914
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:946
+#: plugins/personal/environment/class_environment.inc:952
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1099
+#: plugins/personal/environment/class_environment.inc:1105
 msgid "Adding environment information failed"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1112
+#: plugins/personal/environment/class_environment.inc:1118
 msgid "group share"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1149
+#: plugins/personal/environment/class_environment.inc:1155
 msgid "Default printer"
 msgstr ""
 
@@ -11200,159 +12105,159 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:126
+#: plugins/personal/posix/class_posixAccount.inc:125
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:128
+#: plugins/personal/posix/class_posixAccount.inc:127
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:131
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "active, password not changable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:133
+#: plugins/personal/posix/class_posixAccount.inc:132
 msgid "active, password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:135
+#: plugins/personal/posix/class_posixAccount.inc:134
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:146
-#: plugins/personal/posix/class_posixAccount.inc:1007
+#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:1005
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:181
+#: plugins/personal/posix/class_posixAccount.inc:180
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:268
-#: plugins/personal/posix/class_posixAccount.inc:271
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:269
+#: plugins/personal/posix/class_posixAccount.inc:268
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:272
+#: plugins/personal/posix/class_posixAccount.inc:271
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:276
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:438
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:441
+#: plugins/personal/posix/class_posixAccount.inc:440
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:443
+#: plugins/personal/posix/class_posixAccount.inc:442
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:560
+#: plugins/personal/posix/class_posixAccount.inc:558
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:561
+#: plugins/personal/posix/class_posixAccount.inc:559
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:607
+#: plugins/personal/posix/class_posixAccount.inc:605
 msgid "Removing UNIX account failed"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:759
+#: plugins/personal/posix/class_posixAccount.inc:757
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:848
+#: plugins/personal/posix/class_posixAccount.inc:846
 msgid "Saving UNIX account failed"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:921
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:950
+#: plugins/personal/posix/class_posixAccount.inc:948
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:955
+#: plugins/personal/posix/class_posixAccount.inc:953
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: plugins/personal/posix/class_posixAccount.inc:958
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:967
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:974
+#: plugins/personal/posix/class_posixAccount.inc:972
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:975
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:982
+#: plugins/personal/posix/class_posixAccount.inc:980
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1130
+#: plugins/personal/posix/class_posixAccount.inc:1128
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
@@ -11384,44 +12289,39 @@ msgstr ""
 msgid "Display groups of department"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:53
+#: plugins/personal/posix/posix_groups.tpl:44
 msgid "Display groups matching"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:64
+#: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:25
-#, php-format
-msgid "The configured timezone '%s' seems not to valid."
-msgstr ""
-
-#: plugins/personal/samba/class_sambaLogonHours.inc:72
+#: plugins/personal/samba/class_sambaLogonHours.inc:64
 msgid "Sunday"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:73
+#: plugins/personal/samba/class_sambaLogonHours.inc:65
 msgid "Monday"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:74
+#: plugins/personal/samba/class_sambaLogonHours.inc:66
 msgid "Tuesday"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:75
+#: plugins/personal/samba/class_sambaLogonHours.inc:67
 msgid "Wednesday"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:76
+#: plugins/personal/samba/class_sambaLogonHours.inc:68
 msgid "Thursday"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:77
+#: plugins/personal/samba/class_sambaLogonHours.inc:69
 msgid "Friday"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaLogonHours.inc:78
+#: plugins/personal/samba/class_sambaLogonHours.inc:70
 msgid "Saturday"
 msgstr ""
 
@@ -11463,10 +12363,6 @@ msgstr ""
 msgid "Temporary disable samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr ""
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr ""
@@ -11646,19 +12542,19 @@ msgid ""
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:924
+#: plugins/personal/samba/class_sambaAccount.inc:939
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:948
+#: plugins/personal/samba/class_sambaAccount.inc:963
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1067
 msgid "Saving Samba account failed"
 msgstr ""
 
@@ -11670,10 +12566,6 @@ msgstr ""
 msgid "Specify the hours this user is allowed to log in"
 msgstr ""
 
-#: plugins/personal/samba/sambaLogonHours.tpl:27
-msgid "Hour"
-msgstr ""
-
 #: plugins/personal/generic/generic_certs.tpl:3
 #: plugins/personal/generic/generic.tpl:178
 msgid "Certificates"
@@ -11724,96 +12616,96 @@ msgstr ""
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:277
+#: plugins/personal/generic/class_user.inc:276
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:331
+#: plugins/personal/generic/class_user.inc:330
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:426
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:467
+#: plugins/personal/generic/class_user.inc:466
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:476
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:480
+#: plugins/personal/generic/class_user.inc:479
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:480
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:484
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:568
+#: plugins/personal/generic/class_user.inc:567
 msgid "Removing generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:600
-#: plugins/personal/generic/class_user.inc:936
+#: plugins/personal/generic/class_user.inc:599
+#: plugins/personal/generic/class_user.inc:941
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:614
-#: plugins/personal/generic/class_user.inc:953
+#: plugins/personal/generic/class_user.inc:613
+#: plugins/personal/generic/class_user.inc:958
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:889
+#: plugins/personal/generic/class_user.inc:894
 msgid "Saving generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:964
+#: plugins/personal/generic/class_user.inc:969
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1021
+#: plugins/personal/generic/class_user.inc:1026
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:1031
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1041
+#: plugins/personal/generic/class_user.inc:1046
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1055
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1055
+#: plugins/personal/generic/class_user.inc:1060
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1062
+#: plugins/personal/generic/class_user.inc:1067
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:1070
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1217
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -12003,10 +12895,6 @@ msgstr ""
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/contents.tpl:11
-msgid "Object name"
-msgstr ""
-
 #: plugins/generic/references/contents.tpl:11
 msgid "Contents"
 msgstr ""
@@ -12073,7 +12961,7 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1148
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1157
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -12228,6 +13116,10 @@ msgstr ""
 msgid "invisible"
 msgstr ""
 
+#: plugins/gofon/macro/class_divListMacros.inc:138
+msgid "Number of listed macros"
+msgstr ""
+
 #: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 msgid "Phone macro management"
 msgstr ""
@@ -12298,20 +13190,6 @@ msgid ""
 "accounts."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:112
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1262
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1273
-#, php-format
-msgid "Can't select database %s on %s."
-msgstr ""
-
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:155
 msgid "no macro"
 msgstr ""
@@ -12320,120 +13198,132 @@ msgstr ""
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:302
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:427
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:422
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s'. Abort saving entries to "
 "keep the database consistent, check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:435
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:462
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:430
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:457
 #, php-format
 msgid ""
 "Can't select database %s on %s. Abort saving entries to keep the database "
 "consistent, check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:449
 #, php-format
 msgid ""
 "The old MySQL home server '%s' isn't reachable as user '%s'. Abort saving "
 "entries to keep the database consistent, check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:768
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:825
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:956
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:951
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:851
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:846
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:966
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:961
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:967
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:962
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:970
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:973
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:965
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:971
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:966
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:974
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:969
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:987
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:982
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1026
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1021
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1112
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1119
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1120
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1127
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1123
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1130
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1128
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1135
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1138
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1141
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1150
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1223
 msgid "Saving phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1304
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1273
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1284
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1315
 #: include/sieve/templates/element_stop.tpl:4
 #: include/sieve/templates/object_container.tpl:30
 #: include/sieve/class_sieveManagement.inc:514
@@ -12441,22 +13331,22 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1309
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1320
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1342
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1353
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1349
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1360
 msgid "Removing phone account failed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1426
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1437
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -12605,6 +13495,10 @@ msgstr ""
 msgid "Conference"
 msgstr ""
 
+#: plugins/gofon/conference/class_divListConferences.inc:166
+msgid "Number of listed conferences"
+msgstr ""
+
 #: plugins/gofon/conference/generic.tpl:13
 msgid "Conference name"
 msgstr ""
@@ -12650,45 +13544,45 @@ msgstr ""
 msgid "Count users"
 msgstr ""
 
-#: include/class_plugin.inc:404
+#: include/class_plugin.inc:412
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:555
+#: include/class_plugin.inc:564
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:589 include/class_password-methods.inc:182
+#: include/class_plugin.inc:599 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:623
+#: include/class_plugin.inc:639
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:931
+#: include/class_plugin.inc:947
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:938
+#: include/class_plugin.inc:954
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:952 include/class_plugin.inc:981
+#: include/class_plugin.inc:968 include/class_plugin.inc:997
 msgid "Handle object tagging failed"
 msgstr ""
 
-#: include/class_plugin.inc:968
+#: include/class_plugin.inc:984
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -12732,11 +13626,6 @@ msgstr ""
 msgid "Complete address"
 msgstr ""
 
-#: include/sieve/class_sieveElement_If.inc:27
-#: include/sieve/class_sieveElement_If.inc:33
-msgid "Default"
-msgstr ""
-
 #: include/sieve/class_sieveElement_If.inc:28
 msgid "Domain part"
 msgstr ""
@@ -13546,16 +14435,28 @@ msgstr ""
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
+#: include/class_timezones.inc:53
+#, php-format
+msgid ""
+"The timezone setting '%s' in your gosa.conf is not valid. Can not calculate "
+"correct timezone offset."
+msgstr ""
+
+#: include/class_timezones.inc:83
+#, php-format
+msgid "The timezone setting \""
+msgstr ""
+
 #: include/class_config.inc:71
 #, php-format
 msgid "XML error in %s: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:208 html/index.php:210
+#: include/class_config.inc:199 html/index.php:204
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:525
+#: include/class_config.inc:516
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -13563,57 +14464,57 @@ msgstr ""
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:455
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
 msgstr ""
 
-#: include/php_setup.inc:93
+#: include/php_setup.inc:107
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:98
+#: include/php_setup.inc:112
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:98
+#: include/php_setup.inc:112
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:103 html/main.php:393
+#: include/php_setup.inc:117 html/main.php:385
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:113
+#: include/php_setup.inc:127
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:132
+#: include/php_setup.inc:146
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:138
+#: include/php_setup.inc:152
 msgid "function"
 msgstr ""
 
-#: include/php_setup.inc:143
+#: include/php_setup.inc:157
 msgid "static"
 msgstr ""
 
-#: include/php_setup.inc:147
+#: include/php_setup.inc:161
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:194
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:181
+#: include/php_setup.inc:195
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:182
+#: include/php_setup.inc:196
 msgid "Arguments"
 msgstr ""
 
@@ -13629,7 +14530,7 @@ msgid ""
 "zone."
 msgstr ""
 
-#: include/functions_dns.inc:610
+#: include/functions_dns.inc:618
 #, php-format
 msgid ""
 "Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
@@ -13666,11 +14567,6 @@ msgid ""
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:130 include/class_pluglist.inc:131
-#: include/class_pluglist.inc:241
-msgid "Unknown"
-msgstr ""
-
 #: include/class_pluglist.inc:138 ihtml/themes/default/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:17 ihtml/themes/default/framework.tpl:29
 #: ihtml/themes/default/framework.tpl:33
@@ -13679,210 +14575,250 @@ msgid ""
 "changes?"
 msgstr ""
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/functions.inc:305
+#: include/functions.inc:290
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:322
+#: include/functions.inc:307
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:343
+#: include/functions.inc:328
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:475
+#: include/functions.inc:460
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:485
+#: include/functions.inc:470
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in %s! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:500
+#: include/functions.inc:485
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:526
+#: include/functions.inc:511
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:556
+#: include/functions.inc:541
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:566
+#: include/functions.inc:551
 #, php-format
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in %s!"
 msgstr ""
 
-#: include/functions.inc:574
+#: include/functions.inc:559
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:660
+#: include/functions.inc:645
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:662
+#: include/functions.inc:647
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:679
+#: include/functions.inc:664
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1122 include/functions.inc:1363
+#: include/functions.inc:1107 include/functions.inc:1348
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:1108
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1131
+#: include/functions.inc:1116
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1191
+#: include/functions.inc:1176
 msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1252
+#: include/functions.inc:1237
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1254
+#: include/functions.inc:1239
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1256
+#: include/functions.inc:1241
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1545
+#: include/functions.inc:1530
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1573
+#: include/functions.inc:1558
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1847
+#: include/functions.inc:1832
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1890
+#: include/functions.inc:1875
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2292 include/functions.inc:2296
+#: include/functions.inc:2277 include/functions.inc:2281
 msgid "Warning - base_hook is not available. Using default base."
 msgstr ""
 
-#: include/functions.inc:2302
+#: include/functions.inc:2287
 msgid "Warning - no base_hook defined. Using default base."
 msgstr ""
 
-#: include/functions.inc:2327 setup/class_setupStep_Schema.inc:95
+#: include/functions.inc:2312 setup/class_setupStep_Schema.inc:95
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2353
+#: include/functions.inc:2338
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2360
+#: include/functions.inc:2345
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2403
+#: include/functions.inc:2388
 #, php-format
 msgid "The required objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/functions.inc:2405
+#: include/functions.inc:2390
 #, php-format
 msgid "The optional objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/functions.inc:2411
+#: include/functions.inc:2396
 #, php-format
 msgid "The required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions.inc:2413
+#: include/functions.inc:2398
 #, php-format
 msgid "The optional objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions.inc:2417
+#: include/functions.inc:2402
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2440
+#: include/functions.inc:2425
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2441
+#: include/functions.inc:2426
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2445
+#: include/functions.inc:2430
 msgid ""
 "You have disabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema   configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2446
+#: include/functions.inc:2431
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/class_tabs.inc:198
+#: include/functions.inc:2527
+msgid "German"
+msgstr ""
+
+#: include/functions.inc:2528
+msgid "French"
+msgstr ""
+
+#: include/functions.inc:2529
+msgid "Italian"
+msgstr ""
+
+#: include/functions.inc:2530
+msgid "Spanish"
+msgstr ""
+
+#: include/functions.inc:2531
+msgid "English"
+msgstr ""
+
+#: include/functions.inc:2532
+msgid "Dutch"
+msgstr ""
+
+#: include/functions.inc:2533
+msgid "Polish"
+msgstr ""
+
+#: include/functions.inc:2534
+msgid "Swedish"
+msgstr ""
+
+#: include/functions.inc:2535
+msgid "Chinese"
+msgstr ""
+
+#: include/functions.inc:2536
+msgid "Russian"
+msgstr ""
+
+#: include/class_tabs.inc:204
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
@@ -14033,35 +14969,55 @@ msgstr ""
 msgid "Samba SID mapping"
 msgstr ""
 
-#: setup/setup_config2.tpl:70
-msgid "Additional GOsa settings"
+#: setup/setup_config2.tpl:71
+msgid "Timezone"
 msgstr ""
 
 #: setup/setup_config2.tpl:74
+msgid "Please choose your preferred timezone here"
+msgstr ""
+
+#: setup/setup_config2.tpl:95
+msgid "Additional GOsa settings"
+msgstr ""
+
+#: setup/setup_config2.tpl:99
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: setup/setup_config2.tpl:86
+#: setup/setup_config2.tpl:111
+msgid "Enable DNS extension"
+msgstr ""
+
+#: setup/setup_config2.tpl:123
+msgid "Enable DHCP extension"
+msgstr ""
+
+#: setup/setup_config2.tpl:135
+msgid "Enable mime type management"
+msgstr ""
+
+#: setup/setup_config2.tpl:147
 msgid "Enable FAI release management"
 msgstr ""
 
-#: setup/setup_config2.tpl:98
+#: setup/setup_config2.tpl:159
 msgid "Enable user netatalk plugin"
 msgstr ""
 
-#: setup/setup_config2.tpl:109
+#: setup/setup_config2.tpl:170
 msgid "Government mode"
 msgstr ""
 
-#: setup/setup_config2.tpl:122
+#: setup/setup_config2.tpl:183
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:136
+#: setup/setup_config2.tpl:197
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:152
+#: setup/setup_config2.tpl:213
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
@@ -14146,19 +15102,19 @@ msgstr ""
 msgid "Send feedback"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:71 setup/class_setupStep_Config3.inc:72
 msgid "GOsa settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:73
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:184
 msgid "Session lifetime must be a numeric value."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:188
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr ""
 
@@ -14498,11 +15454,11 @@ msgid ""
 "write the configuration directly if it is writeable."
 msgstr ""
 
-#: setup/class_setupStep_License.inc:53 setup/class_setupStep_License.inc:54
+#: setup/class_setupStep_License.inc:56 setup/class_setupStep_License.inc:57
 msgid "License"
 msgstr ""
 
-#: setup/class_setupStep_License.inc:55
+#: setup/class_setupStep_License.inc:58
 msgid "Terms and conditions for usage"
 msgstr ""
 
@@ -14526,10 +15482,6 @@ msgstr ""
 msgid "TLS connection"
 msgstr ""
 
-#: setup/setup_ldap.tpl:65
-msgid "Reload"
-msgstr ""
-
 #: setup/setup_ldap.tpl:69
 msgid "Authentication"
 msgstr ""
@@ -14651,26 +15603,26 @@ msgid ""
 "GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:99
+#: setup/class_setupStep_Ldap.inc:105
 #, php-format
 msgid "Anonymous bind failed on server '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:101
+#: setup/class_setupStep_Ldap.inc:107
 #, php-format
 msgid "Bind as user '%s' failed on server '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:106
+#: setup/class_setupStep_Ldap.inc:112
 #, php-format
 msgid "Anonymous bind on server '%s' succeeded."
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:107
+#: setup/class_setupStep_Ldap.inc:113
 msgid "Please specify user and password."
 msgstr ""
 
-#: setup/class_setupStep_Ldap.inc:109
+#: setup/class_setupStep_Ldap.inc:115
 #, php-format
 msgid "Bind as user '%s' on server '%s' succeeded."
 msgstr ""
@@ -14928,78 +15880,86 @@ msgid "Disable primary group filter"
 msgstr ""
 
 #: setup/setup_config3.tpl:18
-msgid "Honour administrative units"
+msgid "Display summary in listings"
 msgstr ""
 
 #: setup/setup_config3.tpl:30
+msgid "Honour administrative units"
+msgstr ""
+
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr ""
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:85
+msgid "Enable system deployment"
+msgstr ""
+
+#: setup/setup_config3.tpl:104
 msgid "Network resolv hook"
 msgstr ""
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:122
 msgid "Mail queue script"
 msgstr ""
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:140
 msgid "Notification script"
 msgstr ""
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:156
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:159
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:171
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:183
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:195
 msgid "Session lifetime"
 msgstr ""
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:203
 msgid "Debugging"
 msgstr ""
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:207
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:219
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:237
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:249
 msgid "Debug level"
 msgstr ""
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:254 setup/setup_config3.tpl:257
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:255 setup/setup_config3.tpl:258
 msgid "Enabled"
 msgstr ""
 
@@ -15063,7 +16023,7 @@ msgid ""
 "feedback."
 msgstr ""
 
-#: setup/class_setup.inc:210
+#: setup/class_setup.inc:196
 msgid "Completed"
 msgstr ""
 
@@ -15324,11 +16284,11 @@ msgstr ""
 msgid "Schema check failed"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:75 setup/class_setupStep_Config2.inc:76
+#: setup/class_setupStep_Config2.inc:83 setup/class_setupStep_Config2.inc:84
 msgid "GOsa settings 2/3"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:77
+#: setup/class_setupStep_Config2.inc:85
 msgid "Customize special parameters"
 msgstr ""
 
@@ -15432,6 +16392,10 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
+#: setup/setup_license.tpl:8
+msgid "I accept this license"
+msgstr ""
+
 #: ihtml/themes/default/framework.tpl:19
 msgid "Main"
 msgstr ""
@@ -15628,6 +16592,11 @@ msgstr ""
 msgid "Click here to change your password"
 msgstr ""
 
+#: html/setup.php:78 html/password.php:71 html/index.php:141
+#, php-format
+msgid "Directory '%s' specified as compile directory is not accessible!"
+msgstr ""
+
 #: html/getxls.php:65
 msgid "Birthday"
 msgstr ""
@@ -15754,32 +16723,27 @@ msgstr ""
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/password.php:71 html/index.php:141
-#, php-format
-msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr ""
-
 #: html/password.php:152
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:208 html/index.php:268
+#: html/password.php:208 html/index.php:262
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/password.php:210 html/index.php:270
+#: html/password.php:210 html/index.php:264
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/password.php:216 html/index.php:277
+#: html/password.php:216 html/index.php:271
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/password.php:274 html/index.php:55 html/index.php:352
+#: html/password.php:274 html/index.php:55 html/index.php:346
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/password.php:274 html/index.php:55 html/index.php:352
+#: html/password.php:274 html/index.php:55 html/index.php:346
 msgid "Enter SSL session"
 msgstr ""
 
@@ -15797,26 +16761,26 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
-#: html/main.php:165
+#: html/main.php:157
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:221
+#: html/main.php:213
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:343
+#: html/main.php:335
 #, php-format
 msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:358
+#: html/main.php:350
 msgid "Your password is about to expire, please change your password"
 msgstr ""
 
-#: html/main.php:393
+#: html/main.php:385
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
@@ -15837,28 +16801,28 @@ msgstr ""
 msgid "Can't get specified attachment file, there is no entry with this id."
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:219
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:241
+#: html/index.php:235
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:260
+#: html/index.php:254
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
 msgstr ""
 
-#: html/index.php:306
+#: html/index.php:300
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:358
+#: html/index.php:352
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"