Added dynamic acl divs for extended settings. Currently only firefox is supported.

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 9a8c269ebd5c989861267511413615b9c713d2d3..e10eb30f1b75b9bdb775807472320c4a0ca0e8b2 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1338
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:115 include/class_plugin.inc:116
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-07-28 12:39+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"
@@ -18,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1350
 msgid "My account"
 msgstr ""
 
@@ -27,6 +29,7 @@ msgid "Administration"
 msgstr ""
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr ""
 
@@ -38,18 +41,29 @@ msgstr ""
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1345
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:787
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
 #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
 #: plugins/admin/fai/faiProfile.tpl:32
@@ -59,7 +73,9 @@ msgstr ""
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
@@ -70,6 +86,7 @@ msgstr ""
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1146
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -77,16 +94,21 @@ msgstr ""
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr ""
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1016
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -101,23 +123,28 @@ msgstr ""
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:176
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
@@ -126,26 +153,29 @@ msgstr ""
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:774
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:101 include/class_tabs.inc:294
+#: contrib/gosa.conf:101 include/class_tabs.inc:295
 msgid "ACL"
 msgstr ""
 
@@ -162,6 +192,8 @@ msgid "Parameter"
 msgstr ""
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr ""
@@ -172,9 +204,9 @@ msgid "Devices"
 msgstr ""
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
-#: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/personal/environment/environment.tpl:228
+#: plugins/admin/systems/class_systemManagement.inc:783
+#: plugins/admin/systems/class_printGeneric.inc:793
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -224,7 +256,7 @@ msgstr ""
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -244,6 +276,7 @@ msgstr ""
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -261,7 +294,7 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
@@ -271,7 +304,7 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr ""
 
@@ -375,21 +408,21 @@ msgid "User name of which addresses are shown"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:102
+#: plugins/personal/posix/generic.tpl:88
+#: plugins/personal/posix/generic.tpl:126
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/paste_generic.tpl:61
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:407
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
-#: plugins/personal/environment/environment.tpl:119
-#: plugins/personal/environment/environment.tpl:136
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/connectivity/kolab.tpl:53
+#: plugins/personal/connectivity/class_kolabAccount.inc:245
+#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:174
+#: plugins/personal/environment/environment.tpl:241
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
@@ -432,19 +465,19 @@ msgstr ""
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:41
-#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:41
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:43
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:43
 #: plugins/admin/mimetypes/generic.tpl:87
 #: plugins/admin/mimetypes/generic.tpl:93
 #: plugins/admin/mimetypes/generic.tpl:134
@@ -456,18 +489,18 @@ msgstr ""
 #: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:148
+#: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:120
-#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/main.inc:97
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:52
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:91
 #: plugins/gofax/blocklists/remove.tpl:16
@@ -484,18 +517,18 @@ msgstr ""
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:633
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
 #: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:484
+#: plugins/admin/systems/class_systemManagement.inc:494
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -519,8 +552,8 @@ msgstr ""
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -531,8 +564,8 @@ msgstr ""
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -564,9 +597,10 @@ msgstr ""
 msgid "Primary address"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:11
+#: plugins/personal/mail/generic.tpl:15
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:765
+#: plugins/admin/systems/class_servGeneric.inc:321
+#: plugins/admin/systems/class_systemManagement.inc:775
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:386
@@ -574,50 +608,51 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:14
+#: plugins/personal/mail/generic.tpl:18
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
+#: plugins/personal/mail/generic.tpl:28 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:480
 msgid "not defined"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/generic.tpl:40
+#: plugins/personal/mail/class_mailAccount.inc:997
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:25
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/copypaste.tpl:25
 #: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/copypaste.tpl:55
 #: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
 #: plugins/admin/systems/phonesettings.tpl:172
 #: plugins/admin/systems/phonesettings.tpl:187
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
-#: plugins/personal/posix/generic.tpl:74
-#: plugins/personal/posix/generic.tpl:104
+#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/generic.tpl:129
 #: plugins/personal/posix/paste_generic.tpl:62
-#: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/environment/environment.tpl:166
-#: plugins/personal/environment/environment.tpl:183
-#: plugins/personal/environment/class_environment.inc:626
+#: plugins/personal/samba/samba3.tpl:410
+#: plugins/personal/connectivity/kolab.tpl:56
+#: plugins/personal/environment/environment.tpl:180
+#: plugins/personal/environment/environment.tpl:218
+#: plugins/personal/environment/environment.tpl:244
+#: plugins/personal/environment/class_environment.inc:636
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
@@ -630,9 +665,9 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/terminal.tpl:101
+#: plugins/admin/systems/terminal.tpl:101 plugins/admin/systems/printer.tpl:76
+#: plugins/admin/systems/printer.tpl:92
 #: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/goNtpServer.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -664,106 +699,106 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:67
+#: plugins/personal/mail/generic.tpl:80
 msgid "Mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:86
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:86
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:91
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:91
 msgid "Activate vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:99
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:101
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:84
+#: plugins/personal/mail/generic.tpl:104
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:87
+#: plugins/personal/mail/generic.tpl:108
 msgid "to folder"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:118
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:96
-#: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
-#: plugins/personal/environment/environment.tpl:45
+#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/connectivity/pureftpd.tpl:60
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/personal/environment/environment.tpl:55
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/class_mailAccount.inc:1000
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:151
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/generic.tpl:167
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:139
+#: plugins/personal/mail/generic.tpl:178
 msgid "Advanced mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:184
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:186
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/class_mailAccount.inc:1015
 msgid "Use custom sieve script"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:195
 msgid "disables all Mail options!"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:100
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:146
 #: plugins/personal/connectivity/main.inc:118
-#: plugins/personal/environment/main.inc:104
+#: plugins/personal/environment/main.inc:95
 #: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:104
 #: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:627
 #: plugins/admin/applications/class_applicationManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:488
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -771,21 +806,21 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:111
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:167
 #: plugins/personal/connectivity/main.inc:128
-#: plugins/personal/environment/main.inc:114
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
 #: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:113
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:129
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:177
+#: plugins/personal/environment/main.inc:107
 #: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
@@ -811,7 +846,7 @@ msgid "User mail settings"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:986
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr ""
@@ -866,180 +901,189 @@ msgstr ""
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:150
-#: plugins/admin/groups/class_groupMail.inc:173
-#, php-format
-msgid "Can't get quota information for '%s'."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:313
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:319
 #: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:349
+#: plugins/personal/mail/class_mailAccount.inc:354
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:364
 #: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:623
+#: plugins/personal/mail/class_mailAccount.inc:614
 #, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/personal/mail/class_mailAccount.inc:716
 #, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:775
+#: plugins/personal/mail/class_mailAccount.inc:764
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:769
 #: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:773
+#: plugins/personal/mail/class_mailAccount.inc:777
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:783
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:800
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:809
+#: plugins/personal/mail/class_mailAccount.inc:798
 #: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:808
 #: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:812
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:852
+#: plugins/personal/mail/class_mailAccount.inc:864
+msgid "You are not allowed to write mail forwarding."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:896
+#: plugins/personal/mail/class_mailAccount.inc:907
+msgid "You are not allowed to write mail alternate address."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:972
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:974
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:995
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:987
-msgid "Mail max size"
+#: plugins/personal/mail/class_mailAccount.inc:999
+msgid "Add vacation information"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
-msgid "Forwarding address"
+#: plugins/personal/mail/class_mailAccount.inc:1002
+msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:989
-msgid "Local delivery"
+#: plugins/personal/mail/class_mailAccount.inc:1003
+msgid "Spam level"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:990
-msgid "Reject due to mailsize"
+#: plugins/personal/mail/class_mailAccount.inc:1004
+msgid "Spam mail box"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:991
-msgid "Use spam filter"
+#: plugins/personal/mail/class_mailAccount.inc:1006
+msgid "Reject due to mailsize"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:992
-msgid "Add vacation information"
+#: plugins/personal/mail/class_mailAccount.inc:1007
+msgid "Mail max size"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:994
-msgid "Only insider delivery"
+#: plugins/personal/mail/class_mailAccount.inc:1009
+#: plugins/personal/mail/class_mailAccount.inc:1014
+msgid "Forwarding address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:995
-msgid "Spam level"
+#: plugins/personal/mail/class_mailAccount.inc:1010
+msgid "Local delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:996
-msgid "Spam mail box"
+#: plugins/personal/mail/class_mailAccount.inc:1011
+msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1012
 msgid "Mail alternative addresses"
 msgstr ""
 
@@ -1096,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169
+#: plugins/personal/generic/main.inc:157
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentimport.tpl:45
@@ -1104,7 +1148,7 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/mailqueue/header.tpl:5
 #: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1475
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1477
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1118,10 +1162,15 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1148,14 +1197,14 @@ msgstr ""
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
+#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:74
 #: plugins/admin/users/class_userManagement.inc:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
+#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:79
 #: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
@@ -1177,25 +1226,24 @@ msgid "External password changer reported a problem: "
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1259
 #: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
+#: plugins/personal/samba/class_sambaAccount.inc:621
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/generic.tpl:15
+#: plugins/personal/posix/class_posixAccount.inc:1260
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/generic.tpl:25
 msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/posix/generic.tpl:35
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1203,41 +1251,41 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/generic.tpl:47
 #: plugins/personal/posix/paste_generic.tpl:23
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/generic.tpl:51
 #: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/generic.tpl:76
 #: plugins/personal/posix/paste_generic.tpl:47
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/generic.tpl:78
 #: plugins/personal/posix/paste_generic.tpl:54
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:84
+#: plugins/personal/posix/generic.tpl:102
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/generic.tpl:109
 msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:92
+#: plugins/personal/posix/generic.tpl:110
 msgid "Trust mode"
 msgstr ""
 
@@ -1283,12 +1331,12 @@ msgstr ""
 msgid "User name of which groups are shown"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:5
+#: plugins/personal/posix/posix_shadow.tpl:9
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/posix/posix_shadow.tpl:34
+#: plugins/personal/samba/samba2.tpl:87 plugins/personal/samba/samba3.tpl:311
 msgid "Password expires on"
 msgstr ""
 
@@ -1305,7 +1353,7 @@ msgstr ""
 msgid "Display systems matching"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:121
 msgid "Unix settings"
 msgstr ""
 
@@ -1314,36 +1362,36 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:125
+#: plugins/personal/posix/class_posixAccount.inc:129
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:127
+#: plugins/personal/posix/class_posixAccount.inc:131
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:130
+#: plugins/personal/posix/class_posixAccount.inc:134
 msgid "active, password not changable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:136
 msgid "active, password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:134
+#: plugins/personal/posix/class_posixAccount.inc:138
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:145
-#: plugins/personal/posix/class_posixAccount.inc:979
+#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:1008
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:185
+#: plugins/personal/posix/class_posixAccount.inc:189
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:203
+#: plugins/personal/posix/class_posixAccount.inc:206
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/admin/systems/class_workstationStartup.inc:759
 #: plugins/admin/systems/class_workstationService.inc:182
@@ -1351,301 +1399,301 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:254
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:262
-#: plugins/personal/posix/class_posixAccount.inc:265
+#: plugins/personal/posix/class_posixAccount.inc:274
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:263
+#: plugins/personal/posix/class_posixAccount.inc:275
 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:266
+#: plugins/personal/posix/class_posixAccount.inc:278
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:269
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:270
+#: plugins/personal/posix/class_posixAccount.inc:282
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:451
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:455
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:437
+#: plugins/personal/posix/class_posixAccount.inc:459
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:463
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:465
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:465
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:465
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:547
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/posix/class_posixAccount.inc:577
+#: plugins/personal/samba/class_sambaAccount.inc:459
 #: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:547
+#: plugins/personal/posix/class_posixAccount.inc:577
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/posix/class_posixAccount.inc:578
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:594
+#: plugins/personal/posix/class_posixAccount.inc:624
 #, php-format
 msgid "Removing of user/posix account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:743
+#: plugins/personal/posix/class_posixAccount.inc:772
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:832
+#: plugins/personal/posix/class_posixAccount.inc:861
 #, php-format
 msgid "Saving of user/posix account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:893
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:896
+#: plugins/personal/posix/class_posixAccount.inc:925
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:904
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:936
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:940
 #: plugins/admin/groups/class_groupGeneric.inc:774
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:943
 #: plugins/admin/groups/class_groupGeneric.inc:777
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:951
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:956
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:967
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:941
+#: plugins/personal/posix/class_posixAccount.inc:970
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:946
+#: plugins/personal/posix/class_posixAccount.inc:975
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:978
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:954
+#: plugins/personal/posix/class_posixAccount.inc:983
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1081
+#: plugins/personal/posix/class_posixAccount.inc:1110
 #: plugins/admin/groups/class_groupGeneric.inc:813
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1249
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1261
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1262
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1264
+msgid "Force password change on login"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1265
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1266
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1267
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1268
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
-msgid "Shadow last change"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1269
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1270
 msgid "System trust model"
 msgstr ""
 
@@ -1657,137 +1705,137 @@ msgstr ""
 msgid "Samba home"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba2.tpl:37 plugins/personal/samba/samba3.tpl:44
 msgid "Script path"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:644
+#: plugins/personal/samba/samba2.tpl:45 plugins/personal/samba/samba3.tpl:52
+#: plugins/personal/samba/samba3.tpl:111
+#: plugins/personal/samba/class_sambaAccount.inc:622
 msgid "Profile path"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
+#: plugins/personal/samba/samba2.tpl:59 plugins/personal/samba/samba3.tpl:288
 msgid "Access options"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
+#: plugins/personal/samba/samba2.tpl:67 plugins/personal/samba/samba3.tpl:296
 msgid "Allow user to change password from client"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
+#: plugins/personal/samba/class_sambaAccount.inc:1030
 msgid "Login from windows client requires no password"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:60
+#: plugins/personal/samba/samba2.tpl:77
 msgid "Temporary disable samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/samba3.tpl:27
+#: plugins/personal/samba/class_sambaAccount.inc:1044
 msgid "Domain"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:66
 msgid "Terminal Server"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:1026
 msgid "Allow login on terminal server"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/class_sambaAccount.inc:1027
 msgid "Inherit client config"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:134
 msgid "Initial program"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:142
 msgid "Working directory"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:153
+#: plugins/personal/samba/samba3.tpl:159
 msgid "Timeout settings (in minutes)"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:651
+#: plugins/personal/samba/samba3.tpl:169
+#: plugins/personal/samba/class_sambaAccount.inc:629
 msgid "Connection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:652
+#: plugins/personal/samba/samba3.tpl:183
+#: plugins/personal/samba/class_sambaAccount.inc:630
 msgid "Disconnection"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/samba3.tpl:197
+#: plugins/personal/samba/class_sambaAccount.inc:631
 msgid "IDLE"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/samba3.tpl:213
 msgid "Client devices"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:194
+#: plugins/personal/samba/samba3.tpl:220
 msgid "Connect client drives at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:200
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Connect client printers at logon"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:206
+#: plugins/personal/samba/samba3.tpl:236
 msgid "Default to main client printer"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:216
-#: plugins/personal/connectivity/pureftpd.tpl:68
+#: plugins/personal/samba/samba3.tpl:246
+#: plugins/personal/connectivity/pureftpd.tpl:93
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:220
+#: plugins/personal/samba/samba3.tpl:250
 msgid "Shadowing"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:229
+#: plugins/personal/samba/samba3.tpl:261
 msgid "On broken or timed out"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:237
+#: plugins/personal/samba/samba3.tpl:271
 msgid "Reconnect if disconnected"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/class_sambaAccount.inc:1031
 msgid "Lock samba account"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/samba3.tpl:331
+#: plugins/personal/samba/class_sambaAccount.inc:1037
 msgid "Limit Logon Time"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/samba3.tpl:351
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 msgid "Limit Logoff Time"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:304
+#: plugins/personal/samba/samba3.tpl:372
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:398
 msgid "Allow connection from these workstations only"
 msgstr ""
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1017
 msgid "Samba settings"
 msgstr ""
 
@@ -1830,106 +1878,106 @@ msgid ""
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:458
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:463
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:461
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:466
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:468
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:469
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:627
+#: plugins/personal/samba/class_sambaAccount.inc:605
 #, php-format
 msgid "Removing of user/samba account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/class_sambaAccount.inc:624
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:656
+#: plugins/personal/samba/class_sambaAccount.inc:634
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:662
+#: plugins/personal/samba/class_sambaAccount.inc:640
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:846
+#: plugins/personal/samba/class_sambaAccount.inc:824
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:870
+#: plugins/personal/samba/class_sambaAccount.inc:848
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:974
+#: plugins/personal/samba/class_sambaAccount.inc:952
 #, php-format
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
-msgid "Account expires"
+#: plugins/personal/samba/class_sambaAccount.inc:1029
+msgid "Allow user to change password"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1049
-msgid "Allow user to change password"
+#: plugins/personal/samba/class_sambaAccount.inc:1034
+msgid "Account expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1035
 msgid "Password expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1040
 msgid "Generic home directory"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1041
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1042
 msgid "Generic script path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1043
 msgid "Generic profile path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1045
 msgid "Allow connection from"
 msgstr ""
 
@@ -1945,265 +1993,312 @@ msgstr ""
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:326
+#: 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:422
+#: plugins/personal/generic/class_user.inc:428
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:459
+#: plugins/personal/generic/class_user.inc:468
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:459
+#: plugins/personal/generic/class_user.inc:468
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:459
+#: plugins/personal/generic/class_user.inc:468
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:463
+#: plugins/personal/generic/class_user.inc:472
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:563
 #, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:631
+#, php-format
+msgid "You are not allowed to move this object to '%s'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:874
 #, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:921
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:938
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:910
+#: plugins/personal/generic/class_user.inc:949
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:954
+#: plugins/personal/generic/class_user.inc:990
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:993
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:999
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:519
+#: plugins/admin/users/class_userManagement.inc:520
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:1008
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:1014
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:522
+#: plugins/admin/users/class_userManagement.inc:523
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:1017
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:1024
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:1031
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:1034
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1062
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1040
+#: plugins/personal/generic/class_user.inc:1059
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1045
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1014
+#: plugins/personal/generic/class_user.inc:1048
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1017
+#: plugins/personal/generic/class_user.inc:1051
 #: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1054
 #: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1184
 msgid "Could not open specified certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1330
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1332
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1346
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1351
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/generic.tpl:143
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1356
 msgid "User password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1357 html/getxls.php:236
 msgid "Surename"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1358
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1359
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/generic.tpl:73
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1362 html/getxls.php:174
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1363
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1366
+#: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 #: plugins/addons/addressbook/address_edit.tpl:138
 #: plugins/addons/addressbook/address_info.tpl:64
@@ -2216,177 +2311,150 @@ msgstr ""
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1367
+#: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1368
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1369
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1370
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1371
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1373
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:798
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1375
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1376
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1377
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1378
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1337
-msgid "User certificate PKCS12"
+#: plugins/personal/generic/class_user.inc:1380
+msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1382 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1383
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1341
-msgid "User certificate SMIME"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:22
+#: plugins/personal/generic/generic.tpl:38
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
 #: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:29
+#: plugins/personal/generic/generic.tpl:40
 msgid "Change picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:54
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:61
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:65
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:111
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:130
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:148
 msgid "Choose subtree to place user in"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:153
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2397,9 +2465,9 @@ msgstr ""
 #: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
 #: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
 #: plugins/admin/systems/phone.tpl:19 plugins/admin/systems/phone.tpl:21
+#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
 #: plugins/admin/systems/workstation.tpl:29
 #: plugins/admin/systems/workstation.tpl:31
-#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:19
 #: plugins/admin/systems/component.tpl:21 plugins/admin/ogroups/generic.tpl:27
@@ -2410,67 +2478,69 @@ msgstr ""
 msgid "Select a base"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
 #: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:261
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2478,7 +2548,7 @@ msgstr ""
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -2495,8 +2565,8 @@ msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:51
+#: plugins/personal/generic/generic_certs.tpl:91
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/addons/addressbook/address_edit.tpl:233
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/servdns.tpl:21
@@ -2513,8 +2583,8 @@ msgstr ""
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2528,11 +2598,11 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:107
+#: plugins/personal/generic/main.inc:97
 msgid "You are not allowed to set your password!"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:189
+#: plugins/personal/generic/main.inc:177
 msgid "Generic user information"
 msgstr ""
 
@@ -2540,11 +2610,11 @@ msgstr ""
 msgid "Standard certificate"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:17
-#: plugins/personal/generic/generic_certs.tpl:37
-#: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:231
-#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/generic/generic_certs.tpl:21
+#: plugins/personal/generic/generic_certs.tpl:45
+#: plugins/personal/generic/generic_certs.tpl:69
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#: plugins/personal/environment/environment.tpl:152
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
 #: plugins/admin/applications/class_applicationParameters.inc:100
@@ -2561,15 +2631,15 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:28
+#: plugins/personal/generic/generic_certs.tpl:33
 msgid "S/MIME certificate"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:57
 msgid "PKCS12 certificate"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:65
+#: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
@@ -2577,10 +2647,6 @@ msgstr ""
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr ""
@@ -2602,24 +2668,24 @@ msgstr ""
 msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:20
 #: plugins/personal/connectivity/pureftpd.tpl:24
+#: plugins/personal/connectivity/pureftpd.tpl:32
 msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:23
+#: plugins/personal/connectivity/pureftpd.tpl:27
 msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
+#: plugins/personal/connectivity/pureftpd.tpl:43
 msgid "Quota"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
+#: plugins/personal/connectivity/pureftpd.tpl:47
 msgid "Files"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:43
+#: plugins/personal/connectivity/pureftpd.tpl:55
 #: plugins/addons/mailqueue/contents.tpl:54
 #: plugins/admin/systems/glpi_devices.tpl:293
 #: plugins/admin/systems/glpi_devices.tpl:420
@@ -2627,39 +2693,41 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:58
+#: plugins/personal/connectivity/pureftpd.tpl:75
 msgid "Uploaded / downloaded files"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:98
 msgid "Check to disable FTP Access"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:100
 msgid "Temporary disable FTP access"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/proxy.tpl:17
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
 msgid "Proxy account"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:18
+#: plugins/personal/connectivity/proxy.tpl:28
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:24
+#: plugins/personal/connectivity/proxy.tpl:38
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/proxy.tpl:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:300
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:86
+#: plugins/personal/connectivity/proxy.tpl:93
 msgid "per"
 msgstr ""
 
@@ -2672,17 +2740,25 @@ msgstr ""
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:118
 #, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:135
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:136
+msgid "PHP GW account settings"
+msgstr ""
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:3
-#: plugins/personal/connectivity/kolab.tpl:19
+#: plugins/personal/connectivity/kolab.tpl:35
 msgid "Kolab account"
 msgstr ""
 
@@ -2692,109 +2768,130 @@ msgid ""
 "you add a mail account."
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/kolab.tpl:41
+#: plugins/personal/connectivity/class_kolabAccount.inc:449
 msgid "Delegations"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:38
+#: plugins/personal/connectivity/kolab.tpl:59
 msgid "Mail size"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/kolab.tpl:62
 msgid "No mail size restriction for this account"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:48
+#: plugins/personal/connectivity/kolab.tpl:71
 msgid "Free Busy information"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:51
+#: plugins/personal/connectivity/kolab.tpl:74
 #: plugins/admin/systems/servRepositorySetup.tpl:24
 msgid "URL"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:55
+#: plugins/personal/connectivity/kolab.tpl:82
 msgid "Future"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:56
-#: plugins/personal/connectivity/oxchange.tpl:26
-#: plugins/personal/connectivity/oxchange.tpl:30
+#: plugins/personal/connectivity/kolab.tpl:86
+#: plugins/personal/connectivity/oxchange.tpl:39
+#: plugins/personal/connectivity/oxchange.tpl:49
 msgid "days"
 msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:61
+#: plugins/personal/connectivity/kolab.tpl:93
+#: plugins/personal/connectivity/class_kolabAccount.inc:450
 msgid "Invitation policy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:436
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:133
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:166
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:167
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:168
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:169
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:170
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:218
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:279
 #, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:290
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:309
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:317
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:401
 #, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:437
+msgid "Kolab account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:446
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+msgid "Mail size restriction"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:448
+msgid "Free busy information"
+msgstr ""
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:133
 msgid "WebDAV"
 msgstr ""
 
@@ -2803,81 +2900,118 @@ msgstr ""
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:115
 #, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr ""
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:99
 #, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+msgid "Value specified as 'Quota files' is not valid."
+msgstr ""
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
+msgid "Value specified as 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:155
+msgid "Value specified as 'Upload ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
+msgid "Value specified as 'Download ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:184
 #, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+msgid "Ftp"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+msgid "Pure ftp account"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid ""
-"disabled, no Postgresql support detected. Or the specified database can't be "
-"reached"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:213
+msgid "Quota files"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:10
-msgid "Open-Xchange account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:214
+msgid "Upload ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Remember"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:215
+msgid "Quota MBytes"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:25
-msgid "Appointment Days"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:216
+msgid "Download ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:29
-msgid "Task Days"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:217
+msgid "Upload bandwith"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:41
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:218
+msgid "Download bandwith"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:18
+msgid "Open-Xchange account"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:29
+msgid "Remember"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "Appointment Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:42
+msgid "Task Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:61
 msgid "User Information"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:45
+#: plugins/personal/connectivity/oxchange.tpl:65
 msgid "User Timezone"
 msgstr ""
 
@@ -2885,47 +3019,67 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:817
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:713
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:821
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:717
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:825
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
 #, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:805
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:838
 #, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:845
 #, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:885
+msgid "Open xchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:886
+msgid "Open xchange account settings"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:895
+msgid "OXAppointmentDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:896
+msgid "OXTaskDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:897
+msgid "OXTimeZone"
+msgstr ""
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr ""
@@ -2934,116 +3088,154 @@ msgstr ""
 msgid "This account has no connectivity extensions."
 msgstr ""
 
+#: plugins/personal/connectivity/class_connectivity.inc:177
+msgid "Connectivity settings"
+msgstr ""
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:286
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:150
 #, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:168
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:268
 #, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+msgid "gosaProxyID"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:298
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:299
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
+msgid "Limit proxy access"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
+msgid "Limit quota"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
+msgid "Quota limit period"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:302
+msgid "Opengroupware"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:8
+#: plugins/personal/connectivity/class_opengwAccount.inc:312
+msgid "Location team"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:21
+#: plugins/personal/connectivity/class_opengwAccount.inc:313
+msgid "Template user"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:33
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/admin/systems/class_servGeneric.inc:44
+#: plugins/admin/systems/class_workstationGeneric.inc:103
+#: plugins/admin/ogroups/class_termgroup.inc:46
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:48
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
+msgid "Teams"
+msgstr ""
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:169
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:100
 #, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:158
 #, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:176
+msgid "Intranet account settings"
+msgstr ""
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:150
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:85
 #, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:132
 #, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:1
-msgid "Opengroupware"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:8
-msgid "Location team"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:21
-msgid "Template user"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:46
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr ""
-
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
 msgid "PHPscheduleit account"
 msgstr ""
@@ -3052,7 +3244,7 @@ msgstr ""
 msgid "PHPscheduleit"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr ""
@@ -3062,151 +3254,166 @@ msgstr ""
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:143
+msgid "PHP Schedule it"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+msgid "PHP Schedule it settings"
+msgstr ""
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:136
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:141
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:149
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:303
+msgid "Open groupware account settings"
+msgstr ""
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/environment.tpl:149
+#: plugins/personal/environment/environment.tpl:14
+#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:191
 msgid "Environment managment settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:11
+#: plugins/personal/environment/environment.tpl:17
 msgid "Profile managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:18
+#: plugins/personal/environment/environment.tpl:26
 msgid "Use profile managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:25
+#: plugins/personal/environment/environment.tpl:33
 msgid "Profile server managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:28
+#: plugins/personal/environment/environment.tpl:36
 msgid "Profil path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:40
+#: plugins/personal/environment/environment.tpl:49
 msgid "Profil quota"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/class_environment.inc:1159
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:63
+#: plugins/personal/environment/environment.tpl:75
 msgid "Kiosk profile settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/environment.tpl:78
+#: plugins/personal/environment/class_environment.inc:1165
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:72
+#: plugins/personal/environment/environment.tpl:88
 msgid "Manage"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/environment.tpl:98
+#: plugins/personal/environment/class_environment.inc:1158
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/class_environment.inc:1164
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/environment.tpl:126
+#: plugins/personal/environment/class_environment.inc:1170
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:111
+#: plugins/personal/environment/environment.tpl:136
 msgid "User used to connect to the share"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:112
+#: plugins/personal/environment/environment.tpl:139
 msgid "Select a share"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:118
+#: plugins/personal/environment/environment.tpl:147
 msgid "Mount path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:126
+#: plugins/personal/environment/environment.tpl:160
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:162
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:196
+#: plugins/personal/environment/class_environment.inc:1169
 msgid "Hotplug devices"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:198
 msgid "Hotplug device settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:164
+#: plugins/personal/environment/environment.tpl:212
 #: plugins/admin/groups/class_divListGroup.inc:105
 #: plugins/gofon/macro/class_divListMacros.inc:90
 msgid "New"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:165
+#: plugins/personal/environment/environment.tpl:215
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:174
+#: plugins/personal/environment/environment.tpl:230
 msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/environment.tpl:247
 msgid "Toggle admin"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:185
+#: plugins/personal/environment/environment.tpl:250
 msgid "Toggle default"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:124
+#: plugins/personal/environment/main.inc:116
 msgid "User environment settings"
 msgstr ""
 
@@ -3233,7 +3440,7 @@ msgid "Please select an entry or press cancel."
 msgstr ""
 
 #: plugins/personal/environment/class_selectPrinterDialog.inc:69
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:102
 msgid "Please select a printer or press cancel."
 msgstr ""
 
@@ -3267,11 +3474,11 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:198
+#: plugins/personal/environment/class_environment.inc:205
 msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:220
+#: plugins/personal/environment/class_environment.inc:227
 #: plugins/admin/systems/class_terminalService.inc:95
 #: plugins/admin/systems/class_workstationService.inc:88
 #, php-format
@@ -3280,125 +3487,124 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:297
-#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:305
+#: plugins/personal/environment/class_environment.inc:345
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:298
-#: plugins/personal/environment/class_environment.inc:335
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:346
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:307
-#: plugins/personal/environment/class_environment.inc:312
-#: plugins/personal/environment/class_environment.inc:340
-#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:315
+#: plugins/personal/environment/class_environment.inc:320
+#: plugins/personal/environment/class_environment.inc:351
+#: plugins/personal/environment/class_environment.inc:356
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:308
-#: plugins/personal/environment/class_environment.inc:341
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:352
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:313
-#: plugins/personal/environment/class_environment.inc:346
+#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:357
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:461
-#: plugins/personal/environment/class_environment.inc:777
+#: plugins/personal/environment/class_environment.inc:460
+#: plugins/personal/environment/class_environment.inc:802
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:544
-#: plugins/personal/environment/class_environment.inc:555
+#: plugins/personal/environment/class_environment.inc:474
+msgid "You are not allowed to write Logon scripts."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:553
+#: plugins/personal/environment/class_environment.inc:564
 #: plugins/admin/systems/class_terminalStartup.inc:187
 #: plugins/admin/systems/class_workstationStartup.inc:588
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:613
-#: plugins/personal/environment/class_environment.inc:614
-#: plugins/personal/environment/class_environment.inc:622
 #: plugins/personal/environment/class_environment.inc:623
+#: plugins/personal/environment/class_environment.inc:624
+#: plugins/personal/environment/class_environment.inc:632
+#: plugins/personal/environment/class_environment.inc:633
 msgid "Reset password hash"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:627
+#: plugins/personal/environment/class_environment.inc:637
 msgid "Delete share entry"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:780
+#: plugins/personal/environment/class_environment.inc:805
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:831
+#: plugins/personal/environment/class_environment.inc:843
 #, php-format
 msgid "Removing of user/environment account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:884
+#: plugins/personal/environment/class_environment.inc:896
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:891
+#: plugins/personal/environment/class_environment.inc:903
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:929
+#: plugins/personal/environment/class_environment.inc:941
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1037
-#, php-format
-msgid "Saving printer membership with dn %s failed "
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1106
-msgid "Error while writing printer settings"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:1176
+#: plugins/personal/environment/class_environment.inc:1070
 #, php-format
 msgid "Saving of user/environment account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1189
+#: plugins/personal/environment/class_environment.inc:1083
 msgid "group share"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1222
+#: plugins/personal/environment/class_environment.inc:1116
 msgid "Administrator"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1121
+#: plugins/personal/environment/class_environment.inc:1167
 msgid "Default printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1147
 msgid "Environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1254
-msgid "Profile server"
+#: plugins/personal/environment/class_environment.inc:1154
+msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1161
 msgid "Profile quota"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1162
+msgid "Profile server"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1168
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3443,28 +3649,51 @@ 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/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:797
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:272
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -3494,13 +3723,13 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:333
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:630
 #: plugins/admin/applications/class_applicationManagement.inc:353
-#: plugins/admin/systems/class_systemManagement.inc:481
+#: plugins/admin/systems/class_systemManagement.inc:491
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3556,12 +3785,12 @@ msgstr ""
 msgid "Vendor ID"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:33
-msgid "Product ID"
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
+msgid "Device ID"
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:40
-msgid "Device ID"
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:1
@@ -3593,30 +3822,37 @@ msgid "Nagios Account"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr ""
 
@@ -3699,6 +3935,38 @@ msgstr ""
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+msgid "Nagios account settings"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+msgid "View all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+msgid "View all services"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+msgid "Trigger system commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+msgid "Trigger all host commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+msgid "Trigger all service commands"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+msgid "View configuration information"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+msgid "View system informations"
+msgstr ""
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr ""
@@ -3750,12 +4018,25 @@ msgstr ""
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr ""
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+msgid "apple-user-homeDirectory"
+msgstr ""
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr ""
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:275
 msgid "Path"
 msgstr ""
 
@@ -3773,13 +4054,16 @@ msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:273
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3803,7 +4087,43 @@ msgstr ""
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr ""
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr ""
 
@@ -3833,65 +4153,92 @@ msgstr ""
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr ""
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+msgid "Fax Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:796
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
 msgstr ""
 
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+msgid "Blocklist type"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:31
@@ -4028,12 +4375,12 @@ msgstr ""
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:362
 msgid "Up"
 msgstr ""
 
@@ -4167,7 +4514,7 @@ msgstr ""
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:364 include/class_acl.inc:409
 msgid "edit"
 msgstr ""
 
@@ -4194,7 +4541,7 @@ msgstr ""
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:365 include/class_acl.inc:410
 msgid "delete"
 msgstr ""
 
@@ -4209,7 +4556,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr ""
@@ -4219,6 +4568,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr ""
 
@@ -4243,6 +4593,7 @@ msgid "Deliver fax as mail"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -4376,6 +4727,22 @@ msgstr ""
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+msgid "Fax account settings"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+msgid "Receive blocklist"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+msgid "Send blocklist"
+msgstr ""
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4422,7 +4789,7 @@ msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:775
 #: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4533,38 +4900,13 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+msgid "Fax report"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+msgid "Detailed view"
 msgstr ""
 
 #: plugins/addons/addressbook/contents.tpl:15
@@ -4687,7 +5029,7 @@ msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr ""
 
@@ -5363,7 +5705,8 @@ msgid "Notifications"
 msgstr ""
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:164
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr ""
@@ -5437,12 +5780,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5568,6 +5911,30 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+msgid "Generic group settings"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+msgid "Phone pickup group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+msgid "Nagios group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+msgid "Group member"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+msgid "Samba group type"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+msgid "Samba SID"
+msgstr ""
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr ""
@@ -5588,7 +5955,8 @@ msgstr ""
 msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:510
+#: include/class_acl.inc:573
 msgid "read"
 msgstr ""
 
@@ -5604,7 +5972,8 @@ msgstr ""
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:511
+#: include/class_acl.inc:574
 msgid "write"
 msgstr ""
 
@@ -5643,6 +6012,24 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr ""
 
+#: plugins/admin/groups/class_groupMail.inc:981
+msgid "Group mail"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:989
+msgid "Alternate addresses"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:990
+msgid "Forwarding addresses"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:801
+msgid "Permissions"
+msgstr ""
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr ""
@@ -5732,18 +6119,6 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr ""
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -5846,6 +6221,38 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+msgid "Group applications"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+msgid "Application parameter"
+msgstr ""
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr ""
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr ""
@@ -5926,14 +6333,6 @@ msgstr ""
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr ""
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6021,7 +6420,7 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -6037,7 +6436,8 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr ""
 
@@ -6193,7 +6593,9 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr ""
 
@@ -6203,6 +6605,7 @@ msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6222,7 +6625,9 @@ msgid "Choose subtree to place application in"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr ""
 
@@ -6236,22 +6641,27 @@ msgid "Reload picture from LDAP"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr ""
 
@@ -6289,6 +6699,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr ""
 
@@ -6390,6 +6801,18 @@ msgstr ""
 msgid "Application settings"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+msgid "Application generic"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+msgid "Script content"
+msgstr ""
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6451,6 +6874,7 @@ msgid "Descriptive text for department"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr ""
 
@@ -6484,6 +6908,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr ""
 
@@ -6492,10 +6917,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -6539,69 +6964,83 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:490
 #: ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr ""
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6617,20 +7056,6 @@ msgstr ""
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr ""
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -6677,6 +7102,7 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -6689,6 +7115,8 @@ msgstr ""
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -6754,11 +7182,14 @@ msgid "Terminal Service"
 msgstr ""
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr ""
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr ""
@@ -6892,7 +7323,7 @@ msgstr ""
 #: plugins/admin/systems/class_terminalGeneric.inc:391
 #: plugins/admin/systems/class_servGeneric.inc:242
 #: plugins/admin/systems/class_workstationGeneric.inc:361
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:619
 #: plugins/admin/systems/class_componentGeneric.inc:165
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
@@ -6917,8 +7348,8 @@ msgid "Terminal name"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
-#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
@@ -6926,8 +7357,11 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr ""
 
@@ -6939,7 +7373,9 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr ""
 
@@ -6950,6 +7386,7 @@ msgid "Choose server to use for logging"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr ""
 
@@ -6958,6 +7395,7 @@ msgid "Select NFS root filesystem to use"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr ""
 
@@ -7105,6 +7543,111 @@ msgstr ""
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:429
+msgid "Service"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+msgid "Terminal service"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:438
+msgid "Monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+msgid "Method"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:439
+msgid "Gfx driver"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:440
+msgid "Gfx resolution"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:441
+msgid "Gfx color depth"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:442
+msgid "Hsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:443
+msgid "Vsync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:443
+msgid "Printer service enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:444
+msgid "Scanner enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:446
+msgid "Scanner model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:445
+msgid "Keyboard model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:446
+msgid "Keyboard layout"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:447
+msgid "Keyboard variant"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:448
+msgid "Mouse type"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:449
+msgid "Mouse port"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:450
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalStartup.inc:93
 #: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
@@ -7118,6 +7661,27 @@ msgstr ""
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalStartup.inc:432
+msgid "Terminal startup"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+msgid "Ldap server"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+msgid "Kernel parameter"
+msgstr ""
+
 #: plugins/admin/systems/server.tpl:6 html/getxls.php:146
 msgid "Server name"
 msgstr ""
@@ -7130,14 +7694,6 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:8
-msgid "Workstation template"
-msgstr ""
-
-#: plugins/admin/systems/workstation.tpl:10
-msgid "Workstation name"
-msgstr ""
-
 #: plugins/admin/systems/printer.tpl:6
 msgid "General"
 msgstr ""
@@ -7164,10 +7720,6 @@ msgstr ""
 msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr ""
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr ""
@@ -7188,6 +7740,15 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr ""
+
+#: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
+msgid "Workstation name"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalGeneric.inc:98
 msgid "text"
 msgstr ""
@@ -7278,6 +7839,34 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+msgid "Terminal generic"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+msgid "Syslog server enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+msgid "Ntp server settings"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+msgid "Action flag"
+msgstr ""
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7345,6 +7934,15 @@ msgstr ""
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+msgid "Server generic"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+msgid "Goto mode"
+msgstr ""
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr ""
@@ -7395,6 +7993,23 @@ msgstr ""
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+msgid "Workstation generic"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+msgid "Ntp server"
+msgstr ""
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr ""
@@ -7423,81 +8038,68 @@ msgstr ""
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:638
+#: plugins/admin/systems/class_systemManagement.inc:648
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:640
+#: plugins/admin/systems/class_systemManagement.inc:650
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:642
+#: plugins/admin/systems/class_systemManagement.inc:652
 msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:657
+#: plugins/admin/systems/class_systemManagement.inc:667
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:669
+#: plugins/admin/systems/class_systemManagement.inc:679
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/systems/class_systemManagement.inc:767
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:771
 msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:762
+#: plugins/admin/systems/class_systemManagement.inc:772
 msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:773
 msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:776
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:777
 msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:778
 msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:779
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:780
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:781
 #: plugins/admin/systems/class_divListSystem.inc:103
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/class_systemManagement.inc:782
 #: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Workstation"
 msgstr ""
@@ -7507,6 +8109,7 @@ msgid "Zones"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr ""
 
@@ -7515,22 +8118,27 @@ msgid "Postfix mydestination"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr ""
 
@@ -7547,6 +8155,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr ""
 
@@ -7559,6 +8168,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr ""
 
@@ -7583,6 +8193,7 @@ msgid "Host used to relay mails"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr ""
 
@@ -7617,6 +8228,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr ""
 
@@ -7653,9 +8265,48 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 msgid "DNS service"
 msgstr ""
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:401
+msgid "Primary dns server"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr ""
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -7667,6 +8318,7 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr ""
 
@@ -7703,16 +8355,19 @@ msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr ""
 
@@ -7733,6 +8388,7 @@ msgid "Glpi database"
 msgstr ""
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr ""
@@ -7741,6 +8397,70 @@ msgstr ""
 msgid "Machine name"
 msgstr ""
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+msgid "FAX service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+msgid "FAX database configuration"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+msgid "The attribute user is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:215
+msgid "Fax server"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+msgid "Fax server service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+msgid "Login name"
+msgstr ""
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 msgid ""
 "This includes all system and setup informations. Please double check if your "
@@ -7801,105 +8521,133 @@ msgstr ""
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_servKolab.inc:414
+msgid "Kolab service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:423
+msgid "My destination"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:424
+msgid "FTP FreeBusy service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+msgid "Relayhost"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:428
+msgid "HTTP FreeBusy service"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:237
 #: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:250
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:305
+#: plugins/admin/systems/class_printGeneric.inc:308
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:238
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:246
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:251
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:282
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:290
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
 "template"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:298
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:301
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:309
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:475
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:483
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:496
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:498
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:553
 #, php-format
 msgid "Removing of system print/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:751
 #, php-format
 msgid "Saving of system print/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:770
+#: plugins/admin/systems/class_printGeneric.inc:772
 #: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
@@ -7907,6 +8655,47 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:788
+msgid "Print generic"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:799
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:800
+msgid "Printer PPD"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:817
+#, php-format
+msgid ""
+"You are not allowed to remove the given object '%s' from the list of members "
+"of printer '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:834
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:839
+#, php-format
+msgid ""
+"You are not allowed to add the given object '%s' to the list of members of '%"
+"s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:861
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:869
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -7946,6 +8735,56 @@ msgstr ""
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+msgid "Component generic"
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+msgid "Network device"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr ""
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr ""
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 msgid "Time server"
 msgstr ""
@@ -7955,6 +8794,7 @@ msgid "Printer type"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -7968,6 +8808,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr ""
@@ -7976,10 +8817,6 @@ msgstr ""
 msgid "Supported interfaces"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr ""
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr ""
@@ -7993,11 +8830,15 @@ msgid "Contacts"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr ""
 
@@ -8009,48 +8850,6 @@ msgstr ""
 msgid "Installed cartridges"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr ""
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr ""
-
 #: plugins/admin/systems/servnfs.tpl:1
 msgid "Edit share"
 msgstr ""
@@ -8060,6 +8859,7 @@ msgid "NFS setup"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:277
 msgid "Volume"
 msgstr ""
 
@@ -8072,6 +8872,7 @@ msgid "Codepage"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:276
 msgid "Option"
 msgstr ""
 
@@ -8081,10 +8882,12 @@ msgid "System type"
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr ""
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8176,6 +8979,32 @@ msgstr ""
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+msgid "Phone generic"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+msgid "Phone hardware"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+msgid "Default ip"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8185,34 +9014,46 @@ msgstr ""
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr ""
 
+#: plugins/admin/systems/class_servNfs.inc:263
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:264
+msgid "NFS service"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:274
+msgid "Charset"
+msgstr ""
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8264,19 +9105,41 @@ msgid ""
 "empty string."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+msgid "System startup"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:27
-#: plugins/admin/systems/phonesettings.tpl:37
-#: plugins/admin/systems/phonesettings.tpl:51
-#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+msgid "Debian release"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:27
+#: plugins/admin/systems/phonesettings.tpl:37
+#: plugins/admin/systems/phonesettings.tpl:51
+#: plugins/admin/systems/phonesettings.tpl:80
 #: plugins/admin/systems/phonesettings.tpl:111
 #: plugins/admin/systems/phonesettings.tpl:158
 msgid "Choose a phone type"
@@ -8286,10 +9149,6 @@ msgstr ""
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr ""
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8420,6 +9279,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr ""
 
@@ -8446,6 +9306,7 @@ msgstr ""
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr ""
 
@@ -8493,6 +9354,10 @@ msgstr ""
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationService.inc:430
+msgid "Workstation service"
+msgstr ""
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8543,13 +9408,6 @@ msgstr ""
 msgid "Choose mouse port"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr ""
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -8619,11 +9477,6 @@ msgstr ""
 msgid "Boot parameters"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr ""
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -8650,7 +9503,9 @@ msgstr ""
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr ""
@@ -8703,10 +9558,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr ""
@@ -8743,10 +9594,6 @@ msgstr ""
 msgid "Provide print services"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr ""
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -8756,11 +9603,13 @@ msgid "Select scanner driver to use"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr ""
 
@@ -8786,6 +9635,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 msgid "Repository service"
 msgstr ""
 
@@ -8813,6 +9663,14 @@ msgstr ""
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+msgid "Releases"
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr ""
@@ -8825,6 +9683,48 @@ msgstr ""
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+msgid "Inventory database"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+msgid "Glpi management"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+msgid "The attribute database is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+msgid "Glpi server"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+msgid "Glpi server service"
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+msgid "Admin"
+msgstr ""
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr ""
@@ -8960,6 +9860,39 @@ msgstr ""
 msgid "Can't remove glpi account, while mysql extension is missing."
 msgstr ""
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+msgid "Inventory extension"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+msgid "Attachment name"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+msgid "Attachment comment"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+msgid "Attachment mime type"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+msgid "Attachment filename"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+msgid "Peripheral devices"
+msgstr ""
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr ""
@@ -8996,6 +9929,7 @@ msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr ""
@@ -9127,6 +10061,7 @@ msgid "Add/Edit network interface"
 msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr ""
 
@@ -9451,6 +10386,26 @@ msgstr ""
 msgid "since"
 msgstr ""
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+msgid "Printer inventory extension"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+msgid "Supports serial interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+msgid "Supports parallel interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+msgid "Supports usb interface"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+msgid "Cartridge settings"
+msgstr ""
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -9519,6 +10474,18 @@ msgstr ""
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_termDNS.inc:511
+msgid "DNS settings"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:519
+msgid "DNS records"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:522
+msgid "IP address"
+msgstr ""
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
@@ -9552,18 +10519,10 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -9580,16 +10539,6 @@ msgstr ""
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr ""
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr ""
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr ""
@@ -9626,7 +10575,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:363
 msgid "Down"
 msgstr ""
 
@@ -9955,61 +10904,51 @@ msgstr ""
 msgid "All available services are already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-msgid "FAX service"
+#: plugins/admin/systems/class_goCupsServer.inc:76
+#, php-format
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:49
-msgid "FAX database configuration"
+#: plugins/admin/systems/class_goCupsServer.inc:100
+#, php-format
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
-#, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+#: plugins/admin/systems/class_goCupsServer.inc:206
+msgid "Cups"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
-#, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+#: plugins/admin/systems/class_goCupsServer.inc:207
+msgid "Cups service"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
-msgid "The attribute user is empty or contains invalid characters."
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+msgid "LDAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
+#: plugins/admin/systems/class_goTerminalServer.inc:79
 #, php-format
-msgid "The attribute password is empty or contains invalid characters."
+msgid "Removing server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
+#: plugins/admin/systems/class_goTerminalServer.inc:102
 #, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgid "Saving server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goLdapServer.tpl:1
-#: plugins/admin/systems/class_goLdapServer.inc:27
-msgid "LDAP service"
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystemService.inc:17
@@ -10089,31 +11028,89 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
-msgid "Inventory database"
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
-msgid "Glpi management"
+#: plugins/admin/systems/class_serverService.inc:8
+msgid "Start"
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_serverService.inc:9
+msgid "Restart"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
 #, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "The specified method '%s' can't executed for services."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goNtpServer.inc:27
+msgid "Time service"
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+msgid "NTP service"
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
 #, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Removing server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goNtpServer.inc:122
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Saving server services/goNtpServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
-msgid "The attribute database is empty or contains invalid characters."
+#: plugins/admin/systems/class_goNtpServer.inc:149
+#, php-format
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:219
+msgid "NTP"
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+msgid "Ntp source"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+msgid "The given base is empty or contains invalid characters."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+msgid "Ldap service"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+msgid "Ldap base"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:7
@@ -10133,6 +11130,7 @@ msgid "This value specifies the maximal header size."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 msgid "Max mailbox size"
 msgstr ""
 
@@ -10141,6 +11139,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 msgid "Max message size"
 msgstr ""
 
@@ -10149,6 +11148,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 msgid "Relay host"
 msgstr ""
 
@@ -10157,6 +11157,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr ""
 
@@ -10169,6 +11170,7 @@ msgid "Domains and routing"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -10189,6 +11191,7 @@ msgid "Restrictions"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 msgid "Restrictions for sender"
 msgstr ""
 
@@ -10198,6 +11201,7 @@ msgid "Restriction filter"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr ""
 
@@ -10210,135 +11214,35 @@ msgstr ""
 #: plugins/admin/systems/goImapServer.tpl:78
 msgid "The service must be saved before you can use the status flag."
 msgstr ""
-
-#: plugins/admin/systems/goMailServer.tpl:154
-#: plugins/admin/systems/goImapServer.tpl:81
-msgid "Set new status"
-msgstr ""
-
-#: plugins/admin/systems/goMailServer.tpl:160
-#: plugins/admin/systems/goImapServer.tpl:87
-msgid "Set status"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:8
-msgid "Start"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:9
-msgid "Restart"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:44
-msgid "Start IMAP service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:51
-msgid "Start IMAP SSL service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:58
-msgid "Start POP3 service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:65
-msgid "Start POP3 SSL service"
-msgstr ""
-
-#: plugins/admin/systems/class_goNtpServer.inc:27
-msgid "Time service"
-msgstr ""
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-msgid "NTP service"
-msgstr ""
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
+
+#: plugins/admin/systems/goMailServer.tpl:154
+#: plugins/admin/systems/goImapServer.tpl:81
+msgid "Set new status"
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+msgid "Set status"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
+msgid "Start IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
+msgid "Start IMAP SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
+msgid "Start POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:133
-msgid "The given base is empty or contains invalid characters."
+#: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
+msgid "Start POP3 SSL service"
 msgstr ""
 
 #: plugins/admin/systems/class_goSyslogServer.inc:26
@@ -10346,6 +11250,7 @@ msgid "Logging service"
 msgstr ""
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 msgid "Syslog service"
 msgstr ""
 
@@ -10364,9 +11269,8 @@ msgstr ""
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
-msgid "enabled"
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+msgid "Syslog"
 msgstr ""
 
 #: plugins/admin/systems/class_goFonServer.inc:32
@@ -10405,6 +11309,22 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr ""
 
+#: plugins/admin/systems/class_goFonServer.inc:224
+msgid "GoFon server"
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+msgid "GoFon server service"
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+msgid "Area code"
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+msgid "Country code"
+msgstr ""
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -10420,11 +11340,21 @@ msgstr ""
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
-msgid "GLPI database information"
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+msgid "Log"
+msgstr ""
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+msgid "Log service"
+msgstr ""
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+msgid "enabled"
 msgstr ""
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 msgid "Kerberos service"
 msgstr ""
 
@@ -10462,8 +11392,8 @@ msgstr ""
 msgid "The specified kerberos realm is empty."
 msgstr ""
 
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
+#: plugins/admin/systems/class_goKrbServer.inc:228
+msgid "Realm"
 msgstr ""
 
 #: plugins/admin/systems/class_goMailServer.inc:44
@@ -10501,6 +11431,22 @@ msgstr ""
 msgid "Please specify a numeric value for message size limit."
 msgstr ""
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+msgid "Mail service"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+msgid "Transport table"
+msgstr ""
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+msgid "GLPI database information"
+msgstr ""
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 msgid "IMAP/POP3 service"
 msgstr ""
@@ -10553,8 +11499,21 @@ msgstr ""
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
-msgid "Logging database information"
+#: plugins/admin/systems/class_goImapServer.inc:273
+msgid "Imap"
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+msgid "Imap service"
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr ""
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
 msgstr ""
 
 #: plugins/admin/systems/class_goShareServer.inc:31
@@ -10591,6 +11550,18 @@ msgstr ""
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_goShareServer.inc:449
+msgid "Share service"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+msgid "Share entry"
+msgstr ""
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+msgid "Logging database information"
+msgstr ""
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -10612,6 +11583,7 @@ msgid "Phone queue"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr ""
 
@@ -10628,6 +11600,10 @@ msgstr ""
 msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+msgid "System group"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr ""
@@ -10685,6 +11661,7 @@ msgid "Display objects of department"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr ""
@@ -10769,6 +11746,14 @@ msgstr ""
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_ogroup.inc:754
+msgid "Object group generic"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+msgid "Member"
+msgstr ""
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -10793,6 +11778,7 @@ msgid "Generic queue Settings"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr ""
 
@@ -10801,10 +11787,12 @@ msgid "Strategy"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:74
+#: plugins/admin/ogroups/class_phonequeue.inc:718
 msgid "Max queue length"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:82
+#: plugins/admin/ogroups/class_phonequeue.inc:719
 msgid "Announce frequency"
 msgstr ""
 
@@ -10821,6 +11809,7 @@ msgid "Use music on hold instead of ringing"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr ""
 
@@ -10869,26 +11858,32 @@ msgid "Phone attributes "
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -10920,6 +11915,10 @@ msgstr ""
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+msgid "Mail group"
+msgstr ""
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr ""
@@ -11047,6 +12046,54 @@ msgstr ""
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+msgid "Phone group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+msgid "Welcome music"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+msgid "'Thank you' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+msgid "'Minutes' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+msgid "'Seconds' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+msgid "'Less than' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+msgid "Queue phone number"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+msgid "Announce"
+msgstr ""
+
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
 msgid "List of object groups"
@@ -11200,8 +12247,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiHook.tpl:34
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
 msgid "Objects"
 msgstr ""
@@ -11223,12 +12270,43 @@ msgstr ""
 msgid "Creating of FAI/script with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+msgid "FAI script"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:460
+msgid "Script priority"
+msgstr ""
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, php-format
 msgid "Saving of FAI/template with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiTemplate.inc:415
+msgid "FAI template"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+msgid "Template file"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+msgid "Template path"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+msgid "File owner"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+msgid "File permissions"
+msgstr ""
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr ""
 
@@ -11265,6 +12343,15 @@ msgstr ""
 msgid "Specified freeze name is invalid."
 msgstr ""
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+msgid "FAI management"
+msgstr ""
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr ""
@@ -11277,7 +12364,7 @@ msgstr ""
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:669
 msgid "Configure"
 msgstr ""
 
@@ -11394,70 +12481,101 @@ msgstr ""
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+msgid "FAI Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+msgid "Install Method"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
+#: plugins/admin/fai/class_faiProfile.inc:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiProfile.inc:432
+msgid "Profile"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+msgid "FAI profile"
+msgstr ""
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
+#: plugins/admin/fai/class_faiHook.inc:474
+msgid "Hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:475
+msgid "FAI hook"
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
@@ -11473,6 +12591,7 @@ msgid "FS type"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr ""
@@ -11483,6 +12602,7 @@ msgid "Size in MB"
 msgstr ""
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr ""
@@ -11551,7 +12671,7 @@ msgstr ""
 msgid "Add partition"
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr ""
 
@@ -11564,6 +12684,7 @@ msgid "Variable attributes"
 msgstr ""
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr ""
 
@@ -11579,7 +12700,7 @@ msgstr ""
 msgid "Reload class and release configuration from parent object."
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr ""
 
@@ -11600,6 +12721,34 @@ msgstr ""
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+msgid "FAI partition table"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+msgid "Partition type"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+msgid "Partition no."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+msgid "File system type"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+msgid "Partition size"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+msgid "File system options"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+msgid "Partition flags"
+msgstr ""
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr ""
@@ -11617,10 +12766,6 @@ msgstr ""
 msgid "Hook attributes"
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr ""
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
@@ -11701,6 +12846,10 @@ msgstr ""
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/fai/class_faiVariable.inc:383
+msgid "FAI variable"
+msgstr ""
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr ""
@@ -11747,6 +12896,7 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
@@ -11809,10 +12959,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr ""
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12071,6 +13217,7 @@ msgid "Please enter a name for the mime type here"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 msgid "Mime group"
 msgstr ""
 
@@ -12079,7 +13226,7 @@ msgid "Categorize this mime type"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:34
-msgid "Please sepecify a description"
+msgid "Please specify a description"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:66
@@ -12091,6 +13238,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 msgid "File patterns"
 msgstr ""
 
@@ -12163,10 +13311,23 @@ msgstr ""
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr ""
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+msgid "Mime type generic"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Mime types"
 msgstr ""
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+msgid "Left click action"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+msgid "Embedded applications"
+msgstr ""
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 msgid "Manage mime types"
 msgstr ""
@@ -12182,7 +13343,7 @@ msgid "You are not allowed to delete this mime type!"
 msgstr ""
 
 #: plugins/admin/mimetypes/paste_generic.tpl:24
-msgid "Please sepecify a description for this mime type here"
+msgid "Please specify a description for this mime type here"
 msgstr ""
 
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:35
@@ -12354,6 +13515,31 @@ msgstr ""
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+msgid "Phone account settings"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+msgid "Delivery mode"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+msgid "Telephone pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voicemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+msgid "Telephone number"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+msgid "Macro settings"
+msgstr ""
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -12496,6 +13682,18 @@ msgstr ""
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+msgid "Asterisk macro management"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+msgid "Macro content"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 msgid "Argument"
 msgstr ""
@@ -12611,6 +13809,7 @@ msgid "Lifetime (in days)"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 msgid "Preset PIN"
 msgstr ""
 
@@ -12620,6 +13819,7 @@ msgid "PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 msgid "Record conference"
 msgstr ""
 
@@ -12628,6 +13828,7 @@ msgid "Sound file format"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
@@ -12644,13 +13845,10 @@ msgid "Count users"
 msgstr ""
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 msgid "Phone conferences"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr ""
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -12690,6 +13888,42 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+msgid "Phone conference management"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+msgid "Conference PIN"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+msgid "Activate menu"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+msgid "Count user"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+msgid "Conference type"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+msgid "Format"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr ""
@@ -12731,6 +13965,9 @@ msgid "Duration"
 msgstr ""
 
 #: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr ""
 
@@ -12884,74 +14121,74 @@ msgid ""
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:653
+#: include/functions.inc:655
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:655
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:672
+#: include/functions.inc:674
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1066 include/functions.inc:1256
+#: include/functions.inc:1068 include/functions.inc:1258
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1067
+#: include/functions.inc:1069
 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:1075
+#: include/functions.inc:1077
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1084
+#: include/functions.inc:1086
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1088 include/functions_setup.inc:254
+#: include/functions.inc:1090 include/functions_setup.inc:254
 msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1150
+#: include/functions.inc:1152
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1152
+#: include/functions.inc:1154
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1154
+#: include/functions.inc:1156
 #, 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:1438
+#: include/functions.inc:1440
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1466
+#: include/functions.inc:1468
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1740
+#: include/functions.inc:1742
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1783
+#: include/functions.inc:1785
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -13075,94 +14312,94 @@ msgstr ""
 msgid "Ldap import with dn '%s' failed."
 msgstr ""
 
-#: include/class_tabs.inc:182
+#: include/class_tabs.inc:183
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:297
+#: include/class_tabs.inc:298
 msgid "References"
 msgstr ""
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:414
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:597
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:631 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:665
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:971
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:978
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:992 include/class_plugin.inc:1021
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1008
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1069 include/class_plugin.inc:1115
+#: include/class_plugin.inc:1116
 #, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
-msgid "You are not allowed to delete this snap shot!"
+#: include/class_plugin.inc:1132 include/class_SnapShotDialog.inc:53
+msgid "You are not allowed to delete this snapshot!"
 msgstr ""
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1147
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1112
+#: include/class_plugin.inc:1159
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable(s) '%s' is "
 "not configured in your gosa.conf."
 msgstr ""
 
-#: include/class_plugin.inc:1144
+#: include/class_plugin.inc:1191
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1247
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1325
 #, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr ""
@@ -13171,18 +14408,22 @@ msgstr ""
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:53
+msgid "All objects in this category"
+msgstr ""
+
+#: include/class_pluglist.inc:131
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
+#: include/class_pluglist.inc:245
 msgid "Unknown"
 msgstr ""
 
-#: include/class_pluglist.inc:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -13251,7 +14492,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
@@ -13723,7 +14964,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -13820,12 +15061,12 @@ msgstr ""
 msgid "Can't paste"
 msgstr ""
 
-#: include/functions_FAI.inc:358
+#: include/functions_FAI.inc:362
 #, php-format
 msgid "Error, following objects should be equal '%s' and '%s'"
 msgstr ""
 
-#: include/functions_FAI.inc:464
+#: include/functions_FAI.inc:468
 #, php-format
 msgid "Release management failed, can't save '%s'"
 msgstr ""
@@ -13834,108 +15075,116 @@ msgstr ""
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:145
+msgid "All categories"
+msgstr ""
+
+#: include/class_acl.inc:153
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:154
 msgid "One level"
 msgstr ""
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:155 include/class_acl.inc:160
 msgid "Current object"
 msgstr ""
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:156
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:157
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:161
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:364
 msgid "Edit ACL"
 msgstr ""
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:365
 msgid "Delete ACL"
 msgstr ""
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:402
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:404
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:409
 msgid "Edit categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:410
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:449
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:459
+msgid "All objects in current subtree"
+msgstr ""
+
+#: include/class_acl.inc:495
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:496
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:497
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:499 include/class_acl.inc:505
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:502
 msgid "Move object"
 msgstr ""
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:503
 msgid "Remove object"
 msgstr ""
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:602
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:642
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:703
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:711
 msgid "Members:"
 msgstr ""
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:717
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:825
 #, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr ""
@@ -14028,52 +15277,52 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:134
+#: html/index.php:142
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:293
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -14352,10 +15601,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr ""
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "