Added Translation Strings.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 4edb59911154391cb3c06fe77185421c66507e02..6bade643aa0c7edfcca0abea444bd4b17843c015 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-24 08:50+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+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"
@@ -30,9 +30,9 @@ 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:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -54,6 +54,11 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
+#: plugins/admin/systems/dhcp_group.tpl:2
+#: plugins/admin/systems/dhcp_subnet.tpl:2
+#: plugins/admin/systems/dhcp_pool.tpl:2 plugins/admin/systems/dhcp_host.tpl:2
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:2
+#: plugins/admin/systems/dhcp_service.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/admin/mimetypes/paste_generic.tpl:4
 #: plugins/admin/mimetypes/generic.tpl:4
@@ -69,17 +74,17 @@ msgstr ""
 #: contrib/gosa.conf:106 contrib/gosa.conf:133
 #: plugins/personal/environment/class_environment.inc:7
 #: 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
 msgid "Environment"
 msgstr ""
 
 #: contrib/gosa.conf:107 contrib/gosa.conf:135
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/ogroups/tabs_ogroups.inc:77
-#: plugins/admin/ogroups/tabs_ogroups.inc:210
+#: plugins/admin/users/class_divListUsers.inc:146
+#: plugins/admin/ogroups/tabs_ogroups.inc:79
+#: plugins/admin/ogroups/tabs_ogroups.inc:209
 #: plugins/admin/ogroups/paste_mail.tpl:4
 #: plugins/admin/ogroups/class_divListOGroup.inc:124
 #: plugins/generic/references/class_reference.inc:24
@@ -88,7 +93,7 @@ msgstr ""
 
 #: contrib/gosa.conf:108 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_divListGroup.inc:125
-#: plugins/admin/users/class_divListUsers.inc:149
+#: plugins/admin/users/class_divListUsers.inc:152
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -96,7 +101,7 @@ msgstr ""
 
 #: contrib/gosa.conf:110 contrib/gosa.conf:113
 #: plugins/personal/netatalk/class_netatalk.inc:36
-#: plugins/admin/users/class_divListUsers.inc:151
+#: plugins/admin/users/class_divListUsers.inc:154
 msgid "Netatalk"
 msgstr ""
 
@@ -110,7 +115,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:147
+#: plugins/admin/users/class_divListUsers.inc:150
 #: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
@@ -125,7 +130,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_divListGroup.inc:129
-#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/users/class_divListUsers.inc:148
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/class_systemManagement.inc:869
 #: plugins/admin/systems/chooser.tpl:12
@@ -155,9 +160,9 @@ 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:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr ""
 
@@ -173,17 +178,17 @@ msgstr ""
 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:159 contrib/gosa.conf:169 contrib/gosa.conf:198
+#: 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:160 contrib/gosa.conf:199
+#: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -191,10 +196,9 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:104
@@ -210,9 +214,9 @@ 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:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr ""
 
@@ -234,16 +238,24 @@ msgstr ""
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -253,11 +265,11 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -268,15 +280,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -284,73 +296,36 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
-#: plugins/admin/ogroups/tabs_ogroups.inc:109
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
+#: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 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:53
-msgid "Russian"
-msgstr ""
-
-#: contrib/gosa.conf:500 setup/class_setupStep_Language.inc:52
-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 setup/class_setupStep_Language.inc:51
-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/personal/nagios/main.inc:105 plugins/personal/mail/main.inc:105
 #: plugins/personal/posix/main.inc:111 plugins/personal/samba/main.inc:105
 #: plugins/personal/environment/main.inc:105
@@ -366,7 +341,7 @@ msgstr ""
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -380,12 +355,18 @@ msgstr ""
 #: plugins/admin/systems/class_systemManagement.inc:597
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/class_dhcpService.inc:93
+#: plugins/admin/systems/class_dhcpGroup.inc:54
+#: plugins/admin/systems/class_dhcpSubnet.inc:88
+#: plugins/admin/systems/class_dhcpPool.inc:69
+#: plugins/admin/systems/class_dhcpHost.inc:82
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:87
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:233
 #: include/sieve/templates/edit_frame_base.tpl:39
 #: include/sieve/templates/management.tpl:24
-#: include/class_MultiSelectWindow.inc:78
+#: include/class_MultiSelectWindow.inc:79
 #: ihtml/themes/default/copyPasteDialog.tpl:15
 msgid "Save"
 msgstr ""
@@ -416,7 +397,6 @@ msgstr ""
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/fai/class_faiManagement.inc:610
 #: plugins/admin/fai/class_faiManagement.inc:615
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
@@ -436,7 +416,7 @@ msgstr ""
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: 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/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -467,10 +447,18 @@ msgstr ""
 #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/gencd.tpl:11
 #: plugins/admin/systems/glpiAttachmentPool.tpl:52
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:68
+#: plugins/admin/systems/remove_dhcp.tpl:16
+#: plugins/admin/systems/class_dhcpService.inc:94
+#: plugins/admin/systems/class_dhcpGroup.inc:55
+#: plugins/admin/systems/class_dhcpSubnet.inc:89
+#: plugins/admin/systems/class_dhcpPool.inc:70
+#: plugins/admin/systems/class_dhcpHost.inc:83
+#: plugins/admin/systems/dhcpNewSection.tpl:17
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:88
 #: plugins/admin/ogroups/remove.tpl:16
 #: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:394
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:411
 #: plugins/admin/mimetypes/remove.tpl:16 plugins/admin/mimetypes/remove.tpl:20
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
@@ -518,7 +506,6 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinter.tpl:73
 #: plugins/admin/systems/glpiPrinter.tpl:82 plugins/admin/systems/glpi.tpl:48
 #: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/servdnseditzone.tpl:40
@@ -635,7 +622,6 @@ msgstr ""
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
 #: plugins/gofax/faxreports/class_faxreport.inc:7
 #: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/godfs/class_dfsManagment.inc:11
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/addons/ldapmanager/class_csvimport.inc:7
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
@@ -712,7 +698,6 @@ msgstr ""
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
-#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/admin/groups/group_objects.tpl:20
@@ -793,7 +778,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
 #: plugins/admin/fai/faiPackage.tpl:72 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:35
+#: plugins/admin/fai/faiScript.tpl:42 plugins/admin/fai/faiTemplate.tpl:35
 #: plugins/admin/fai/faiHook.tpl:43 plugins/admin/groups/application.tpl:27
 #: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
 #: plugins/admin/groups/class_groupMail.inc:568
@@ -814,8 +799,8 @@ msgstr ""
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:479
-#: plugins/admin/systems/class_termDNS.inc:499
+#: plugins/admin/systems/class_termDNS.inc:663
+#: plugins/admin/systems/class_termDNS.inc:683
 #: plugins/admin/systems/goSpamServer.tpl:36
 #: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/systems/servdnseditzone.tpl:115
@@ -829,6 +814,9 @@ msgstr ""
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:67
+#: plugins/admin/systems/dhcp_network.tpl:67
+#: plugins/admin/systems/dhcp_advanced.tpl:22
+#: plugins/admin/systems/dhcp_advanced.tpl:35
 #: plugins/admin/ogroups/termgroup.tpl:23
 #: plugins/admin/ogroups/phonequeue.tpl:28
 #: plugins/admin/ogroups/ogroup_objects.tpl:54
@@ -920,7 +908,7 @@ msgstr ""
 #: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/systems/remove_ppd.tpl:12
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_termDNS.inc:493
+#: plugins/admin/systems/class_termDNS.inc:677
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
 #: plugins/admin/systems/glpi_edit_os.tpl:10
@@ -933,6 +921,10 @@ msgstr ""
 #: plugins/admin/systems/class_servDNSeditZone.inc:547
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/dhcp_network.tpl:68
+#: plugins/admin/systems/remove_dhcp.tpl:14
+#: plugins/admin/systems/dhcp_advanced.tpl:23
+#: plugins/admin/systems/dhcp_advanced.tpl:36
 #: plugins/admin/ogroups/termgroup.tpl:25
 #: plugins/admin/ogroups/phonequeue.tpl:29 plugins/admin/ogroups/remove.tpl:14
 #: plugins/admin/ogroups/generic.tpl:44 plugins/admin/mimetypes/remove.tpl:14
@@ -1047,7 +1039,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr ""
 
@@ -1129,7 +1121,7 @@ msgid "The address you're trying to add is already used by user"
 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
@@ -1139,7 +1131,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
@@ -1149,7 +1141,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
@@ -1159,7 +1151,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
@@ -1169,7 +1161,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
@@ -1179,7 +1171,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
@@ -1189,7 +1181,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
@@ -1199,7 +1191,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
@@ -1209,7 +1201,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
@@ -1219,7 +1211,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
@@ -1229,7 +1221,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
@@ -1239,7 +1231,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
@@ -1337,14 +1329,14 @@ msgstr ""
 #: plugins/admin/fai/faiNewBranch.tpl:51
 #: plugins/admin/departments/dep_iframe.tpl:19
 #: plugins/admin/systems/class_systemManagement.inc:243
-#: include/functions.inc:1582 setup/class_setup.inc:275
-#: setup/class_setup.inc:277
+#: include/functions.inc:1559 setup/class_setup.inc:261
+#: setup/class_setup.inc:263
 msgid "Back"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:24
 #: plugins/personal/generic/paste_generic.tpl:20
-#: plugins/admin/systems/class_divListSystem.inc:178
+#: plugins/admin/systems/class_divListSystem.inc:184
 #: 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
@@ -1359,7 +1351,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1367,7 +1359,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1578,184 +1570,186 @@ 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:201
+#: plugins/personal/posix/class_posixAccount.inc:200
 #: plugins/admin/systems/class_workstationService.inc:177
 #: plugins/admin/systems/class_workstationStartup.inc:840
 #: plugins/admin/systems/class_terminalService.inc:190
+#: plugins/admin/systems/class_dhcpAdvanced.inc:78
+#: plugins/admin/systems/class_dhcpAdvanced.inc:87
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:248
 msgid "automatic"
 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
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 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:939
+#: plugins/personal/posix/class_posixAccount.inc:937
 #: plugins/admin/groups/class_groupGeneric.inc:814
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:942
+#: plugins/personal/posix/class_posixAccount.inc:940
 #: plugins/admin/groups/class_groupGeneric.inc:817
 msgid "Value specified as 'GID' 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 ""
 
@@ -1769,7 +1763,6 @@ msgid "Path"
 msgstr ""
 
 #: plugins/personal/netatalk/main.inc:104
-#: plugins/addons/godfs/class_dfsManagment.inc:247
 #: ihtml/themes/default/copyPasteDialog.tpl:24
 #: setup/class_setupStep_Finish.inc:37
 msgid "Finish"
@@ -1905,7 +1898,7 @@ msgstr ""
 #: plugins/admin/groups/application_options.tpl:11
 #: 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/gofon/macro/class_gofonMacroManagement.inc:266
 #: include/sieve/templates/create_script.tpl:13 setup/setup_ldap.tpl:16
 #: setup/setup_migrate.tpl:131 setup/setup_migrate.tpl:182
@@ -1915,6 +1908,7 @@ msgid "Apply"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:23
+#: plugins/admin/systems/dhcp_network.tpl:52
 msgid "Domain"
 msgstr ""
 
@@ -2212,7 +2206,6 @@ msgstr ""
 #: plugins/admin/groups/class_groupMail.inc:572
 #: plugins/admin/applications/class_applicationParameters.inc:108
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/workstationStartup.tpl:148
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
@@ -2499,8 +2492,8 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiProfile.tpl:19
@@ -2527,6 +2520,7 @@ msgid "Description"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:24
+#: plugins/admin/fai/class_faiScript.inc:276
 #: plugins/admin/fai/faiScriptEntry.tpl:34
 msgid "Priority"
 msgstr ""
@@ -2633,7 +2627,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:79 setup/setup_migrate.tpl:79
+#: include/class_MultiSelectWindow.inc:80 setup/setup_migrate.tpl:79
 msgid "Close"
 msgstr ""
 
@@ -2645,146 +2639,146 @@ 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:935
 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:952
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:889
+#: plugins/personal/generic/class_user.inc:888
 msgid "Saving generic user account failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:964
+#: plugins/personal/generic/class_user.inc:963
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1021
+#: plugins/personal/generic/class_user.inc:1020
 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:1025
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1032
+#: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1041
+#: plugins/personal/generic/class_user.inc:1040
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1047
+#: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1050
+#: plugins/personal/generic/class_user.inc:1049
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1055
+#: plugins/personal/generic/class_user.inc:1054
 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:1061
 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:1064
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1068
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1092
 #: plugins/addons/addressbook/class_addressbook.inc:565
 #: plugins/addons/addressbook/class_addressbook.inc:593
 #: plugins/admin/departments/class_departmentGeneric.inc:243
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1071
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1070
+#: plugins/personal/generic/class_user.inc:1089
 #: plugins/addons/addressbook/class_addressbook.inc:568
 #: plugins/addons/addressbook/class_addressbook.inc:590
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
 #: plugins/addons/addressbook/class_addressbook.inc:573
 #: plugins/addons/addressbook/class_addressbook.inc:576
 #: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1079
+#: plugins/personal/generic/class_user.inc:1078
 #: plugins/addons/addressbook/class_addressbook.inc:579
 #: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1082
+#: plugins/personal/generic/class_user.inc:1081
 #: plugins/addons/addressbook/class_addressbook.inc:582
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1085
+#: plugins/personal/generic/class_user.inc:1084
 #: plugins/addons/addressbook/class_addressbook.inc:585
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1211
 msgid "Could not open specified certificate!"
 msgstr ""
 
@@ -2860,7 +2854,6 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:127
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:79
-#: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/fai/class_divListFai.inc:153
 #: plugins/admin/groups/class_divListGroup.inc:96
 #: plugins/admin/groups/generic.tpl:21
@@ -2880,7 +2873,7 @@ msgstr ""
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_divListOGroup.inc:102
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:103
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
 #: plugins/admin/mimetypes/generic.tpl:38 plugins/gofon/macro/generic.tpl:20
 #: plugins/gofon/macro/class_divListMacros.inc:76
 #: plugins/gofon/conference/generic.tpl:33
@@ -3007,7 +3000,6 @@ msgid "Mobile"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:287
-#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
@@ -3370,7 +3362,7 @@ msgid "Template user"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:123
+#: plugins/admin/systems/class_workstationGeneric.inc:125
 #: plugins/admin/systems/class_servGeneric.inc:48
 #: plugins/admin/ogroups/class_termgroup.inc:48
 msgid "Locked"
@@ -3745,7 +3737,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:181
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:189
 msgid "Type"
 msgstr ""
 
@@ -3881,7 +3873,6 @@ msgid "New Blocklist"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/addons/godfs/class_dfsManagment.inc:218
 #: plugins/admin/fai/class_divListFai.inc:154
 #: plugins/admin/groups/class_divListGroup.inc:98
 #: plugins/admin/users/class_divListUsers.inc:101
@@ -3890,14 +3881,13 @@ msgstr ""
 #: plugins/admin/systems/class_divListSystem.inc:109
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:105
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
 #: 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/admin/fai/class_divListFai.inc:154
 #: plugins/admin/groups/class_divListGroup.inc:98
 #: plugins/admin/users/class_divListUsers.inc:101
@@ -3908,58 +3898,58 @@ msgstr ""
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/ogroups/class_divListOGroup.inc:104
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:105
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
 #: 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 ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/fai/class_faiScript.inc:245
-#: plugins/admin/fai/class_faiScript.inc:248
+#: plugins/admin/fai/class_faiScript.inc:283
+#: plugins/admin/fai/class_faiScript.inc:286
 #: plugins/admin/fai/class_faiTemplate.inc:241
 #: plugins/admin/fai/class_faiTemplate.inc:244
 #: plugins/admin/fai/class_faiHook.inc:266
 #: plugins/admin/fai/class_faiHook.inc:269
-#: plugins/admin/fai/class_divListFai.inc:223
-#: plugins/admin/fai/class_divListFai.inc:228
+#: plugins/admin/fai/class_divListFai.inc:230
+#: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
 #: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:147
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/ogroups/class_divListOGroup.inc:142
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
 #: 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 ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:249
+#: plugins/admin/fai/class_faiScript.inc:287
 #: plugins/admin/fai/class_faiTemplate.inc:245
 #: plugins/admin/fai/class_faiHook.inc:270
-#: plugins/admin/fai/class_divListFai.inc:230
+#: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:149
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:132
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:150
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:170
 #: plugins/gofon/macro/class_divListMacros.inc:95
 #: plugins/gofon/conference/class_divListConferences.inc:96
 #: plugins/gofon/conference/class_divListConferences.inc:98
@@ -3967,10 +3957,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/fai/class_divListFai.inc:269
+#: plugins/admin/groups/class_divListGroup.inc:213
+#: plugins/admin/users/class_divListUsers.inc:299
+#: plugins/admin/applications/class_divListApplication.inc:196
+#: plugins/admin/departments/class_divListDepartment.inc:128
+#: plugins/admin/systems/class_divListSystem.inc:226
+#: plugins/admin/ogroups/class_divListOGroup.inc:184
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
+#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/conference/class_divListConferences.inc:167
+msgid "Number of listed departments"
+msgstr ""
+
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
@@ -3978,11 +3986,12 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/systems/remove_ppd.tpl:2
 #: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_dhcp.tpl:2
 #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
 #: plugins/admin/mimetypes/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
 #: plugins/gofon/conference/remove.tpl:2
 #: include/sieve/templates/remove_script.tpl:2 html/index.php:55
-#: html/index.php:352 html/index.php:358 html/password.php:274
+#: html/index.php:351 html/index.php:357 html/password.php:274
 #: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 #: setup/class_setupStep_Migrate.inc:211 setup/class_setupStep_Migrate.inc:260
 #: setup/class_setupStep_Migrate.inc:385 setup/class_setupStep_Migrate.inc:461
@@ -4235,7 +4244,7 @@ msgstr ""
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/systems/class_printGeneric.inc:855
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr ""
@@ -4357,6 +4366,7 @@ msgstr ""
 #: plugins/addons/addressbook/class_addressbook.inc:522
 #: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:275
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/class_faiSummaryTab.inc:329
 #: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
@@ -4385,6 +4395,9 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:196
+#: plugins/admin/systems/dhcp_group.tpl:6
+#: plugins/admin/systems/dhcp_pool.tpl:6 plugins/admin/systems/dhcp_host.tpl:8
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:10
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 #: setup/setup_feedback.tpl:24 setup/setup_migrate.tpl:207
 msgid "Name"
@@ -4619,119 +4632,6 @@ msgstr ""
 msgid "Saving addressbook entry failed"
 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/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/fai/class_faiProfile.inc:305
-#: plugins/admin/systems/class_glpiSelectUser.inc:157
-#: plugins/admin/systems/class_servDNSeditZone.inc:314
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/phonequeue.tpl:21
-#: include/sieve/templates/object_container.tpl:8
-#: include/sieve/templates/object_container_clear.tpl:8
-#: include/class_MultiSelectWindow.inc:196
-#: include/class_MultiSelectWindow.inc:198
-msgid "Up"
-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_glpiSelectUser.inc:155
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: 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_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/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
-msgid "Distributed File System Administration"
-msgstr ""
-
 #: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
 msgstr ""
@@ -4803,6 +4703,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 ""
@@ -5215,7 +5116,13 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:258
+#: plugins/admin/fai/class_faiScript.inc:261
+#: plugins/admin/fai/class_faiScript.inc:263
+msgid "Sort direction"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:277
+#: plugins/admin/fai/class_faiScript.inc:296
 #: plugins/admin/fai/class_faiTemplate.inc:257
 #: plugins/admin/fai/class_faiScriptEntry.inc:84
 #: plugins/admin/fai/class_faiHook.inc:279
@@ -5224,11 +5131,20 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:320
+#: plugins/admin/fai/class_faiScript.inc:278
+#: plugins/admin/systems/terminal.tpl:128 plugins/admin/systems/server.tpl:51
+#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:158
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
+msgid "Action"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:360
 msgid "Removing FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:356
+#: plugins/admin/fai/class_faiScript.inc:408
 #: plugins/admin/fai/class_faiProfile.inc:396
 #, php-format
 msgid ""
@@ -5236,15 +5152,15 @@ msgid ""
 "given name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:389
+#: plugins/admin/fai/class_faiScript.inc:441
 msgid "Creating FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:473
+#: plugins/admin/fai/class_faiScript.inc:525
 msgid "Removing FAI script failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:492
+#: plugins/admin/fai/class_faiScript.inc:544
 msgid "Saving FAI script failed"
 msgstr ""
 
@@ -5329,7 +5245,7 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:523
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: include/sieve/templates/add_element.tpl:11
-#: include/sieve/templates/select_test_type.tpl:11 setup/class_setup.inc:280
+#: include/sieve/templates/select_test_type.tpl:11 setup/class_setup.inc:266
 msgid "Continue"
 msgstr ""
 
@@ -5397,7 +5313,9 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10
+#: plugins/admin/systems/remove_dhcp.tpl:10
+#: plugins/gofon/conference/remove.tpl:10
 msgid ""
 "Best thing to do before performing this action would be to save the current "
 "contents of your LDAP tree in a file. So - if you've done so - press "
@@ -5622,6 +5540,7 @@ msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:41
 #: plugins/admin/systems/class_printerPPDDialog.inc:408
+#: plugins/admin/systems/dhcpNewSection.tpl:9
 msgid "Section"
 msgstr ""
 
@@ -5637,7 +5556,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:651
 msgid "Configure"
 msgstr ""
 
@@ -5702,6 +5621,18 @@ msgstr ""
 msgid "Remove class from profile"
 msgstr ""
 
+#: plugins/admin/fai/class_faiProfile.inc:305
+#: plugins/admin/systems/class_glpiSelectUser.inc:157
+#: plugins/admin/systems/class_servDNSeditZone.inc:314
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: include/sieve/templates/object_container.tpl:8
+#: include/sieve/templates/object_container_clear.tpl:8
+#: include/class_MultiSelectWindow.inc:197
+#: include/class_MultiSelectWindow.inc:199
+msgid "Up"
+msgstr ""
+
 #: plugins/admin/fai/class_faiProfile.inc:306
 #: plugins/admin/systems/class_servDNSeditZone.inc:315
 #: plugins/admin/ogroups/phonequeue.tpl:22
@@ -5818,7 +5749,7 @@ msgstr ""
 msgid "Add partition"
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:36
+#: plugins/admin/fai/faiScript.tpl:35
 msgid "List of scripts"
 msgstr ""
 
@@ -6034,47 +5965,79 @@ msgstr ""
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:216
+#: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:216
+#: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:178
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:219
+#: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:219
+#: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:180
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:224
-#: plugins/admin/fai/class_divListFai.inc:229
+#: plugins/admin/fai/class_divListFai.inc:231
+#: plugins/admin/fai/class_divListFai.inc:236
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:231
+#: 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/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr ""
@@ -6308,7 +6271,7 @@ msgid "Template attributes"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:29
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:181
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:30 include/php_setup.inc:189
 msgid "File"
 msgstr ""
 
@@ -6334,8 +6297,10 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:841
-#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/systems/class_servDHCP.inc:25
+#: plugins/admin/systems/class_printGeneric.inc:850
+#: plugins/admin/systems/class_printGeneric.inc:852
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:30
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -6346,6 +6311,7 @@ msgid "Access"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/systems/class_servDHCP.inc:22
 #: plugins/admin/systems/class_servDNS.inc:164
 msgid "Class"
 msgstr ""
@@ -6482,8 +6448,9 @@ 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/ogroups/class_ogroupManagement.inc:137
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
 msgstr ""
 
@@ -6640,13 +6607,13 @@ msgid "Create new group"
 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/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
@@ -6657,7 +6624,7 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/ogroups/class_divListOGroup.inc:142
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
 #: plugins/gofon/conference/class_divListConferences.inc:94
 msgid "Edit this entry"
 msgstr ""
@@ -6666,12 +6633,16 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:150
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:170
 #: plugins/gofon/conference/class_divListConferences.inc:96
 #: plugins/gofon/conference/class_divListConferences.inc:98
 msgid "Delete this entry"
 msgstr ""
 
+#: plugins/admin/groups/class_divListGroup.inc:212
+msgid "Number of listed groups"
+msgstr ""
+
 #: plugins/admin/groups/acl.tpl:4
 #: plugins/admin/departments/class_departmentGeneric.inc:503
 #: include/class_ldap.inc:466
@@ -6720,7 +6691,7 @@ msgid "admin"
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6745,6 +6716,10 @@ msgstr ""
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
+#: plugins/admin/groups/class_groupMail.inc:406
+msgid "to the list of forwarders."
+msgstr ""
+
 #: plugins/admin/groups/class_groupMail.inc:642
 msgid "Removing group mail settings failed"
 msgstr ""
@@ -7019,22 +6994,30 @@ msgstr ""
 msgid "Users"
 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: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 ""
 
@@ -7121,58 +7104,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/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_divListApplication.inc:44
@@ -7250,7 +7241,7 @@ msgstr ""
 
 #: plugins/admin/applications/class_divListApplication.inc:89
 #: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:98
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:105
 msgid "new"
 msgstr ""
 
@@ -7258,6 +7249,10 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
+#: plugins/admin/applications/class_divListApplication.inc:195
+msgid "Number of listed applications"
+msgstr ""
+
 #: plugins/admin/applications/class_applicationParameters.inc:51
 msgid "Remove options"
 msgstr ""
@@ -7348,6 +7343,10 @@ msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
 #: plugins/admin/applications/class_applicationGeneric.inc:362
+#: plugins/admin/systems/class_dhcpGroup.inc:87
+#: plugins/admin/systems/class_dhcpPool.inc:103
+#: plugins/admin/systems/class_dhcpHost.inc:132
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:142
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
@@ -7554,31 +7553,37 @@ 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:32
+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:40
+msgid "Parent node"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:45
+msgid "Edit settings"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:72
+msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:51
+#: plugins/admin/systems/network.tpl:81
 msgid "Zone"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:59
+#: plugins/admin/systems/network.tpl:89
 #: plugins/admin/systems/servdnseditzone.tpl:94
 #: plugins/admin/systems/class_servDNS.inc:163
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:64
+#: plugins/admin/systems/network.tpl:94
 msgid "Dns records"
 msgstr ""
 
@@ -7912,14 +7917,6 @@ msgstr ""
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:128 plugins/admin/systems/server.tpl:51
-#: plugins/admin/systems/workstation.tpl:109
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:158
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/ogroups/termgroup.tpl:75
-msgid "Action"
-msgstr ""
-
 #: plugins/admin/systems/terminal.tpl:132
 #: plugins/admin/systems/workstation.tpl:113
 #: plugins/admin/ogroups/termgroup.tpl:79
@@ -8013,7 +8010,7 @@ msgstr ""
 #: 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_workstationGeneric.inc:138
+#: plugins/admin/systems/class_workstationGeneric.inc:140
 #: plugins/admin/systems/class_terminalService.inc:68
 #: plugins/admin/systems/class_terminalService.inc:96
 #: plugins/admin/systems/class_terminalService.inc:102
@@ -8383,6 +8380,10 @@ msgstr ""
 msgid "Zones"
 msgstr ""
 
+#: plugins/admin/systems/servdns.tpl:7 plugins/admin/systems/servdhcp.tpl:6
+msgid "Take over"
+msgstr ""
+
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
 msgid "Boot parameters"
@@ -8523,19 +8524,23 @@ msgstr ""
 msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:122
+#: plugins/admin/systems/servdhcp.tpl:1
+msgid "DHCP sections"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:124
 #: plugins/admin/systems/class_servGeneric.inc:47
 #: plugins/admin/ogroups/class_termgroup.inc:47
 msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:163
 #: plugins/admin/systems/class_servGeneric.inc:81
 #: plugins/admin/ogroups/class_termgroup.inc:212
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:165
+#: plugins/admin/systems/class_workstationGeneric.inc:167
 #: plugins/admin/systems/class_terminalGeneric.inc:192
 #: plugins/admin/systems/class_terminalGeneric.inc:204
 #: plugins/admin/systems/class_terminalGeneric.inc:216
@@ -8545,54 +8550,54 @@ msgstr ""
 msgid "Execution of '%s' failed!"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:207
+#: plugins/admin/systems/class_workstationGeneric.inc:209
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:266
+#: plugins/admin/systems/class_workstationGeneric.inc:268
 #: plugins/admin/systems/class_terminalGeneric.inc:284
 #: plugins/admin/systems/class_servGeneric.inc:170
 #: plugins/admin/ogroups/class_termgroup.inc:262
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:266
+#: plugins/admin/systems/class_workstationGeneric.inc:268
 #: plugins/admin/systems/class_terminalGeneric.inc:285
 #: plugins/admin/systems/class_servGeneric.inc:170
 #: plugins/admin/ogroups/class_termgroup.inc:263
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:267
+#: plugins/admin/systems/class_workstationGeneric.inc:269
 #: plugins/admin/systems/class_servGeneric.inc:171
 #: plugins/admin/ogroups/class_termgroup.inc:264
 msgid "Instant update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:268
-#: plugins/admin/systems/class_workstationGeneric.inc:277
+#: plugins/admin/systems/class_workstationGeneric.inc:270
+#: plugins/admin/systems/class_workstationGeneric.inc:279
 #: plugins/admin/systems/class_servGeneric.inc:172
 #: plugins/admin/systems/class_servGeneric.inc:181
 #: plugins/admin/ogroups/class_termgroup.inc:265
 msgid "Scheduled update"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:269
-#: plugins/admin/systems/class_workstationGeneric.inc:276
+#: plugins/admin/systems/class_workstationGeneric.inc:271
+#: plugins/admin/systems/class_workstationGeneric.inc:278
 #: plugins/admin/systems/class_servGeneric.inc:173
 #: plugins/admin/systems/class_servGeneric.inc:180
 #: plugins/admin/ogroups/class_termgroup.inc:266
 msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:270
+#: plugins/admin/systems/class_workstationGeneric.inc:272
 #: plugins/admin/systems/class_servGeneric.inc:174
 #: plugins/admin/ogroups/class_termgroup.inc:267
 msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:271
-#: plugins/admin/systems/class_workstationGeneric.inc:278
+#: plugins/admin/systems/class_workstationGeneric.inc:273
+#: plugins/admin/systems/class_workstationGeneric.inc:280
 #: plugins/admin/systems/class_terminalGeneric.inc:286
 #: plugins/admin/systems/class_terminalGeneric.inc:290
 #: plugins/admin/systems/class_servGeneric.inc:175
@@ -8601,15 +8606,15 @@ msgstr ""
 msgid "Memory test"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:272
-#: plugins/admin/systems/class_workstationGeneric.inc:279
+#: plugins/admin/systems/class_workstationGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:281
 #: plugins/admin/systems/class_servGeneric.inc:176
 #: plugins/admin/systems/class_servGeneric.inc:183
 msgid "Force localboot"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:273
-#: plugins/admin/systems/class_workstationGeneric.inc:280
+#: plugins/admin/systems/class_workstationGeneric.inc:275
+#: plugins/admin/systems/class_workstationGeneric.inc:282
 #: plugins/admin/systems/class_terminalGeneric.inc:287
 #: plugins/admin/systems/class_terminalGeneric.inc:291
 #: plugins/admin/systems/class_servGeneric.inc:177
@@ -8618,45 +8623,45 @@ msgstr ""
 msgid "System analysis"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:275
+#: plugins/admin/systems/class_workstationGeneric.inc:277
 #: plugins/admin/systems/class_terminalGeneric.inc:289
 #: plugins/admin/systems/class_servGeneric.inc:179
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:325
 msgid "Removing workstation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:372
+#: 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:376
+#: plugins/admin/systems/class_workstationGeneric.inc:386
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:394
-#: plugins/admin/systems/class_componentGeneric.inc:166
-#: plugins/admin/systems/class_winGeneric.inc:177
-#: plugins/admin/systems/class_terminalGeneric.inc:435
-#: plugins/admin/systems/class_servGeneric.inc:256
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/systems/class_phoneGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:404
+#: plugins/admin/systems/class_componentGeneric.inc:174
+#: plugins/admin/systems/class_winGeneric.inc:185
+#: plugins/admin/systems/class_terminalGeneric.inc:443
+#: plugins/admin/systems/class_servGeneric.inc:263
+#: plugins/admin/systems/class_printGeneric.inc:669
+#: plugins/admin/systems/class_phoneGeneric.inc:320
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:405
-#: plugins/admin/systems/class_terminalGeneric.inc:445
+#: plugins/admin/systems/class_workstationGeneric.inc:415
+#: plugins/admin/systems/class_terminalGeneric.inc:453
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:501
+#: 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 ""
@@ -8810,32 +8815,64 @@ 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
+#: 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_goVirusServer.inc:46
-#: plugins/admin/systems/class_goVirusServer.inc:244
-msgid "Anti virus"
+#: plugins/admin/systems/class_divListSystem.inc:218
+msgid "Number of listed servers"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:80
+#: 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/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:80
 msgid "Remove anti virus extension"
 msgstr ""
 
@@ -9232,30 +9269,30 @@ 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:145
-#: plugins/admin/systems/class_phoneGeneric.inc:284
+#: plugins/admin/systems/class_componentGeneric.inc:153
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The required field IP address is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:148
-#: plugins/admin/systems/class_phoneGeneric.inc:287
+#: plugins/admin/systems/class_componentGeneric.inc:156
+#: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The field IP address contains an invalid address."
 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:233
 msgid "Saving generic component failed"
 msgstr ""
 
@@ -9399,6 +9436,7 @@ msgid "Attachment"
 msgstr ""
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+#: plugins/admin/systems/dhcp_network.tpl:32
 msgid "Filename"
 msgstr ""
 
@@ -9406,65 +9444,86 @@ msgstr ""
 msgid "Mime-type"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:186
 #, 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:323
 msgid "Not matching"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:309
+#: plugins/admin/systems/class_termDNS.inc:419
+msgid "You haven not configured your dhcp settings yet."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:429
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:316
+#: plugins/admin/systems/class_termDNS.inc:436
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:322
+#: plugins/admin/systems/class_termDNS.inc:442
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:328
+#: plugins/admin/systems/class_termDNS.inc:448
 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:461
 #, 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:476
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:364
+#: plugins/admin/systems/class_termDNS.inc:484
 #, 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:495
 #, 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_termDNS.inc:502
 #: plugins/admin/systems/class_servDNSeditZone.inc:428
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:467
+#: plugins/admin/systems/class_termDNS.inc:546
+msgid "Removing dhcp entry for this object failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:558
+#: plugins/admin/systems/class_termDNS.inc:573
+msgid "Tried to add new dhcp entry failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:576
+msgid "Removing old dhcp entry failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:588
+msgid "Modifying dhcp entry failed."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:651
 msgid "Saving terminal to DNS object failed"
 msgstr ""
 
@@ -9617,10 +9676,16 @@ msgid "Zone name"
 msgstr ""
 
 #: plugins/admin/systems/servdnseditzone.tpl:13
+#: plugins/admin/systems/class_dhcpSubnet.inc:151
+#: plugins/admin/systems/dhcp_subnet.tpl:8
 msgid "Network address"
 msgstr ""
 
 #: plugins/admin/systems/servdnseditzone.tpl:19
+#: plugins/admin/systems/dhcp_network.tpl:15
+#: plugins/admin/systems/class_dhcpNetwork.inc:197
+#: plugins/admin/systems/class_dhcpSubnet.inc:151
+#: plugins/admin/systems/dhcp_subnet.tpl:12
 msgid "Netmask"
 msgstr ""
 
@@ -9644,6 +9709,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"
@@ -9661,11 +9731,11 @@ msgstr ""
 msgid "Global zone records"
 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:236
 msgid "Saving Samba workstation failed"
 msgstr ""
 
@@ -9675,32 +9745,39 @@ msgstr ""
 
 #: plugins/admin/systems/class_glpiSelectUser.inc:155
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: include/class_MultiSelectWindow.inc:188
+#: include/class_MultiSelectWindow.inc:189
 msgid "Go to root department"
 msgstr ""
 
+#: plugins/admin/systems/class_glpiSelectUser.inc:155
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: include/class_MultiSelectWindow.inc:189
+#: include/class_MultiSelectWindow.inc:191
+msgid "Root"
+msgstr ""
+
 #: plugins/admin/systems/class_glpiSelectUser.inc:157
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: include/class_MultiSelectWindow.inc:196
+#: include/class_MultiSelectWindow.inc:197
 msgid "Go up one department"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiSelectUser.inc:159
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: include/class_MultiSelectWindow.inc:204
+#: include/class_MultiSelectWindow.inc:205
 msgid "Go to users department"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiSelectUser.inc:159
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: include/class_MultiSelectWindow.inc:204
-#: include/class_MultiSelectWindow.inc:206
+#: include/class_MultiSelectWindow.inc:205
+#: include/class_MultiSelectWindow.inc:207
 msgid "Home"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: include/class_MultiSelectWindow.inc:211
+#: include/class_MultiSelectWindow.inc:212
 msgid "Reload list"
 msgstr ""
 
@@ -9750,7 +9827,7 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -9767,7 +9844,7 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -10020,19 +10097,19 @@ msgstr ""
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:344
+#: plugins/admin/systems/class_terminalGeneric.inc:352
 msgid "Removing terminal failed"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:410
+#: 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:414
+#: plugins/admin/systems/class_terminalGeneric.inc:422
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:529
+#: plugins/admin/systems/class_terminalGeneric.inc:537
 msgid "Saving terminal failed"
 msgstr ""
 
@@ -10259,6 +10336,7 @@ msgid "IMAP admin access"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:16
 msgid "Server identifier"
 msgstr ""
 
@@ -10290,19 +10368,19 @@ msgstr ""
 msgid "This 'dn' has no server features."
 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 ""
 
@@ -10310,26 +10388,109 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:31
+#: plugins/admin/systems/class_servDHCP.inc:20
+msgid "Logging"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:21
+#: plugins/admin/systems/class_servDHCP.inc:207
+#: plugins/admin/systems/class_servDHCP.inc:373
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:26
+msgid "Global options"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:23
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:28
+msgid "Subclass"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:24
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:29
+msgid "Host"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:26
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:31
+msgid "Pool"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:27
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:32
+msgid "Subnet"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:28
+msgid "Failover peer"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:29
+#: plugins/admin/systems/class_dhcpNewSectionDialog.inc:33
+msgid "Shared network"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:145
+msgid "You're not allowed to remove DHCP sections!"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:179
+#, php-format
+msgid "You're about to delete the DHCP section '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:193
 msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:32
+#: plugins/admin/systems/class_servDHCP.inc:194
 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:212
 msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:35
+#: plugins/admin/systems/class_servDHCP.inc:213
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
+#: plugins/admin/systems/class_servDHCP.inc:233
+#: plugins/admin/systems/class_servDHCP.inc:236
+msgid "Insert new DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:234
+#: plugins/admin/systems/class_servDHCP.inc:237
+#: plugins/admin/systems/class_servDHCP.inc:238
+msgid "Edit DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:235
+#: plugins/admin/systems/class_servDHCP.inc:239
+msgid "Remove DHCP section"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:276
+msgid "Removing DHCP entries failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:311
+msgid "Can't remove DHCP object!"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:347
+#: plugins/admin/systems/class_servDHCP.inc:350
+msgid "Can't save DHCP object!"
+msgstr ""
+
+#: plugins/admin/systems/class_servDHCP.inc:435
+msgid ""
+"DHCP configuration set is unknown. Please contact your system administrator."
+msgstr ""
+
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:77
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
 msgid "New entry"
@@ -10558,15 +10719,16 @@ msgid ""
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:297
+#: plugins/admin/systems/class_servDNS.inc:306
 msgid "Updating DNS service failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:306
+#: plugins/admin/systems/class_servDNS.inc:315
 msgid "Removing DNS entries failed"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:327
+#: plugins/admin/systems/class_servDNS.inc:332
+#: plugins/admin/systems/class_servDNS.inc:336
 msgid "Saving DNS entries failed"
 msgstr ""
 
@@ -10744,29 +10906,29 @@ 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:830
 msgid "Saving printer failed"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_printGeneric.inc:875
 #, 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:897
 #, 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:905
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -10979,7 +11141,9 @@ msgstr ""
 msgid "Other network component"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:860
+#: plugins/admin/systems/chooser.tpl:16
+#: plugins/admin/systems/dhcpNewSection.tpl:15
+#: setup/class_setupStep_Migrate.inc:860
 msgid "Create"
 msgstr ""
 
@@ -11030,6 +11194,10 @@ msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
+#: plugins/admin/systems/dhcp_group.tpl:10
+msgid "Name of group"
+msgstr ""
+
 #: plugins/admin/systems/class_phoneGeneric.inc:103
 msgid "This 'dn' has no phone features."
 msgstr ""
@@ -11052,30 +11220,30 @@ msgstr ""
 msgid "Networksettings"
 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 "
 "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: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:398
+#: plugins/admin/systems/class_phoneGeneric.inc:406
 msgid "Saving phone failed"
 msgstr ""
 
@@ -11095,6 +11263,80 @@ msgstr ""
 msgid "Regular expression for matching member names"
 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:21
+#: plugins/admin/systems/class_dhcpNetwork.inc:197
+msgid "Broadcast"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_network.tpl:29
+msgid "Bootup"
+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: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_glpiManufacturer.inc:53
 #, php-format
 msgid ""
@@ -11184,6 +11426,296 @@ msgstr ""
 msgid "Printer ppd selection."
 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_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:110
+msgid "Removing SSH account failed"
+msgstr ""
+
+#: plugins/admin/systems/class_servSsh.inc:175
+msgid "Saving SSH account failed"
+msgstr ""
+
+#: plugins/admin/systems/servssh.tpl:4
+msgid "SSH account"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpService.inc:139
+msgid "Default lease time needs to be numeric."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpService.inc:142
+msgid "Maximum lease time needs to be numeric."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpService.inc:145
+msgid "Default lease time needs to smaller than the maximum lease time."
+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:204
+#, php-format
+msgid "Error in definition of '%s'!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpGroup.inc:90
+msgid "Field 'Name' contains illegal characters."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpGroup.inc:98
+#: plugins/admin/systems/class_dhcpHost.inc:140
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:160
+msgid "The name for this host section is already used!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:133
+msgid "Required field 'Network address' is not filled."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:136
+msgid "Required field 'Netmask' is not filled."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:144
+#: plugins/admin/systems/class_dhcpPool.inc:111
+msgid "The name for this section is already used!"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:151
+#: plugins/admin/systems/dhcp_pool.tpl:11
+msgid "Range"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:153
+#, php-format
+msgid "The field '%s' contains an invalid IP address"
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:160
+#: plugins/admin/systems/class_dhcpPool.inc:126
+msgid "Field 'Range' contains invalid IP range."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpSubnet.inc:166
+#: plugins/admin/systems/class_dhcpPool.inc:140
+msgid "'Range' is not inside the configured network."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:118
+msgid "Required field 'Range' is not filled."
+msgstr ""
+
+#: plugins/admin/systems/class_dhcpPool.inc:122
+msgid "Field 'Range' contains invalid IP addresses."
+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:149
+msgid "The hardware address specified by you is not valid!"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_subnet.tpl:20
+msgid "Range for dynamic address assignment"
+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_pool.tpl:8
+msgid "Name of pool"
+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/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/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:49
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:52
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:146
+msgid "Default lease time"
+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:56
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:147
+msgid "Max. lease time"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:59
+msgid "Maximum lease time"
+msgstr ""
+
+#: plugins/admin/systems/dhcp_sharedNetwork.tpl:63
+#: plugins/admin/systems/class_dhcpSharedNetwork.inc:148
+msgid "Min. 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/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/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_dhcpSharedNetwork.inc:151
+#, php-format
+msgid "The value specified as '%s' is not numeric!"
+msgstr ""
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11199,16 +11731,16 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 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 ""
 
@@ -11534,11 +12066,15 @@ msgstr ""
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:160
+#: plugins/admin/ogroups/class_divListOGroup.inc:167
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
 
+#: plugins/admin/ogroups/class_divListOGroup.inc:183
+msgid "Number of listed object groups"
+msgstr ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:149
 msgid "This 'dn' is no object group."
 msgstr ""
@@ -11842,27 +12378,27 @@ 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/admin/mimetypes/class_mimetypeManagement.inc:405
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
 #: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
 #: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:392
@@ -11875,7 +12411,7 @@ msgid "Ok"
 msgstr ""
 
 #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
 #: plugins/admin/mimetypes/generic.tpl:12
 msgid "Mime type"
 msgstr ""
@@ -11909,10 +12445,14 @@ 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:200
+msgid "Number of listed mimetypes"
+msgstr ""
+
 #: plugins/admin/mimetypes/generic.tpl:20
 msgid "Mime group"
 msgstr ""
@@ -12091,6 +12631,10 @@ msgstr ""
 msgid "invisible"
 msgstr ""
 
+#: plugins/gofon/macro/class_divListMacros.inc:138
+msgid "Number of listed macros"
+msgstr ""
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr ""
@@ -12537,6 +13081,10 @@ msgstr ""
 msgid "Conference"
 msgstr ""
 
+#: plugins/gofon/conference/class_divListConferences.inc:166
+msgid "Number of listed conferences"
+msgstr ""
+
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
 msgid "Phone conferences"
 msgstr ""
@@ -13440,255 +13988,303 @@ msgstr ""
 msgid "This package has no debconf options."
 msgstr ""
 
-#: include/class_plugin.inc:407
+#: 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:558
+#: include/class_plugin.inc:563
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:592 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 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:626
+#: include/class_plugin.inc:631
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:934
+#: include/class_plugin.inc:939
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:941
+#: include/class_plugin.inc:946
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:955 include/class_plugin.inc:984
+#: include/class_plugin.inc:960 include/class_plugin.inc:989
 msgid "Handle object tagging failed"
 msgstr ""
 
-#: include/class_plugin.inc:971
+#: include/class_plugin.inc:976
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_password-methods.inc:166
+#: include/php_setup.inc:101
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr ""
+
+#: include/php_setup.inc:106
+msgid "Send bug report to the GOsa Team"
+msgstr ""
+
+#: include/php_setup.inc:106
+msgid "Send bugreport"
+msgstr ""
+
+#: include/php_setup.inc:111 html/main.php:391
+msgid "Toggle information"
+msgstr ""
+
+#: include/php_setup.inc:121
+msgid "PHP error"
+msgstr ""
+
+#: include/php_setup.inc:140
+msgid "class"
+msgstr ""
+
+#: include/php_setup.inc:146
+msgid "function"
+msgstr ""
+
+#: include/php_setup.inc:151
+msgid "static"
+msgstr ""
+
+#: include/php_setup.inc:155
+msgid "method"
+msgstr ""
+
+#: include/php_setup.inc:188
+msgid "Trace"
+msgstr ""
+
+#: include/php_setup.inc:189
+msgid "Line"
+msgstr ""
+
+#: include/php_setup.inc:190
+msgid "Arguments"
+msgstr ""
+
+#: 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/class_MultiSelectWindow.inc:455
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
 msgstr ""
 
-#: include/functions.inc:305
+#: include/functions.inc:282
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:322
+#: include/functions.inc:299
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:343
+#: include/functions.inc:320
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:475
+#: include/functions.inc:452
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:485
+#: include/functions.inc:462
 #, 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:477
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:526
+#: include/functions.inc:503
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:556
+#: include/functions.inc:533
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:566
+#: include/functions.inc:543
 #, 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:551
 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:637
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:662
+#: include/functions.inc:639
 #, 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:656
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1122 include/functions.inc:1363
+#: include/functions.inc:1099 include/functions.inc:1340
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1123
+#: include/functions.inc:1100
 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:1108
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1191
+#: include/functions.inc:1168
 msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1252
+#: include/functions.inc:1229
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1254
+#: include/functions.inc:1231
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1256
+#: include/functions.inc:1233
 #, 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:1522
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1573
+#: include/functions.inc:1550
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1847
+#: include/functions.inc:1824
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1890
+#: include/functions.inc:1867
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2292 include/functions.inc:2296
+#: include/functions.inc:2269 include/functions.inc:2273
 msgid "Warning - base_hook is not available. Using default base."
 msgstr ""
 
-#: include/functions.inc:2302
+#: include/functions.inc:2279
 msgid "Warning - no base_hook defined. Using default base."
 msgstr ""
 
-#: include/functions.inc:2327 setup/class_setupStep_Schema.inc:95
+#: include/functions.inc:2304 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:2330
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2360
+#: include/functions.inc:2337
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2403
+#: include/functions.inc:2380
 #, php-format
 msgid "The required objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/functions.inc:2405
+#: include/functions.inc:2382
 #, php-format
 msgid "The optional objectClass '%s' is not present in your schema setup"
 msgstr ""
 
-#: include/functions.inc:2411
+#: include/functions.inc:2388
 #, php-format
 msgid "The required objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions.inc:2413
+#: include/functions.inc:2390
 #, php-format
 msgid "The optional objectclass '%s' does not have version %s"
 msgstr ""
 
-#: include/functions.inc:2417
+#: include/functions.inc:2394
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2440
+#: include/functions.inc:2417
 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:2418
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2445
+#: include/functions.inc:2422
 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:2423
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
@@ -13868,54 +14464,6 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/php_setup.inc:93
-msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-
-#: include/php_setup.inc:98
-msgid "Send bug report to the GOsa Team"
-msgstr ""
-
-#: include/php_setup.inc:98
-msgid "Send bugreport"
-msgstr ""
-
-#: include/php_setup.inc:103 html/main.php:393
-msgid "Toggle information"
-msgstr ""
-
-#: include/php_setup.inc:113
-msgid "PHP error"
-msgstr ""
-
-#: include/php_setup.inc:132
-msgid "class"
-msgstr ""
-
-#: include/php_setup.inc:138
-msgid "function"
-msgstr ""
-
-#: include/php_setup.inc:143
-msgid "static"
-msgstr ""
-
-#: include/php_setup.inc:147
-msgid "method"
-msgstr ""
-
-#: include/php_setup.inc:180
-msgid "Trace"
-msgstr ""
-
-#: include/php_setup.inc:181
-msgid "Line"
-msgstr ""
-
-#: include/php_setup.inc:182
-msgid "Arguments"
-msgstr ""
-
 #: include/class_tabs.inc:204
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
@@ -13967,11 +14515,24 @@ msgid ""
 "Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
 msgstr ""
 
-#: include/class_timezones.inc:53 include/class_timezones.inc:83
+#: 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_timezones.inc:83
+#, php-format
+msgid ""
+"\" in your gosa.conf is not valid. Can not calculate correct timezone offest."
+msgstr ""
+
 #: include/class_pluglist.inc:116
 #, php-format
 msgid ""
@@ -14010,11 +14571,11 @@ msgstr ""
 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:209
 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 ""
 
@@ -14144,11 +14705,11 @@ msgstr ""
 msgid "Computers of %s on %s"
 msgstr ""
 
-#: html/index.php:55 html/index.php:352 html/password.php:274
+#: html/index.php:55 html/index.php:351 html/password.php:274
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:55 html/index.php:352 html/password.php:274
+#: html/index.php:55 html/index.php:351 html/password.php:274
 msgid "Enter SSL session"
 msgstr ""
 
@@ -14162,45 +14723,70 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:224
 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:240
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:260
+#: html/index.php:259
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
 msgstr ""
 
-#: html/index.php:268 html/password.php:208
+#: html/index.php:267 html/password.php:208
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:270 html/password.php:210
+#: html/index.php:269 html/password.php:210
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:277 html/password.php:216
+#: html/index.php:276 html/password.php:216
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:306
+#: html/index.php:305
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:358
+#: html/index.php:357
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
+#: html/main.php:163
+msgid ""
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
+msgstr ""
+
+#: html/main.php:219
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+
+#: html/main.php:341
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr ""
+
+#: html/main.php:356
+msgid "Your password is about to expire, please change your password"
+msgstr ""
+
+#: html/main.php:391
+msgid ""
+"Generating this page caused the W3C          conformance checker to raise "
+"some errors!"
+msgstr ""
+
 #: html/getkiosk.php:25
 #, php-format
 msgid "Can't open file '%s', possibly the file does not exist."
@@ -14227,31 +14813,6 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/main.php:165
-msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
-msgstr ""
-
-#: html/main.php:221
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-
-#: html/main.php:343
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr ""
-
-#: html/main.php:358
-msgid "Your password is about to expire, please change your password"
-msgstr ""
-
-#: html/main.php:393
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr ""
-
 #: html/get_attachment.php:47
 msgid ""
 "Can't connect to glpi database, there is no mysl extension available in your "
@@ -14463,7 +15024,7 @@ msgstr ""
 msgid "Click here to Change your password"
 msgstr ""
 
-#: setup/class_setup.inc:210
+#: setup/class_setup.inc:196
 msgid "Completed"
 msgstr ""
 
@@ -14734,11 +15295,11 @@ msgstr ""
 msgid "The given password differ value is not numeric."
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr ""
 
@@ -14971,19 +15532,19 @@ msgstr ""
 msgid "I have read the license and accept it"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr ""
 
@@ -15024,26 +15585,34 @@ msgid "Enable Copy & Paste"
 msgstr ""
 
 #: setup/setup_config2.tpl:111
-msgid "Enable FAI release management"
+msgid "Enable DNS extension"
 msgstr ""
 
 #: setup/setup_config2.tpl:123
+msgid "Enable DHCP extension"
+msgstr ""
+
+#: setup/setup_config2.tpl:135
+msgid "Enable FAI release management"
+msgstr ""
+
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr ""
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr ""
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
@@ -15407,78 +15976,82 @@ 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:86
 msgid "Network resolv hook"
 msgstr ""
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr ""
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr ""
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr ""
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr ""
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr ""
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr ""