X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=locale%2Fmessages.po;h=601da162b9031e6ee10bffe139f9edb34265deb3;hb=77a475f344ccaa00dd1df757b25847393be4da97;hp=467b1112aefbccda2b64ddbd1dad081a9e9cae1c;hpb=4b4946181d668f524f67aa1141b5bc9d7466f90b;p=gosa.git

diff --git a/locale/messages.po b/locale/messages.po
index 467b1112a..601da162b 100644
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_terminalService.inc:448
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1368 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-09-12 13:45+0200\n"
+"POT-Creation-Date: 2007-02-20 12:33+0100\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"
@@ -20,7 +18,24 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1331
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1019
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1326
+#: plugins/personal/samba/class_sambaAccount.inc:1072
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
 msgid "My account"
 msgstr ""
 
@@ -28,54 +43,54 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:61
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:678
 msgid "Addons"
 msgstr ""
 
 #: contrib/gosa.conf:80 contrib/gosa.conf:93 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:114
-#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
-#: contrib/gosa.conf:144 contrib/gosa.conf:148 contrib/gosa.conf:170
-#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:182
+#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:113
+#: contrib/gosa.conf:118 contrib/gosa.conf:126 contrib/gosa.conf:134
+#: contrib/gosa.conf:143 contrib/gosa.conf:147 contrib/gosa.conf:169
+#: contrib/gosa.conf:173 contrib/gosa.conf:177 contrib/gosa.conf:181
 #: 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:1326
+#: plugins/personal/generic/class_user.inc:1375
 #: 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/groups/class_groupGeneric.inc:896
-#: plugins/admin/applications/class_applicationGeneric.inc:507
-#: plugins/admin/departments/class_departmentGeneric.inc:539
-#: 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:802
-#: 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/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:578
+#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/class_servGeneric.inc:362
+#: plugins/admin/systems/class_workstationGeneric.inc:524
+#: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:872
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
 #: 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/ogroups/class_ogroup.inc:754
+#: plugins/admin/ogroups/class_ogroup.inc:695
 #: 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
+#: plugins/admin/fai/faiProfile.tpl:36
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
 #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:465
+#: plugins/gofon/macro/class_gofonMacro.inc:532
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
@@ -86,140 +101,139 @@ msgstr ""
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/personal/environment/class_environment.inc:1233
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/personal/environment/class_environment.inc:1269
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
 msgid "Environment"
 msgstr ""
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/personal/mail/class_mailAccount.inc:998
-#: plugins/admin/groups/class_groupMail.inc:1028
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:187
-#: plugins/admin/systems/class_goMailServer.inc:779
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/class_mailogroup.inc:163
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/personal/mail/class_mailAccount.inc:1014
+#: plugins/admin/groups/class_groupMail.inc:1088
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:81
+#: plugins/admin/ogroups/tabs_ogroups.inc:192
+#: plugins/admin/ogroups/paste_mail.tpl:4
+#: plugins/admin/ogroups/class_mailogroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
 #: 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:1026
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr ""
 
 #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
-#: plugins/personal/netatalk/class_netatalk.inc:337
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/personal/netatalk/class_netatalk.inc:355
+#: plugins/admin/users/class_divListUsers.inc:187
 msgid "Netatalk"
 msgstr ""
 
-#: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:119
+#: contrib/gosa.conf:86
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:717
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:721
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:725
+#: plugins/personal/connectivity/main.inc:119
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr ""
 
 #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
 #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
 #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:799
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/departments/generic.tpl:92
-#: plugins/admin/departments/class_departmentGeneric.inc:558
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/departments/generic.tpl:91
+#: plugins/admin/departments/class_departmentGeneric.inc:597
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Fax"
 msgstr ""
 
 #: 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
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:189
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/systems/class_systemManagement.inc:774
+#: plugins/addons/addressbook/address_edit.tpl:94
+#: plugins/addons/addressbook/address_edit.tpl:221
+#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_info.tpl:163
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/departments/generic.tpl:83
+#: plugins/admin/systems/class_systemManagement.inc:1034
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:383
-#: plugins/admin/ogroups/class_phonequeue.inc:718
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
+#: plugins/admin/ogroups/class_phonequeue.inc:906
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1450
 #: 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:252
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1102
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1165
 #: plugins/admin/applications/class_applicationManagement.inc:25
-#: plugins/admin/mimetypes/generic.tpl:111
-#: plugins/admin/mimetypes/generic.tpl:164
+#: plugins/admin/mimetypes/generic.tpl:112
+#: plugins/admin/mimetypes/generic.tpl:165
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:101 include/class_tabs.inc:298
-msgid "ACL"
-msgstr ""
-
-#: contrib/gosa.conf:106 plugins/admin/applications/generic.tpl:87
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:246
-#: plugins/admin/ogroups/phonequeue.tpl:43
-#: plugins/gofon/conference/generic.tpl:92
+#: plugins/admin/systems/class_servRepository.inc:254
+#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/gofon/conference/generic.tpl:130
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:115
-#: plugins/admin/applications/class_applicationParameters.inc:230
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:657
+#: contrib/gosa.conf:114
+#: plugins/admin/applications/class_applicationParameters.inc:232
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:868
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
-#: plugins/admin/systems/class_terminalStartup.inc:441
-#: plugins/admin/systems/class_workstationStartup.inc:1100
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
+#: plugins/admin/systems/class_terminalStartup.inc:446
+#: plugins/admin/systems/class_workstationStartup.inc:1159
+#: plugins/admin/ogroups/tabs_ogroups.inc:102
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:121 contrib/gosa.conf:137
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: contrib/gosa.conf:120 contrib/gosa.conf:136
+#: plugins/admin/ogroups/tabs_ogroups.inc:105
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:122 contrib/gosa.conf:138
-#: plugins/personal/environment/environment.tpl:228
-#: plugins/admin/systems/class_systemManagement.inc:783
-#: plugins/admin/systems/class_printGeneric.inc:808
-#: plugins/admin/ogroups/class_ogroupManagement.inc:386
+#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: plugins/personal/environment/environment.tpl:235
+#: plugins/admin/systems/class_systemManagement.inc:1043
+#: plugins/admin/systems/class_printGeneric.inc:878
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:123 contrib/gosa.conf:131 contrib/gosa.conf:139
-#: plugins/gofax/blocklists/generic.tpl:75
+#: contrib/gosa.conf:122 contrib/gosa.conf:130 contrib/gosa.conf:138
+#: plugins/gofax/blocklists/generic.tpl:90
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/addons/godfs/contents.tpl:22
-#: plugins/admin/systems/glpiPrinter.tpl:104
-#: plugins/admin/systems/servRepository.tpl:24
+#: plugins/admin/systems/glpiPrinter.tpl:127
+#: plugins/admin/systems/servRepository.tpl:26
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
@@ -228,24 +242,42 @@ msgstr ""
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:129 plugins/admin/systems/servkolab.tpl:26
+#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_goFaxServer.inc:85
+#: plugins/admin/systems/class_servKolab.inc:375
+#: plugins/admin/systems/class_servRepository.inc:366
+#: plugins/admin/systems/class_goGlpiServer.inc:84
+#: plugins/admin/systems/class_goCupsServer.inc:64
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/class_goNtpServer.inc:107
+#: plugins/admin/systems/class_goLdapServer.inc:79
+#: plugins/admin/systems/class_goSyslogServer.inc:64
+#: plugins/admin/systems/class_goFonServer.inc:125
+#: plugins/admin/systems/class_goLogDBServer.inc:84
+#: plugins/admin/systems/class_goKrbServer.inc:88
+#: plugins/admin/systems/class_goMailServer.inc:686
+#: plugins/admin/systems/class_goImapServer.inc:155
+#: plugins/admin/systems/class_goShareServer.inc:362
+#: plugins/admin/systems/class_goVirusServer.inc:212
+#: plugins/admin/systems/class_goSpamServer.inc:320
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:140
+#: contrib/gosa.conf:129 contrib/gosa.conf:139
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:193
+#: contrib/gosa.conf:192
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:204 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:203 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -254,116 +286,117 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:205
+#: contrib/gosa.conf:204
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
+#: contrib/gosa.conf:205 plugins/personal/mail/generic.tpl:141
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
 #: plugins/addons/ldapmanager/contentimport.tpl:50
-#: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:130
+#: plugins/addons/notifications/contents.tpl:54
+#: plugins/admin/applications/generic.tpl:135
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:206
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:211
+#: contrib/gosa.conf:210
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:125
-#: plugins/admin/fai/class_faiScript.inc:480
-#: plugins/admin/fai/faiScriptEntry.tpl:50
-#: plugins/admin/fai/faiHookEntry.tpl:50
+#: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:530
+#: plugins/admin/fai/faiScriptEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:56
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:219 plugins/admin/fai/class_faiSummaryTab.inc:40
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:223 plugins/admin/fai/class_faiSummaryTab.inc:41
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:227 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:232 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:109
 #: plugins/admin/acl/class_divListACL.inc:49
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:554
+#: contrib/gosa.conf:235 plugins/admin/fai/class_faiPackage.inc:533
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:258
+#: contrib/gosa.conf:257
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:277 plugins/admin/ogroups/class_phonequeue.inc:180
+#: contrib/gosa.conf:278 plugins/admin/ogroups/class_phonequeue.inc:263
+#: setup/class_setupStep1.inc:40
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:279 setup/class_setupStep1.inc:43
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:280
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:281 setup/class_setupStep1.inc:41
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:281
+#: contrib/gosa.conf:282
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:282
+#: contrib/gosa.conf:283 setup/class_setupStep1.inc:42
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:283
+#: contrib/gosa.conf:284
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:284
+#: contrib/gosa.conf:285
 msgid "Polish"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/personal/mail/mail_locals.tpl:7
 #: plugins/admin/groups/mail_locals.tpl:6
 msgid "Select addresses to add"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/mail/mail_locals.tpl:25
 #: plugins/personal/posix/posix_groups.tpl:21
 #: plugins/personal/samba/samba3_workstations.tpl:20
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/addressbook/contents.tpl:65
 #: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/groups/group_objects.tpl:20
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/servRepository.tpl:38
 #: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/glpiSelectUser.tpl:27
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
@@ -373,44 +406,48 @@ msgstr ""
 #: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
 msgid "Filters"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/mail/mail_locals.tpl:35
+msgid "Select department"
+msgstr ""
+
+#: plugins/personal/mail/mail_locals.tpl:38
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/addons/addressbook/contents.tpl:87
 #: plugins/admin/groups/mail_locals.tpl:33
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Choose the department the search will be based on"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/mail/mail_locals.tpl:52
 #: plugins/personal/posix/trust_machines.tpl:31
 #: plugins/personal/samba/samba3_workstations.tpl:31
 #: plugins/admin/groups/mail_locals.tpl:45
 msgid "Regular expression for matching addresses"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/personal/mail/mail_locals.tpl:60
 #: plugins/admin/groups/mail_locals.tpl:52
 msgid "Display addresses of user"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/personal/mail/mail_locals.tpl:64
 #: plugins/admin/groups/mail_locals.tpl:55
 msgid "User name of which addresses are shown"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
+#: plugins/personal/mail/mail_locals.tpl:75
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:160
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
 #: plugins/personal/posix/generic.tpl:88
@@ -418,128 +455,133 @@ msgstr ""
 #: 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:407
+#: plugins/personal/samba/samba3.tpl:412
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:53
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#: plugins/personal/environment/environment.tpl:150
-#: plugins/personal/environment/environment.tpl:174
-#: plugins/personal/environment/environment.tpl:241
+#: plugins/personal/connectivity/class_kolabAccount.inc:255
+#: plugins/personal/environment/environment.tpl:157
+#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:248
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/gofax/blocklists/generic.tpl:68
+#: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/generic.tpl:105
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:71
 #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/generic.tpl:137
 #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:573
+#: plugins/admin/groups/class_groupMail.inc:599
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:78
-#: plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/goNtpServer.tpl:13
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
-#: plugins/admin/systems/glpi.tpl:100
-#: plugins/admin/systems/phonesettings.tpl:178
-#: plugins/admin/systems/phonesettings.tpl:193
+#: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
+#: plugins/admin/systems/workstation.tpl:94
+#: plugins/admin/systems/glpiPrinter.tpl:115
+#: plugins/admin/systems/glpiPrinter.tpl:149
+#: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
+#: plugins/admin/systems/phonesettings.tpl:207
+#: plugins/admin/systems/phonesettings.tpl:230
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
-#: plugins/admin/systems/terminalStartup.tpl:61
-#: plugins/admin/systems/terminalStartup.tpl:80
-#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
+#: plugins/admin/systems/terminalStartup.tpl:79
+#: plugins/admin/systems/terminalStartup.tpl:108
+#: plugins/admin/systems/servRepositorySetup.tpl:47
 #: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
 #: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:460
-#: plugins/admin/systems/class_termDNS.inc:480
+#: plugins/admin/systems/class_termDNS.inc:501
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: 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/goSpamServer.tpl:36
-#: plugins/admin/systems/goSpamServer.tpl:88
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
+#: plugins/admin/systems/goShareServer.tpl:14
+#: plugins/admin/systems/goMailServer.tpl:70
+#: plugins/admin/systems/goMailServer.tpl:101
+#: plugins/admin/systems/goMailServer.tpl:131
+#: plugins/admin/systems/goMailServer.tpl:165
+#: plugins/admin/systems/goMailServer.tpl:191
+#: plugins/admin/systems/goSpamServer.tpl:45
+#: plugins/admin/systems/goSpamServer.tpl:113
 #: plugins/admin/ogroups/termgroup.tpl:28 plugins/admin/ogroups/generic.tpl:51
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/phonequeue.tpl:33
-#: 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:43
-#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:43
-#: plugins/admin/mimetypes/generic.tpl:107
-#: plugins/admin/mimetypes/generic.tpl:119
-#: plugins/admin/mimetypes/generic.tpl:173
+#: plugins/admin/ogroups/ogroup_objects.tpl:54
+#: plugins/admin/ogroups/phonequeue.tpl:37
+#: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
+#: plugins/admin/fai/faiPackage.tpl:78
+#: plugins/admin/fai/faiPartitionTable.tpl:48
+#: plugins/admin/fai/faiPartitionTable.tpl:50
+#: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
+#: plugins/admin/fai/faiScript.tpl:50 plugins/admin/fai/faiTemplate.tpl:40
+#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:48
+#: plugins/admin/fai/faiHook.tpl:50 plugins/admin/mimetypes/generic.tpl:108
+#: plugins/admin/mimetypes/generic.tpl:120
+#: plugins/admin/mimetypes/generic.tpl:174
 #: plugins/gofon/phoneaccount/generic.tpl:19
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:97
+#: plugins/personal/mail/mail_locals.tpl:77 plugins/personal/mail/main.inc:105
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:97
+#: plugins/personal/posix/main.inc:107 plugins/personal/samba/main.inc:105
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:151
+#: plugins/personal/generic/main.inc:158
 #: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:103
-#: plugins/personal/environment/main.inc:97
+#: plugins/personal/environment/main.inc:103
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:54
-#: plugins/personal/nagios/main.inc:97 plugins/personal/netatalk/main.inc:97
-#: plugins/gofax/blocklists/generic.tpl:91
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:97
+#: plugins/gofax/blocklists/generic.tpl:106
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:83
+#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:95
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/addressbook/address_edit.tpl:265
 #: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:332
+#: plugins/admin/groups/class_groupManagement.inc:335
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:657
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:352
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:494
+#: plugins/admin/departments/class_departmentManagement.inc:319
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:684
 #: 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/chooser.tpl:18
-#: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
+#: plugins/admin/systems/goFaxServer.tpl:25
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/servRepository.tpl:66
+#: plugins/admin/systems/servRepositorySetup.tpl:56
+#: plugins/admin/systems/servRepository.tpl:68
 #: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFonServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
@@ -552,49 +594,49 @@ msgstr ""
 #: plugins/admin/systems/SelectDeviceType.tpl:45
 #: plugins/admin/systems/class_baseSelectDialog.inc:43
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goKrbServer.tpl:21
-#: plugins/admin/systems/goLdapServer.tpl:9
-#: 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
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:19
-#: plugins/admin/systems/goFaxServer.tpl:18
-#: plugins/admin/systems/goLogDBServer.tpl:18
-#: plugins/admin/systems/goSpamServer.tpl:103
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:146
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:334
-#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:591
-#: plugins/admin/fai/class_faiManagement.inc:596
-#: plugins/admin/fai/class_faiManagement.inc:602
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
+#: plugins/admin/systems/class_goService.inc:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:56
+#: plugins/admin/ogroups/class_ogroupManagement.inc:301
+#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/tabs_acl.inc:63
+#: plugins/admin/acl/remove.tpl:16 plugins/admin/acl/tabs_acl_role.inc:53
+#: plugins/admin/acl/acl_role.tpl:61 plugins/admin/acl/acl_role.tpl:75
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
-#: plugins/admin/fai/faiScriptEntry.tpl:69
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/fai/faiScriptEntry.tpl:83
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:40
+#: plugins/admin/fai/faiVariableEntry.tpl:55
+#: plugins/admin/fai/faiHookEntry.tpl:85
+#: plugins/admin/fai/faiTemplateEntry.tpl:171
 #: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiPackageNew.tpl:51
-#: plugins/admin/fai/faiNewBranch.tpl:20
+#: plugins/admin/fai/faiNewBranch.tpl:22
 #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/admin/mimetypes/remove.tpl:15
-#: plugins/gofon/phoneaccount/main.inc:98
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
+#: plugins/gofon/phoneaccount/main.inc:107
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
 #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:15
-#: ihtml/themes/default/snapshotdialog.tpl:39
-#: ihtml/themes/default/snapshotdialog.tpl:82
+#: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:77
+#: ihtml/themes/default/acl.tpl:91 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89 setup/setup_step4.tpl:59
 msgid "Cancel"
 msgstr ""
 
@@ -606,12 +648,13 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:15
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:321
-#: plugins/admin/systems/class_systemManagement.inc:775
-#: plugins/admin/systems/servnfs.tpl:33
+#: plugins/admin/systems/class_servGeneric.inc:368
+#: plugins/admin/systems/class_systemManagement.inc:1035
+#: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:382
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
+#: plugins/generic/references/class_reference.inc:44 setup/setup_step6.tpl:193
+#: setup/setup_step6.tpl:215
 msgid "Server"
 msgstr ""
 
@@ -625,14 +668,14 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:482
+#: plugins/admin/systems/class_printGeneric.inc:517
 msgid "not defined"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1010
+#: plugins/personal/mail/class_mailAccount.inc:1026
 #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1039
+#: plugins/admin/groups/class_groupMail.inc:1099
 msgid "Quota size"
 msgstr ""
 
@@ -643,24 +686,24 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/copypaste.tpl:55
 #: plugins/admin/groups/mail.tpl:58 plugins/admin/groups/paste_mail.tpl:24
-#: plugins/admin/systems/phonesettings.tpl:172
-#: plugins/admin/systems/phonesettings.tpl:187
+#: plugins/admin/systems/phonesettings.tpl:197
+#: plugins/admin/systems/phonesettings.tpl:220
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:166
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:91
 #: plugins/personal/posix/generic.tpl:129
 #: plugins/personal/posix/paste_generic.tpl:62
-#: plugins/personal/samba/samba3.tpl:410
+#: plugins/personal/samba/samba3.tpl:415
 #: 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:651
-#: plugins/gofax/blocklists/generic.tpl:69
+#: plugins/personal/environment/environment.tpl:187
+#: plugins/personal/environment/environment.tpl:225
+#: plugins/personal/environment/environment.tpl:251
+#: plugins/personal/environment/class_environment.inc:685
+#: plugins/gofax/blocklists/generic.tpl:83
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:111
 #: plugins/gofax/faxaccount/lists.tpl:14
@@ -670,33 +713,33 @@ msgstr ""
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
-#: 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/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
+#: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
+#: plugins/admin/systems/workstation.tpl:98
 #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/phonesettings.tpl:179
-#: plugins/admin/systems/phonesettings.tpl:194
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
-#: plugins/admin/systems/terminalStartup.tpl:62
+#: plugins/admin/systems/phonesettings.tpl:210
+#: plugins/admin/systems/phonesettings.tpl:233
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
+#: plugins/admin/systems/terminalStartup.tpl:82
 #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
 #: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:474
+#: plugins/admin/systems/class_termDNS.inc:515
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:292
 #: plugins/admin/systems/class_servDNSeditZone.inc:480
-#: plugins/admin/systems/goShareServer.tpl:12
+#: plugins/admin/systems/goShareServer.tpl:20
 #: plugins/admin/ogroups/termgroup.tpl:33 plugins/admin/ogroups/generic.tpl:54
-#: plugins/admin/ogroups/phonequeue.tpl:36 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:46
-#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/ogroups/phonequeue.tpl:40 plugins/admin/ogroups/remove.tpl:14
+#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:55
+#: plugins/admin/fai/faiVariable.tpl:57 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiPartitionTable.tpl:54
 #: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/admin/mimetypes/remove.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:22
@@ -710,152 +753,153 @@ msgstr ""
 msgid "Mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid "Activate vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:99
+#: plugins/personal/mail/generic.tpl:97
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:101
+#: plugins/personal/mail/generic.tpl:99
 msgid "Move mails tagged with spam level greater than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:104
+#: plugins/personal/mail/generic.tpl:102
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:108
+#: plugins/personal/mail/generic.tpl:106
 msgid "to folder"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:117
 msgid "Reject mails bigger than"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/mail/generic.tpl:119
 #: plugins/personal/connectivity/pureftpd.tpl:60
-#: plugins/personal/connectivity/class_proxyAccount.inc:83
-#: plugins/personal/environment/environment.tpl:55
+#: plugins/personal/connectivity/class_proxyAccount.inc:92
+#: plugins/personal/environment/environment.tpl:62
 #: plugins/admin/groups/mail.tpl:48
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:129
-#: plugins/personal/mail/class_mailAccount.inc:1013
+#: plugins/personal/mail/generic.tpl:126
+#: plugins/personal/mail/class_mailAccount.inc:1029
 msgid "Vacation message"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:147
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/generic.tpl:163
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:108 plugins/admin/groups/mail.tpl:138
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:178
+#: plugins/personal/mail/generic.tpl:174
 msgid "Advanced mail options"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:184
+#: plugins/personal/mail/generic.tpl:180
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:186
+#: plugins/personal/mail/generic.tpl:182
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:195
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/generic.tpl:190
+#: plugins/personal/mail/class_mailAccount.inc:1044
 msgid "Use custom sieve script"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/generic.tpl:190
 msgid "disables all Mail options!"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:95 plugins/personal/posix/main.inc:100
-#: plugins/personal/samba/main.inc:95 plugins/personal/generic/main.inc:149
+#: plugins/personal/mail/main.inc:103 plugins/personal/posix/main.inc:105
+#: plugins/personal/samba/main.inc:103 plugins/personal/generic/main.inc:156
 #: plugins/personal/connectivity/main.inc:101
-#: plugins/personal/environment/main.inc:95
-#: plugins/personal/nagios/main.inc:95 plugins/personal/netatalk/main.inc:95
-#: plugins/gofax/blocklists/generic.tpl:85
-#: plugins/gofax/faxaccount/main.inc:81
-#: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/personal/environment/main.inc:101
+#: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:95
+#: plugins/gofax/blocklists/generic.tpl:100
+#: plugins/gofax/faxaccount/main.inc:93
+#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/users/class_userManagement.inc:651
 #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:488
-#: plugins/admin/ogroups/class_ogroupManagement.inc:328
-#: plugins/admin/fai/class_faiManagement.inc:585
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
-#: plugins/gofon/phoneaccount/main.inc:96
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+#: plugins/admin/systems/class_systemManagement.inc:678
+#: plugins/admin/ogroups/class_ogroupManagement.inc:295
+#: plugins/admin/acl/tabs_acl.inc:61 plugins/admin/acl/tabs_acl_role.inc:51
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
+#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
 msgid "Ok"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:105 plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/main.inc:107 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:113 plugins/personal/posix/main.inc:117
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:111
-#: plugins/personal/environment/main.inc:105
-#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:102
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/personal/environment/main.inc:111
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:102
+#: plugins/gofax/faxaccount/main.inc:101
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/posix/main.inc:114
-#: plugins/personal/samba/main.inc:108 plugins/personal/generic/main.inc:162
+#: plugins/personal/mail/main.inc:116 plugins/personal/posix/main.inc:119
+#: plugins/personal/samba/main.inc:116 plugins/personal/generic/main.inc:169
 #: plugins/personal/connectivity/main.inc:112
-#: plugins/personal/environment/environment.tpl:177
-#: plugins/personal/environment/main.inc:106
-#: plugins/personal/nagios/main.inc:107 plugins/personal/netatalk/main.inc:103
+#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/main.inc:112
+#: plugins/personal/nagios/main.inc:116 plugins/personal/netatalk/main.inc:103
 #: plugins/gofax/faxaccount/generic.tpl:121
 #: plugins/gofax/faxaccount/generic.tpl:129
-#: plugins/gofax/faxaccount/main.inc:90 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:52 plugins/admin/systems/servdns.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:73
-#: plugins/admin/systems/glpiPrinter.tpl:82 plugins/admin/systems/glpi.tpl:48
-#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
+#: plugins/gofax/faxaccount/main.inc:102
+#: plugins/addons/logview/contents.tpl:62 plugins/admin/systems/printer.tpl:68
+#: plugins/admin/systems/glpiPrinter.tpl:88
+#: plugins/admin/systems/glpiPrinter.tpl:99
+#: plugins/admin/systems/servdns.tpl:7 plugins/admin/systems/glpi.tpl:61
+#: plugins/admin/systems/glpi.tpl:71 plugins/admin/systems/glpi.tpl:106
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
 #: plugins/admin/systems/servdnseditzone.tpl:31
-#: plugins/admin/systems/goShareServer.tpl:11
-#: plugins/admin/fai/faiVariable.tpl:45
-#: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/admin/systems/goShareServer.tpl:17
+#: plugins/admin/fai/faiVariable.tpl:53
+#: plugins/admin/fai/faiPartitionTable.tpl:53
+#: plugins/gofon/phoneaccount/main.inc:114
 msgid "Edit"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:114
+#: plugins/personal/mail/main.inc:125
 msgid "User mail settings"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:999
-#: plugins/admin/groups/paste_mail.tpl:1
+#: plugins/personal/mail/class_mailAccount.inc:1015
+#: plugins/admin/groups/paste_mail.tpl:1 setup/setup_step5.tpl:162
 msgid "Mail settings"
 msgstr ""
 
@@ -896,7 +940,8 @@ msgstr ""
 #: plugins/admin/departments/class_departmentManagement.inc:26
 #: plugins/admin/systems/class_systemManagement.inc:33
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:26
+#: plugins/admin/acl/class_aclManagement.inc:28
+#: plugins/admin/acl/class_aclRole.inc:7
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 #: plugins/gofon/fonreports/class_fonreport.inc:7 include/class_acl.inc:7
@@ -904,7 +949,7 @@ msgid "This does something"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:90
-#: plugins/admin/groups/class_groupMail.inc:75
+#: plugins/admin/groups/class_groupMail.inc:79
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr ""
@@ -919,7 +964,7 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:262
 #: plugins/personal/mail/class_mailAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:332
+#: plugins/admin/groups/class_groupMail.inc:339
 #: plugins/admin/ogroups/class_mailogroup.inc:44
 msgid "Remove mail account"
 msgstr ""
@@ -931,20 +976,20 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:333
+#: plugins/admin/groups/class_groupMail.inc:340
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:335
+#: plugins/admin/groups/class_groupMail.inc:342
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Create mail account"
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:343
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -956,219 +1001,214 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:327
-#: plugins/admin/groups/class_groupMail.inc:400
+#: plugins/admin/groups/class_groupMail.inc:419
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:357
 #: plugins/personal/mail/class_mailAccount.inc:362
-#: plugins/admin/groups/class_groupMail.inc:426
+#: plugins/admin/groups/class_groupMail.inc:445
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:372
-#: plugins/admin/groups/class_groupMail.inc:431
+#: plugins/admin/groups/class_groupMail.inc:450
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:597
+#: plugins/personal/mail/class_mailAccount.inc:603
 #, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/personal/mail/class_mailAccount.inc:731
 #, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:777
+#: plugins/personal/mail/class_mailAccount.inc:783
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:782
-#: plugins/admin/groups/class_groupMail.inc:851
+#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/admin/groups/class_groupMail.inc:902
 msgid "The required field 'Primary address' is not set."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:786
-#: plugins/personal/mail/class_mailAccount.inc:790
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/personal/mail/class_mailAccount.inc:792
+#: plugins/personal/mail/class_mailAccount.inc:796
+#: plugins/addons/addressbook/class_addressbook.inc:696
 #: plugins/admin/ogroups/class_mailogroup.inc:79
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:796
-#: plugins/admin/groups/class_groupMail.inc:860
+#: plugins/personal/mail/class_mailAccount.inc:802
+#: plugins/admin/groups/class_groupMail.inc:911
 #: plugins/admin/ogroups/class_mailogroup.inc:86
 msgid "The primary address you've entered is already in use."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:802
-#: plugins/admin/groups/class_groupMail.inc:866
+#: plugins/personal/mail/class_mailAccount.inc:808
+#: plugins/admin/groups/class_groupMail.inc:917
 msgid "Value in 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:811
-#: plugins/admin/groups/class_groupMail.inc:875
+#: plugins/personal/mail/class_mailAccount.inc:817
+#: plugins/admin/groups/class_groupMail.inc:926
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:821
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/personal/mail/class_mailAccount.inc:827
+#: plugins/admin/groups/class_groupMail.inc:934
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:825
+#: plugins/personal/mail/class_mailAccount.inc:831
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:865
-#: plugins/personal/mail/class_mailAccount.inc:877
+#: plugins/personal/mail/class_mailAccount.inc:871
+#: plugins/personal/mail/class_mailAccount.inc:883
 msgid "You are not allowed to write mail forwarding."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:909
-#: plugins/personal/mail/class_mailAccount.inc:920
+#: plugins/personal/mail/class_mailAccount.inc:916
+#: plugins/personal/mail/class_mailAccount.inc:927
 msgid "You are not allowed to write mail alternate address."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:992
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:994
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1008
+#: plugins/personal/mail/class_mailAccount.inc:1024
 #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:1036
-#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1096
+#: plugins/admin/systems/class_servDNS.inc:401
 #: plugins/admin/systems/servdnseditzone.tpl:51
-#: plugins/admin/ogroups/class_mailogroup.inc:171 html/getxls.php:174
+#: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
 msgid "Mail address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1009
-#: plugins/admin/groups/class_groupMail.inc:1040
-#: plugins/admin/systems/servservice.tpl:107
+#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/admin/groups/class_groupMail.inc:1100
 msgid "Mail server"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1012
+#: plugins/personal/mail/class_mailAccount.inc:1028
 msgid "Add vacation information"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1015
+#: plugins/personal/mail/class_mailAccount.inc:1031
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1032
 msgid "Spam level"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1017
+#: plugins/personal/mail/class_mailAccount.inc:1033
 msgid "Spam mail box"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1019
+#: plugins/personal/mail/class_mailAccount.inc:1035
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1036
 msgid "Mail max size"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1022
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1038
+#: plugins/personal/mail/class_mailAccount.inc:1043
 msgid "Forwarding address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1039
 msgid "Local delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1024
-msgid "Only insider delivery"
+#: plugins/personal/mail/class_mailAccount.inc:1040
+msgid "No delivery to own mailbox "
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1041
 msgid "Mail alternative addresses"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_divListUsers.inc:255
-msgid "Change password"
-msgstr ""
-
-#: plugins/personal/password/password.tpl:6
+#: plugins/personal/password/password.tpl:3
 msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
 msgstr ""
 
-#: plugins/personal/password/password.tpl:11
+#: plugins/personal/password/password.tpl:8
 #: plugins/personal/password/main.inc:73
 msgid "You have no permissions to change your password."
 msgstr ""
 
-#: plugins/personal/password/password.tpl:13
+#: plugins/personal/password/password.tpl:10
 #: plugins/admin/users/password.tpl:6
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
 msgstr ""
 
-#: plugins/personal/password/password.tpl:19
+#: plugins/personal/password/password.tpl:16
 msgid "Current password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:27
+#: plugins/personal/password/password.tpl:24
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
 #: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:35
+#: plugins/personal/password/password.tpl:32
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:48
+#: plugins/personal/password/password.tpl:45
 #: plugins/personal/generic/password.tpl:17
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl:52
+#: plugins/personal/password/password.tpl:49
 msgid "Clear fields"
 msgstr ""
 
-#: plugins/personal/password/changed.tpl:6
+#: plugins/personal/password/changed.tpl:2
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
 msgstr ""
 
-#: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:159
+#: plugins/personal/password/changed.tpl:8
+#: plugins/personal/generic/main.inc:166
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentimport.tpl:45
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: 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:1529
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:52 include/functions.inc:1422
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1178,29 +1218,27 @@ msgid "Back"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/personal/generic/paste_generic.tpl:32
-#: 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:193
-#: 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
-#: ihtml/themes/default/login.tpl:41
-#: ihtml/themes/default/setup_useradmin.tpl:30
+#: plugins/personal/generic/paste_generic.tpl:20
+#: plugins/admin/systems/class_goFaxServer.inc:94
+#: plugins/admin/systems/goKrbServer.tpl:20
+#: plugins/admin/systems/goFonServer.tpl:12
+#: plugins/admin/systems/goFaxServer.tpl:12
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:316
+#: plugins/admin/systems/goImapServer.tpl:34
+#: plugins/admin/systems/class_goFonServer.inc:138
+#: plugins/admin/systems/class_goLogDBServer.inc:96
+#: plugins/admin/systems/class_goKrbServer.inc:98
+#: plugins/admin/systems/goGlpiServer.tpl:12
+#: plugins/admin/systems/goLogDBServer.tpl:12
+#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30 setup/setup_step6.tpl:203
+#: setup/setup_step6.tpl:225
 msgid "Password"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1386
 msgid "User password"
 msgstr ""
 
@@ -1222,15 +1260,15 @@ msgstr ""
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/password/main.inc:52 plugins/personal/generic/main.inc:76
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/personal/password/main.inc:52 plugins/personal/generic/main.inc:79
+#: plugins/admin/users/class_userManagement.inc:222
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: plugins/personal/password/main.inc:55 plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:224
+#: plugins/personal/password/main.inc:55 plugins/personal/generic/main.inc:84
+#: plugins/admin/users/class_userManagement.inc:227
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1242,20 +1280,25 @@ msgstr ""
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/password/main.inc:91
+#: plugins/personal/password/main.inc:93
 msgid "External password changer reported a problem: "
 msgstr ""
 
+#: plugins/personal/password/main.inc:122
+#: plugins/admin/users/class_divListUsers.inc:226
+msgid "Change password"
+msgstr ""
+
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1273
+#: plugins/personal/posix/class_posixAccount.inc:1332
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
-#: plugins/personal/samba/class_sambaAccount.inc:630
+#: plugins/personal/samba/class_sambaAccount.inc:671
 msgid "Home directory"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1274
+#: plugins/personal/posix/class_posixAccount.inc:1333
 msgid "Shell"
 msgstr ""
 
@@ -1264,11 +1307,12 @@ msgid "Primary group"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:226
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/class_faxreport.inc:487
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
-#: plugins/gofon/fonreports/contents.tpl:35
+#: plugins/gofon/fonreports/contents.tpl:35 setup/setup_step4.tpl:118
 msgid "Status"
 msgstr ""
 
@@ -1278,13 +1322,13 @@ msgid "Force UID/GID"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:51
-#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:287
 msgid "UID"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:912
+#: plugins/admin/groups/class_groupGeneric.inc:894
 msgid "GID"
 msgstr ""
 
@@ -1324,9 +1368,10 @@ msgstr ""
 #: plugins/admin/users/class_divListUsers.inc:69
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:76
+#: plugins/admin/systems/class_divListSystem.inc:77
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
 #: plugins/gofon/macro/class_divListMacros.inc:57
 #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1370,11 +1415,11 @@ msgid "Display systems of department"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:79
+#: plugins/admin/systems/class_divListSystem.inc:80
 msgid "Display systems matching"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:123
+#: plugins/personal/posix/main.inc:128
 msgid "Unix settings"
 msgstr ""
 
@@ -1383,338 +1428,338 @@ msgstr ""
 msgid "UNIX"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:131
+#: plugins/personal/posix/class_posixAccount.inc:137
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:134
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "active, password not changable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:142
 msgid "active, password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:144
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:1001
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:189
+#: plugins/personal/posix/class_posixAccount.inc:190
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:206
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:784
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_terminalService.inc:196
+#: plugins/admin/systems/class_workstationStartup.inc:830
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:213
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:249
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:252
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid "This account has no unix extensions."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:272
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
 msgid "Remove posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:273
+#: plugins/personal/posix/class_posixAccount.inc:268
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:276
+#: plugins/personal/posix/class_posixAccount.inc:271
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:279
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid "Create posix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:280
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:440
+#: plugins/personal/posix/class_posixAccount.inc:435
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:439
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:448
+#: plugins/personal/posix/class_posixAccount.inc:443
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:452
+#: plugins/personal/posix/class_posixAccount.inc:447
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:484
-#: 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:245
+#: plugins/personal/posix/class_posixAccount.inc:486
+#: plugins/personal/samba/class_sambaAccount.inc:397
+#: plugins/personal/samba/class_sambaAccount.inc:415
+#: plugins/personal/samba/class_sambaAccount.inc:433
+#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/generic/class_user.inc:251
 msgid "January"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:484
-#: 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:245
+#: plugins/personal/posix/class_posixAccount.inc:486
+#: plugins/personal/samba/class_sambaAccount.inc:397
+#: plugins/personal/samba/class_sambaAccount.inc:415
+#: plugins/personal/samba/class_sambaAccount.inc:433
+#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/generic/class_user.inc:251
 msgid "February"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:484
-#: 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:245
+#: plugins/personal/posix/class_posixAccount.inc:486
+#: plugins/personal/samba/class_sambaAccount.inc:397
+#: plugins/personal/samba/class_sambaAccount.inc:415
+#: plugins/personal/samba/class_sambaAccount.inc:433
+#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/generic/class_user.inc:251
 msgid "March"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:484
-#: 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:245
+#: plugins/personal/posix/class_posixAccount.inc:486
+#: plugins/personal/samba/class_sambaAccount.inc:397
+#: plugins/personal/samba/class_sambaAccount.inc:415
+#: plugins/personal/samba/class_sambaAccount.inc:433
+#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/generic/class_user.inc:251
 msgid "April"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:487
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:252
 msgid "May"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:487
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:252
 msgid "June"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:487
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:252
 msgid "July"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:487
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:252
 msgid "August"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
-#: plugins/personal/generic/class_user.inc:246
+#: plugins/personal/posix/class_posixAccount.inc:487
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/samba/class_sambaAccount.inc:434
+#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/generic/class_user.inc:252
 msgid "September"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:488
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:253
 msgid "October"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:488
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:253
 msgid "November"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:488
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/samba/class_sambaAccount.inc:435
+#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/generic/class_user.inc:253
 msgid "December"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:568
-#: plugins/personal/samba/class_sambaAccount.inc:461
-#: plugins/admin/systems/class_terminalGeneric.inc:97
-#: ihtml/themes/default/setup_step4.tpl:91
+#: plugins/personal/posix/class_posixAccount.inc:567
+#: plugins/personal/samba/class_sambaAccount.inc:494
+#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: ihtml/themes/default/setup_step4.tpl:91 setup/setup_step5.tpl:171
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:568
+#: plugins/personal/posix/class_posixAccount.inc:567
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:569
+#: plugins/personal/posix/class_posixAccount.inc:568
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:615
+#: plugins/personal/posix/class_posixAccount.inc:614
 #, php-format
 msgid "Removing of user/posix account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:763
+#: plugins/personal/posix/class_posixAccount.inc:762
 msgid "Failed: overriding lock"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:852
+#: plugins/personal/posix/class_posixAccount.inc:851
 #, php-format
 msgid "Saving of user/posix account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:915
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "The required field 'Home directory' is not set."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:919
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:926
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'UID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:929
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "Value specified as 'UID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:933
-#: plugins/admin/groups/class_groupGeneric.inc:809
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
 msgid "Value specified as 'GID' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:936
-#: plugins/admin/groups/class_groupGeneric.inc:812
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
 msgid "Value specified as 'GID' is too small."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:944
+#: plugins/personal/posix/class_posixAccount.inc:945
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:950
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:954
+#: plugins/personal/posix/class_posixAccount.inc:955
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:957
+#: plugins/personal/posix/class_posixAccount.inc:958
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:968
+#: plugins/personal/posix/class_posixAccount.inc:969
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:971
+#: plugins/personal/posix/class_posixAccount.inc:972
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:976
+#: plugins/personal/posix/class_posixAccount.inc:977
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1124
-#: plugins/admin/groups/class_groupGeneric.inc:848
+#: plugins/personal/posix/class_posixAccount.inc:1153
+#: plugins/admin/groups/class_groupGeneric.inc:830
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1263
+#: plugins/personal/posix/class_posixAccount.inc:1322
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1275
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
+#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
+#: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
+#: html/getxls.php:364
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1276
+#: plugins/personal/posix/class_posixAccount.inc:1335
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1278
+#: plugins/personal/posix/class_posixAccount.inc:1337
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1279
+#: plugins/personal/posix/class_posixAccount.inc:1338
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1280
+#: plugins/personal/posix/class_posixAccount.inc:1339
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1281
+#: plugins/personal/posix/class_posixAccount.inc:1340
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1282
+#: plugins/personal/posix/class_posixAccount.inc:1341
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1283
+#: plugins/personal/posix/class_posixAccount.inc:1342
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1284
+#: plugins/personal/posix/class_posixAccount.inc:1343
 msgid "System trust model"
 msgstr ""
 
@@ -1732,7 +1777,7 @@ msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:45 plugins/personal/samba/samba3.tpl:52
 #: plugins/personal/samba/samba3.tpl:111
-#: plugins/personal/samba/class_sambaAccount.inc:631
+#: plugins/personal/samba/class_sambaAccount.inc:672
 msgid "Profile path"
 msgstr ""
 
@@ -1745,7 +1790,7 @@ msgid "Allow user to change password from client"
 msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1040
+#: plugins/personal/samba/class_sambaAccount.inc:1081
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -1754,7 +1799,7 @@ msgid "Temporary disable samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1096
 msgid "Domain"
 msgstr ""
 
@@ -1763,12 +1808,12 @@ msgid "Terminal Server"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1036
+#: plugins/personal/samba/class_sambaAccount.inc:1077
 msgid "Allow login on terminal server"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1078
 msgid "Inherit client config"
 msgstr ""
 
@@ -1785,17 +1830,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:638
+#: plugins/personal/samba/class_sambaAccount.inc:679
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:183
-#: plugins/personal/samba/class_sambaAccount.inc:639
+#: plugins/personal/samba/class_sambaAccount.inc:680
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:197
-#: plugins/personal/samba/class_sambaAccount.inc:640
+#: plugins/personal/samba/class_sambaAccount.inc:681
 msgid "IDLE"
 msgstr ""
 
@@ -1833,17 +1878,17 @@ msgid "Reconnect if disconnected"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/class_sambaAccount.inc:1082
 msgid "Lock samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/class_sambaAccount.inc:1088
 msgid "Limit Logon Time"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1048
+#: plugins/personal/samba/class_sambaAccount.inc:1089
 msgid "Limit Logoff Time"
 msgstr ""
 
@@ -1851,12 +1896,20 @@ msgstr ""
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:398
+#: plugins/personal/samba/samba3.tpl:395
+msgid "Samba logon times"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:395
+msgid "Edit settings..."
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:403
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:116
-#: plugins/personal/samba/class_sambaAccount.inc:1027
+#: plugins/personal/samba/main.inc:124
+#: plugins/personal/samba/class_sambaAccount.inc:1068 setup/setup_step6.tpl:12
 msgid "Samba settings"
 msgstr ""
 
@@ -1868,551 +1921,647 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:198
+#: plugins/personal/samba/class_sambaAccount.inc:205
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:207
+#: plugins/personal/samba/class_sambaAccount.inc:214
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:208
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:218
-#: plugins/personal/samba/class_sambaAccount.inc:221
+#: plugins/personal/samba/class_sambaAccount.inc:225
+#: plugins/personal/samba/class_sambaAccount.inc:228
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:219
+#: plugins/personal/samba/class_sambaAccount.inc:226
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:496
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:470
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:614
+#: plugins/personal/samba/class_sambaAccount.inc:655
 #, php-format
 msgid "Removing of user/samba account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:633
+#: plugins/personal/samba/class_sambaAccount.inc:674
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/class_sambaAccount.inc:684
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:690
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:834
+#: plugins/personal/samba/class_sambaAccount.inc:875
 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:858
+#: plugins/personal/samba/class_sambaAccount.inc:899
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:962
+#: plugins/personal/samba/class_sambaAccount.inc:1003
 #, php-format
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1039
+#: plugins/personal/samba/class_sambaAccount.inc:1080
 msgid "Allow user to change password"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/class_sambaAccount.inc:1085
 msgid "Account expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1045
+#: plugins/personal/samba/class_sambaAccount.inc:1086
 msgid "Password expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1090
+msgid "Logon hours"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1092
 msgid "Generic home directory"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1093
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1094
 msgid "Generic script path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1095
 msgid "Generic profile path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1097
 msgid "Allow connection from"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
+#: plugins/personal/samba/class_sambaLogonHours.inc:62
+msgid "Sunday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:63
+msgid "Monday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:64
+msgid "Tuesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:65
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:66
+msgid "Thursday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:67
+msgid "Friday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:68
+msgid "Saturday"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+msgid "Specify the hours this user is allowed to log in"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+msgid "Hour"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:104
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:103
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/addons/notifications/contents.tpl:12
+#: plugins/admin/groups/class_groupManagement.inc:332
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/applications/class_applicationManagement.inc:349
+#: plugins/admin/systems/class_systemManagement.inc:681
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/systems/servRepositorySetup.tpl:54
+#: plugins/admin/ogroups/class_ogroupManagement.inc:298
+#: plugins/admin/acl/acl_role.tpl:49 plugins/admin/acl/acl_role.tpl:59
+#: plugins/admin/acl/acl_role.tpl:73
+#: plugins/admin/fai/class_faiManagement.inc:626
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiScriptEntry.tpl:82
+#: plugins/admin/fai/faiVariableEntry.tpl:54
+#: plugins/admin/fai/faiHookEntry.tpl:84
+#: plugins/admin/fai/faiTemplateEntry.tpl:170
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
+#: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
+#: ihtml/themes/default/acl.tpl:75 ihtml/themes/default/acl.tpl:89
+msgid "Apply"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:256
+#: plugins/personal/generic/class_user.inc:262
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:273
+#: plugins/personal/generic/class_user.inc:279
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:341
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:438
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:467
+#: plugins/personal/generic/class_user.inc:482
+msgid ""
+"(Some types of certificates are currently not supported and may be displayed "
+"as 'invalid'.)"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:492
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:467
+#: plugins/personal/generic/class_user.inc:495
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:467
+#: plugins/personal/generic/class_user.inc:496
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:501
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:588
 #, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:630
-#, php-format
-msgid "You are not allowed to move this object to '%s'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:876
-#, php-format
-msgid "Saving of user/generic account with dn '%s' failed."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:923
+#: plugins/personal/generic/class_user.inc:620
+#: plugins/personal/generic/class_user.inc:982
 msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:940
+#: plugins/personal/generic/class_user.inc:634
+#: plugins/personal/generic/class_user.inc:999
 msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:951
-msgid "Can't add user to kerberos database."
+#: plugins/personal/generic/class_user.inc:690
+#, php-format
+msgid "You are not allowed to move this object to '%s'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:992
-msgid "You have no permissions to create a user on this 'Base'."
+#: plugins/personal/generic/class_user.inc:935
+#, php-format
+msgid "Saving of user/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:995
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/generic/class_user.inc:1010
+msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1001
-#: plugins/addons/addressbook/class_addressbook.inc:553
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/personal/generic/class_user.inc:1067
+#: plugins/addons/addressbook/class_addressbook.inc:653
+#: plugins/admin/users/class_userManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:549
 msgid "The required field 'Name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1010
+#: plugins/personal/generic/class_user.inc:1076
 msgid "There's already a person with this 'Login' in the database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1016
-#: plugins/addons/addressbook/class_addressbook.inc:557
-#: plugins/admin/users/class_userManagement.inc:473
-#: plugins/admin/users/class_userManagement.inc:551
+#: plugins/personal/generic/class_user.inc:1082
+#: plugins/addons/addressbook/class_addressbook.inc:657
+#: plugins/admin/users/class_userManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:552
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1019
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:1090
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1033
+#: plugins/personal/generic/class_user.inc:1097
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1036
+#: plugins/personal/generic/class_user.inc:1100
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1039
-#: plugins/personal/generic/class_user.inc:1064
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:591
-#: plugins/admin/departments/class_departmentGeneric.inc:257
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/personal/generic/class_user.inc:1128
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
 msgid "The field 'Name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1042
-#: plugins/personal/generic/class_user.inc:1061
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/personal/generic/class_user.inc:1125
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
 msgid "The field 'Given name' contains invalid characters."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1047
-#: plugins/addons/addressbook/class_addressbook.inc:571
-#: plugins/addons/addressbook/class_addressbook.inc:574
-#: plugins/admin/departments/class_departmentGeneric.inc:260
+#: plugins/personal/generic/class_user.inc:1111
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1050
-#: plugins/addons/addressbook/class_addressbook.inc:577
-#: plugins/admin/departments/class_departmentGeneric.inc:263
+#: plugins/personal/generic/class_user.inc:1114
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1053
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:680
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1056
-#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:683
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1184
+#: plugins/personal/generic/class_user.inc:1229
 msgid "Could not open specified certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1360
 #: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1361
 #: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1362
 #: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1363
 #: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1364
 #: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1365
 #: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1366
 #: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1367
 #: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1369
 #: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1370
 #: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1371
 #: plugins/personal/generic/generic.tpl:419
+#: plugins/admin/acl/class_divListACL.inc:148
+#: plugins/admin/acl/class_aclRole.inc:929
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1372
 #: plugins/personal/generic/generic.tpl:459
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:179
+#: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1376
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1332
+#: plugins/personal/generic/class_user.inc:1381
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
-#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/printer.tpl:91
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: include/class_acl.inc:164 html/getxls.php:89 html/getxls.php:90
+#: html/getxls.php:308
 msgid "Users"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1385
 #: plugins/personal/generic/generic.tpl:143
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:574
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/gofax/blocklists/generic.tpl:17
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 #: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:906
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:137
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
 #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:517
-#: plugins/admin/applications/class_divListApplication.inc:118
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
 #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:550
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: 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/departments/class_departmentGeneric.inc:589
+#: plugins/admin/departments/class_divListDepartment.inc:100
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
+#: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
+#: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:374
+#: plugins/admin/systems/class_workstationGeneric.inc:535
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/component.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:882
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
 #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:188
 #: plugins/admin/systems/goLdapServer.tpl:2
 #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:764
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/ogroups/class_ogroup.inc:705
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:119
+#: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:939
+#: plugins/admin/fai/class_divListFai.inc:171
 #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: 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
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
+#: plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/class_gofonMacro.inc:543
+#: plugins/gofon/macro/class_divListMacros.inc:106
+#: plugins/gofon/conference/generic.tpl:49
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:684
+#: plugins/gofon/conference/class_divListConferences.inc:114
+#: setup/setup_step6.tpl:188 setup/setup_step6.tpl:210
+#: setup/setup_step4.tpl:35
 msgid "Base"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1338 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1387
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
 msgid "Surename"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1339
-#: plugins/addons/addressbook/class_addressbook.inc:520 html/getxls.php:65
-#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1388
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
+#: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
 msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1389
+#: plugins/addons/addressbook/class_addressbook.inc:798
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/class_user.inc:1390
 #: plugins/personal/generic/generic.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:22
+#: plugins/addons/addressbook/address_edit.tpl:60
+#: plugins/addons/addressbook/address_info.tpl:40
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1391
 #: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1343 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1392
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1344
+#: plugins/personal/generic/class_user.inc:1393
+#: plugins/addons/addressbook/class_addressbook.inc:797
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1394
 #: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1346
-#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/generic.tpl:250
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1347
+#: plugins/personal/generic/class_user.inc:1396
 #: 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
+#: plugins/addons/addressbook/address_edit.tpl:155
+#: plugins/addons/addressbook/class_addressbook.inc:802
+#: plugins/addons/addressbook/address_info.tpl:117
 #: plugins/admin/users/class_divListUsers.inc:56
 #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:381
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
 #: plugins/gofon/macro/class_divListMacros.inc:52
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1397
 #: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1349
+#: plugins/personal/generic/class_user.inc:1398
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1350
+#: plugins/personal/generic/class_user.inc:1399
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1400
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1352
+#: plugins/personal/generic/class_user.inc:1401
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1402
 #: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1403
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/class_addressbook.inc:803
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:551
-#: plugins/admin/systems/workstation.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:813
-#: plugins/admin/systems/class_glpiAccount.inc:780
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:590
+#: plugins/admin/systems/workstation.tpl:19
+#: plugins/admin/systems/class_workstationGeneric.inc:534
+#: plugins/admin/systems/class_printGeneric.inc:884
+#: plugins/admin/systems/class_glpiAccount.inc:782
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1404
 #: plugins/personal/generic/generic.tpl:360
+#: plugins/addons/addressbook/class_addressbook.inc:806
 #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:555
-#: html/getxls.php:174 html/getxls.php:236
+#: plugins/admin/departments/class_departmentGeneric.inc:594
+#: html/getxls.php:228 html/getxls.php:301
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/paste_generic.tpl:22
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1406
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1407
+#: plugins/addons/addressbook/class_addressbook.inc:794
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1408
+#: plugins/addons/addressbook/class_addressbook.inc:796
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/generic/class_user.inc:1409
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1410
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1363 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1412
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
+#: html/getxls.php:298 html/getxls.php:300
 msgid "Postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:812
+#: plugins/personal/generic/class_user.inc:1413
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
 msgid "Fax number"
 msgstr ""
 
@@ -2425,7 +2574,7 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/paste_generic.tpl:37
 msgid "Personal picture"
 msgstr ""
 
@@ -2463,8 +2612,8 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:86
+#: html/getxls.php:281
 msgid "Sex"
 msgstr ""
 
@@ -2473,38 +2622,34 @@ msgid "Preferred langage"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:148
+#: plugins/admin/systems/printer.tpl:30
 msgid "Choose subtree to place user in"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:153
-#: plugins/gofax/blocklists/generic.tpl:21
-#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:40
-#: plugins/admin/applications/generic.tpl:51
+#: plugins/gofax/blocklists/generic.tpl:26 plugins/admin/groups/generic.tpl:40
+#: plugins/admin/applications/generic.tpl:52
 #: plugins/admin/departments/generic.tpl:45
-#: 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/terminal.tpl:28 plugins/admin/systems/server.tpl:32
+#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:35
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/wingeneric.tpl:18
-#: plugins/admin/systems/component.tpl:19
-#: plugins/admin/systems/component.tpl:21 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:41
+#: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
+#: plugins/admin/acl/acl_role.tpl:37 plugins/admin/mimetypes/generic.tpl:53
+#: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:62
 msgid "Select a base"
 msgstr ""
 
 #: 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/addons/addressbook/address_edit.tpl:80
+#: plugins/addons/addressbook/address_edit.tpl:207
+#: plugins/addons/addressbook/address_info.tpl:59
+#: plugins/addons/addressbook/address_info.tpl:155
 #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:556
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:595
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
 msgid "Address"
 msgstr ""
 
@@ -2526,7 +2671,7 @@ msgid "Edit certificates"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:217
-#: plugins/admin/systems/class_goKrbServer.inc:219
+#: plugins/admin/systems/class_goKrbServer.inc:87
 msgid "Kerberos"
 msgstr ""
 
@@ -2553,16 +2698,17 @@ msgstr ""
 
 #: 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
+#: plugins/addons/addressbook/address_edit.tpl:106
+#: plugins/addons/addressbook/address_info.tpl:75 html/getxls.php:299
 msgid "Mobile"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:79
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:246
+#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
+#: html/getxls.php:300
 msgid "Pager"
 msgstr ""
 
@@ -2578,52 +2724,55 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
 msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/generic/generic_picture.tpl:33
 #: 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:294
+#: plugins/addons/addressbook/address_edit.tpl:264
+#: plugins/admin/departments/class_departmentManagement.inc:317
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
 #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:203
-#: plugins/admin/systems/goNtpServer.tpl:22
-#: plugins/admin/systems/servnfs.tpl:120
-#: plugins/admin/systems/servRepository.tpl:64
-#: plugins/admin/systems/goFonServer.tpl:24
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
+#: plugins/admin/systems/servnfs.tpl:139
+#: plugins/admin/systems/goFaxServer.tpl:23
+#: plugins/admin/systems/servRepository.tpl:66
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
 #: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
 #: plugins/admin/systems/servdnseditzone.tpl:119
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goKrbServer.tpl:19
-#: plugins/admin/systems/goLdapServer.tpl:7
-#: 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
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:17
-#: plugins/admin/systems/goFaxServer.tpl:16
-#: plugins/admin/systems/goLogDBServer.tpl:16
-#: plugins/admin/systems/goSpamServer.tpl:101
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:144
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
+#: plugins/admin/systems/class_goService.inc:33
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:38
 #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/copyPasteDialog.tpl:19
 msgid "Save"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:99
+#: plugins/personal/generic/main.inc:102
 msgid "You are not allowed to set your password!"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:184
+#: plugins/personal/generic/main.inc:191
 msgid "Generic user information"
 msgstr ""
 
@@ -2634,22 +2783,24 @@ msgstr ""
 #: 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:251
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:258
+#: plugins/personal/environment/environment.tpl:159
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:579
-#: plugins/admin/applications/class_applicationParameters.inc:122
-#: plugins/admin/systems/printer.tpl:53 plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/workstationStartup.tpl:182
-#: plugins/admin/systems/terminalStartup.tpl:81
+#: plugins/admin/groups/class_groupMail.inc:605
+#: plugins/admin/applications/class_applicationParameters.inc:124
+#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/glpiPrinter.tpl:152
+#: plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/workstationStartup.tpl:186
+#: plugins/admin/systems/terminalStartup.tpl:111
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
-#: plugins/admin/systems/goMailServer.tpl:57
-#: plugins/admin/systems/goMailServer.tpl:80
-#: plugins/admin/systems/goSpamServer.tpl:37
-#: plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
+#: plugins/admin/systems/goMailServer.tpl:73
+#: plugins/admin/systems/goMailServer.tpl:104
+#: plugins/admin/systems/goSpamServer.tpl:48
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:296
 msgid "Remove"
 msgstr ""
 
@@ -2665,15 +2816,15 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:4
+#: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:35
+#: plugins/personal/generic/paste_generic.tpl:23
 msgid "Clear password"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:36
+#: plugins/personal/generic/paste_generic.tpl:24
 msgid "Set new password"
 msgstr ""
 
@@ -2732,7 +2883,7 @@ msgid "Temporary disable FTP access"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:23
-#: plugins/personal/connectivity/class_proxyAccount.inc:283
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
 msgid "Proxy account"
 msgstr ""
 
@@ -2745,7 +2896,7 @@ msgid "Limit proxy access to working time"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:294
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
@@ -2757,24 +2908,37 @@ msgstr ""
 msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:71
+#: plugins/personal/connectivity/class_phpgwAccount.inc:79
 #, php-format
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:117
+#: plugins/personal/connectivity/class_phpgwAccount.inc:125
 #, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:134
+#: plugins/personal/connectivity/class_phpgwAccount.inc:142
 msgid "PHP GW"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:135
+#: plugins/personal/connectivity/class_phpgwAccount.inc:143
 msgid "PHP GW account settings"
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+#: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:950
+#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:310
+msgid "Connectivity addon"
+msgstr ""
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr ""
@@ -2791,7 +2955,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:452
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
 msgid "Delegations"
 msgstr ""
 
@@ -2808,7 +2972,7 @@ msgid "Free Busy information"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:74
-#: plugins/admin/systems/servRepositorySetup.tpl:24
+#: plugins/admin/systems/servRepositorySetup.tpl:28
 msgid "URL"
 msgstr ""
 
@@ -2823,111 +2987,111 @@ msgid "days"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:453
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
 msgid "Invitation policy"
 msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
-#: plugins/personal/connectivity/class_kolabAccount.inc:439
-#: plugins/admin/systems/class_servKolab.inc:413
+#: plugins/personal/connectivity/class_kolabAccount.inc:446
+#: plugins/admin/systems/class_servKolab.inc:374
 msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:136
+#: plugins/personal/connectivity/class_kolabAccount.inc:143
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:144
+#: plugins/personal/connectivity/class_kolabAccount.inc:151
 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:169
+#: plugins/personal/connectivity/class_kolabAccount.inc:176
 msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:170
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
 msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:171
+#: plugins/personal/connectivity/class_kolabAccount.inc:178
 msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:172
+#: plugins/personal/connectivity/class_kolabAccount.inc:179
 msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:173
+#: plugins/personal/connectivity/class_kolabAccount.inc:180
 msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:221
+#: plugins/personal/connectivity/class_kolabAccount.inc:228
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:282
+#: plugins/personal/connectivity/class_kolabAccount.inc:289
 #, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:293
+#: plugins/personal/connectivity/class_kolabAccount.inc:300
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:298
+#: plugins/personal/connectivity/class_kolabAccount.inc:305
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:312
+#: plugins/personal/connectivity/class_kolabAccount.inc:319
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:320
+#: plugins/personal/connectivity/class_kolabAccount.inc:327
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:404
+#: plugins/personal/connectivity/class_kolabAccount.inc:411
 #, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:440
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
 msgid "Kolab account settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:449
+#: plugins/personal/connectivity/class_kolabAccount.inc:456
 msgid "Free busy future"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:450
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
 msgid "Mail size restriction"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
 msgid "Free busy information"
 msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
-#: plugins/personal/connectivity/class_webdavAccount.inc:133
+#: plugins/personal/connectivity/class_webdavAccount.inc:141
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#: plugins/personal/connectivity/class_webdavAccount.inc:76
 #, php-format
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:115
+#: plugins/personal/connectivity/class_webdavAccount.inc:123
 #, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/class_webdavAccount.inc:142
 #: plugins/personal/connectivity/webdav.tpl:3
 msgid "WebDAV account"
 msgstr ""
@@ -2937,69 +3101,69 @@ msgstr ""
 msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:99
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:107
 #, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:157
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:160
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:156
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:164
 msgid "Value specified as 'Quota files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:159
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:167
 msgid "Value specified as 'Quota size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:162
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:170
 msgid "Value specified as 'Upload ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:165
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:173
 msgid "Value specified as 'Download ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:191
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:199
 #, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:210
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:218
 msgid "Ftp"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:211
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
 msgid "Pure ftp account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:220
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
 msgid "Quota files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:221
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
 msgid "Upload ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:222
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
 msgid "Quota MBytes"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
 msgid "Download ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
 msgid "Upload bandwith"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:225
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
 msgid "Download bandwith"
 msgstr ""
 
@@ -3041,70 +3205,72 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:711
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:819
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:717
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:721
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:725
+msgid "Openexchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:717
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
 msgid "Couldn't connect to postgresql database!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:715
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:823
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:721
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:828
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:827
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:725
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:832
 msgid "PHP4 module for postgresql database is missing!"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:728
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:742
 #, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:806
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:812
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
-"that "
+"that you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:807
-msgid "you are not using any strange characters in the loginname."
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:840
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:845
 #, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:847
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:852
 #, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:934
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:939
 msgid ""
 "Something went wrong while saving oxchange account. Please check the error "
 "log file."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:944
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:949
 msgid "Open xchange"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:945
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:950
 msgid "Open xchange account settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
 msgid "OXAppointmentDays"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
 msgid "OXTaskDays"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:956
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
 msgid "OXTimeZone"
 msgstr ""
 
@@ -3117,86 +3283,86 @@ msgid "This account has no connectivity extensions."
 msgstr ""
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/personal/connectivity/class_proxyAccount.inc:282
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:83
-#: plugins/admin/systems/goMailServer.tpl:18
-#: plugins/admin/systems/goMailServer.tpl:26
-#: plugins/admin/systems/goMailServer.tpl:34
+#: plugins/personal/connectivity/class_proxyAccount.inc:92
+#: plugins/admin/systems/goMailServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:40
 msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:83
+#: plugins/personal/connectivity/class_proxyAccount.inc:92
 msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:84
-#: plugins/addons/mailqueue/class_mailqueue.inc:323
+#: plugins/personal/connectivity/class_proxyAccount.inc:93
+#: plugins/addons/mailqueue/class_mailqueue.inc:324
 msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/personal/connectivity/class_proxyAccount.inc:93
 msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/personal/connectivity/class_proxyAccount.inc:93
 msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/personal/connectivity/class_proxyAccount.inc:93
 msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:149
+#: plugins/personal/connectivity/class_proxyAccount.inc:158
 #, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:167
+#: plugins/personal/connectivity/class_proxyAccount.inc:176
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:169
+#: plugins/personal/connectivity/class_proxyAccount.inc:178
 msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:264
+#: plugins/personal/connectivity/class_proxyAccount.inc:273
 #, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:301
 msgid "Filter unwanted content"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:293
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
 msgid "Limit proxy access"
 msgstr ""
 
 #: plugins/personal/connectivity/pptp.tpl:3
-#: plugins/personal/connectivity/class_pptpAccount.inc:151
+#: plugins/personal/connectivity/class_pptpAccount.inc:159
 msgid "PPTP account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
-#: plugins/personal/connectivity/class_intranetAccount.inc:170
+#: plugins/personal/connectivity/class_intranetAccount.inc:177
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:101
+#: plugins/personal/connectivity/class_intranetAccount.inc:108
 #, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:159
+#: plugins/personal/connectivity/class_intranetAccount.inc:166
 #, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:177
+#: plugins/personal/connectivity/class_intranetAccount.inc:184
 msgid "Intranet account settings"
 msgstr ""
 
@@ -3205,45 +3371,45 @@ msgid "GLPI account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
-#: plugins/personal/connectivity/class_pptpAccount.inc:150
+#: plugins/personal/connectivity/class_pptpAccount.inc:158
 msgid "PPTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:85
+#: plugins/personal/connectivity/class_pptpAccount.inc:93
 #, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:132
+#: plugins/personal/connectivity/class_pptpAccount.inc:140
 #, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:1
-#: plugins/personal/connectivity/class_opengwAccount.inc:302
+#: plugins/personal/connectivity/class_opengwAccount.inc:309
 msgid "Opengroupware"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:312
+#: plugins/personal/connectivity/class_opengwAccount.inc:319
 msgid "Location team"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:313
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
 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:48
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
 msgid "Locked"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:315
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
 msgid "Teams"
 msgstr ""
 
@@ -3277,25 +3443,25 @@ msgstr ""
 msgid "Opengroupware account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:136
+#: plugins/personal/connectivity/class_opengwAccount.inc:143
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:141
+#: plugins/personal/connectivity/class_opengwAccount.inc:148
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:149
+#: plugins/personal/connectivity/class_opengwAccount.inc:156
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:303
+#: plugins/personal/connectivity/class_opengwAccount.inc:310
 msgid "Open groupware account settings"
 msgstr ""
 
@@ -3304,8 +3470,8 @@ msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:14
-#: plugins/personal/environment/environment.tpl:121
-#: plugins/personal/environment/environment.tpl:191
+#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:198
 msgid "Environment managment settings"
 msgstr ""
 
@@ -3313,118 +3479,116 @@ msgstr ""
 msgid "Profile managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:26
+#: plugins/personal/environment/environment.tpl:25
 msgid "Use profile managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:33
+#: plugins/personal/environment/environment.tpl:32
 msgid "Profile server managment"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:36
+#: plugins/personal/environment/environment.tpl:35
 msgid "Profil path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:49
+#: plugins/personal/environment/environment.tpl:56
 msgid "Profil quota"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1246
+#: plugins/personal/environment/environment.tpl:73
+#: plugins/personal/environment/class_environment.inc:1283
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:75
+#: plugins/personal/environment/environment.tpl:82
 msgid "Kiosk profile settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:78
-#: plugins/personal/environment/class_environment.inc:1252
+#: plugins/personal/environment/environment.tpl:85
+#: plugins/personal/environment/class_environment.inc:1289
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:88
+#: plugins/personal/environment/environment.tpl:95
 msgid "Manage"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:98
-#: plugins/personal/environment/class_environment.inc:1245
+#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/class_environment.inc:1282
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/class_environment.inc:1251
+#: plugins/personal/environment/environment.tpl:110
+#: plugins/personal/environment/class_environment.inc:1288
 #: plugins/admin/systems/workstationService.tpl:122
-#: plugins/admin/systems/terminalService.tpl:94
+#: plugins/admin/systems/terminalService.tpl:108
 msgid "Resolution"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:126
-#: plugins/personal/environment/class_environment.inc:1257
-#: plugins/admin/systems/servservice.tpl:11
-#: plugins/admin/systems/class_workstationStartup.inc:1114
-#: plugins/admin/systems/workstationStartup.tpl:158
-#: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/personal/environment/environment.tpl:133
+#: plugins/personal/environment/class_environment.inc:1294
+#: plugins/admin/systems/class_terminalStartup.inc:456
+#: plugins/admin/systems/class_workstationStartup.inc:1173
+#: plugins/admin/systems/workstationStartup.tpl:162
+#: plugins/admin/systems/terminalStartup.tpl:87
 #: 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:136
+#: plugins/personal/environment/environment.tpl:143
 msgid "User used to connect to the share"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:146
 msgid "Select a share"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:147
+#: plugins/personal/environment/environment.tpl:154
 msgid "Mount path"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:160
+#: plugins/personal/environment/environment.tpl:167
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:162
+#: plugins/personal/environment/environment.tpl:169
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:196
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/environment.tpl:203
+#: plugins/personal/environment/class_environment.inc:1293
 msgid "Hotplug devices"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:198
+#: plugins/personal/environment/environment.tpl:205
 msgid "Hotplug device settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:212
+#: plugins/personal/environment/environment.tpl:219
 #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:103
 msgid "New"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:215
+#: plugins/personal/environment/environment.tpl:222
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:230
+#: plugins/personal/environment/environment.tpl:237
 msgid "Printer settings"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:247
+#: plugins/personal/environment/environment.tpl:254
 msgid "Toggle admin"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:250
+#: plugins/personal/environment/environment.tpl:257
 msgid "Toggle default"
 msgstr ""
 
-#: plugins/personal/environment/main.inc:114
+#: plugins/personal/environment/main.inc:120
 msgid "User environment settings"
 msgstr ""
 
@@ -3436,28 +3600,28 @@ msgstr ""
 msgid "Invalid character in description. Please specify a valid description."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:127
-msgid "Please specify a valid id."
+#: plugins/personal/environment/class_hotplugDialog.inc:128
+msgid "Please specify a valid iSerial."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
-msgid "Please specify a valid vendor id. (2 byte hex like '0xFFFF')"
+#: plugins/personal/environment/class_hotplugDialog.inc:132
+msgid "Please specify a valid vendor ID. (2 byte hex like '0xFFFF')"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:133
-msgid "Please specify a valid product id. (2 byte hex like '0xFFFF')"
+#: plugins/personal/environment/class_hotplugDialog.inc:135
+msgid "Please specify a valid product ID. (2 byte hex like '0xFFFF')"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:139
+#: plugins/personal/environment/class_hotplugDialog.inc:141
 msgid "An Entry with this name already exists."
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:144
+#: plugins/personal/environment/class_hotplugDialog.inc:146
 msgid "Please select an entry or press cancel."
 msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:69
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:102
+#: plugins/personal/environment/class_selectPrinterDialog.inc:102
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
 msgid "Please select a printer or press cancel."
 msgstr ""
 
@@ -3491,12 +3655,12 @@ msgstr ""
 msgid "Regular expression for        matching hotplugs"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:203
+#: plugins/personal/environment/class_environment.inc:208
 msgid "auto"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:225
-#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/personal/environment/class_environment.inc:230
+#: plugins/admin/systems/class_terminalService.inc:97
 #: plugins/admin/systems/class_workstationService.inc:88
 #, php-format
 msgid ""
@@ -3504,128 +3668,146 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:319
-#: plugins/personal/environment/class_environment.inc:357
+#: plugins/personal/environment/class_environment.inc:271
+#, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Setting profile "
+"server to '%s'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:276
+#, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Profile server "
+"configuration is resetted."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:383
 msgid "Remove environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:320
-#: plugins/personal/environment/class_environment.inc:358
+#: plugins/personal/environment/class_environment.inc:346
+#: plugins/personal/environment/class_environment.inc:384
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:329
-#: plugins/personal/environment/class_environment.inc:334
-#: plugins/personal/environment/class_environment.inc:363
-#: plugins/personal/environment/class_environment.inc:368
+#: plugins/personal/environment/class_environment.inc:355
+#: plugins/personal/environment/class_environment.inc:360
+#: plugins/personal/environment/class_environment.inc:389
+#: plugins/personal/environment/class_environment.inc:394
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:330
-#: plugins/personal/environment/class_environment.inc:364
+#: plugins/personal/environment/class_environment.inc:356
+#: plugins/personal/environment/class_environment.inc:390
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:335
-#: plugins/personal/environment/class_environment.inc:369
+#: plugins/personal/environment/class_environment.inc:361
+#: plugins/personal/environment/class_environment.inc:395
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:472
-#: plugins/personal/environment/class_environment.inc:862
+#: plugins/personal/environment/class_environment.inc:498
+#: plugins/personal/environment/class_environment.inc:895
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:486
+#: plugins/personal/environment/class_environment.inc:512
 msgid "You are not allowed to write Logon scripts."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:565
-#: plugins/personal/environment/class_environment.inc:576
-#: plugins/admin/systems/class_terminalStartup.inc:197
-#: plugins/admin/systems/class_workstationStartup.inc:615
+#: plugins/personal/environment/class_environment.inc:591
+#: plugins/personal/environment/class_environment.inc:604
+#: plugins/admin/systems/class_terminalStartup.inc:204
+#: plugins/admin/systems/class_workstationStartup.inc:650
 msgid "You must specify a valid mount point."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:638
-#: plugins/personal/environment/class_environment.inc:639
-#: plugins/personal/environment/class_environment.inc:647
-#: plugins/personal/environment/class_environment.inc:648
+#: plugins/personal/environment/class_environment.inc:593
+msgid "Spaces are not allowed in the mount path!"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:672
+#: plugins/personal/environment/class_environment.inc:673
+#: plugins/personal/environment/class_environment.inc:681
+#: plugins/personal/environment/class_environment.inc:682
 msgid "Reset password hash"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:652
+#: plugins/personal/environment/class_environment.inc:686
 msgid "Delete share entry"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:841
+#: plugins/personal/environment/class_environment.inc:875
 msgid "GOsa default printer flag is not allowed within groups."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:865
+#: plugins/personal/environment/class_environment.inc:898
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:904
+#: plugins/personal/environment/class_environment.inc:936
 #, php-format
 msgid "Removing of user/environment account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:973
+#: plugins/personal/environment/class_environment.inc:1005
 msgid "Please set a valid profile quota size."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:980
+#: plugins/personal/environment/class_environment.inc:1012
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1018
+#: plugins/personal/environment/class_environment.inc:1050
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1157
+#: plugins/personal/environment/class_environment.inc:1189
 #, php-format
 msgid "Saving of user/environment account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1170
+#: plugins/personal/environment/class_environment.inc:1202
 msgid "group share"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1203
+#: plugins/personal/environment/class_environment.inc:1238
 msgid "Administrator"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1208
-#: plugins/personal/environment/class_environment.inc:1254
+#: plugins/personal/environment/class_environment.inc:1243
+#: plugins/personal/environment/class_environment.inc:1291
 msgid "Default printer"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1234
+#: plugins/personal/environment/class_environment.inc:1270
 msgid "Environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1241
+#: plugins/personal/environment/class_environment.inc:1278
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1248
+#: plugins/personal/environment/class_environment.inc:1285
 msgid "Profile quota"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1249
+#: plugins/personal/environment/class_environment.inc:1286
 msgid "Profile server"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1292
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3648,15 +3830,15 @@ msgstr ""
 msgid "Regular expression for matching printer names"
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:104
+#: plugins/personal/environment/class_logonManagementDialog.inc:108
 msgid "Specified name should only consist of upper-/lowercase characters."
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:108
+#: plugins/personal/environment/class_logonManagementDialog.inc:112
 msgid "Please specify a valid script name."
 msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:112
+#: plugins/personal/environment/class_logonManagementDialog.inc:116
 msgid "Specified description contains invalid characters."
 msgstr ""
 
@@ -3670,59 +3852,66 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:573
+#: plugins/gofax/blocklists/generic.tpl:51
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
 #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:907
+#: plugins/admin/groups/class_groupGeneric.inc:889
 #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:518
+#: plugins/admin/applications/class_applicationGeneric.inc:534
 #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:548
-#: plugins/admin/systems/class_winGeneric.inc:245
-#: 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/departments/class_departmentGeneric.inc:587
+#: plugins/admin/systems/class_winGeneric.inc:282
+#: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
+#: plugins/admin/systems/printer.tpl:16
+#: plugins/admin/systems/class_servGeneric.inc:372
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30
-#: plugins/admin/systems/class_printGeneric.inc:812
-#: 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:788
+#: plugins/admin/systems/component.tpl:35
+#: plugins/admin/systems/class_printGeneric.inc:883
+#: plugins/admin/systems/class_componentGeneric.inc:270
+#: plugins/admin/systems/servnfs.tpl:19
+#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_goMailServer.inc:695
+#: plugins/admin/systems/class_goShareServer.inc:372
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:765
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/class_faiScript.inc:489
-#: plugins/admin/fai/class_faiTemplate.inc:460
-#: plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17
-#: plugins/admin/fai/class_faiPackage.inc:553
-#: plugins/admin/fai/class_faiProfile.inc:446
-#: plugins/admin/fai/class_faiHook.inc:494 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:393
-#: plugins/admin/fai/faiTemplateEntry.tpl:11
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:706
+#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:940
+#: plugins/admin/fai/faiVariable.tpl:21
+#: plugins/admin/fai/class_faiScript.inc:539
+#: plugins/admin/fai/class_faiTemplate.inc:509
+#: plugins/admin/fai/faiPackage.tpl:21
+#: plugins/admin/fai/faiPartitionTable.tpl:21
+#: plugins/admin/fai/class_faiScriptEntry.inc:180
+#: plugins/admin/fai/faiScriptEntry.tpl:19
+#: plugins/admin/fai/class_faiPackage.inc:532
+#: plugins/admin/fai/class_faiProfile.inc:452
+#: plugins/admin/fai/class_faiHook.inc:537 plugins/admin/fai/faiProfile.tpl:21
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:13
+#: plugins/admin/fai/faiScript.tpl:21
+#: plugins/admin/fai/class_faiVariableEntry.inc:143
+#: plugins/admin/fai/faiVariableEntry.tpl:19
+#: plugins/admin/fai/faiTemplate.tpl:21 plugins/admin/fai/faiHook.tpl:21
+#: plugins/admin/fai/class_faiPartitionTable.inc:529
+#: plugins/admin/fai/class_faiHookEntry.inc:189
+#: plugins/admin/fai/faiHookEntry.tpl:19
+#: plugins/admin/fai/class_faiVariable.inc:417
+#: plugins/admin/fai/class_faiTemplateEntry.inc:248
+#: plugins/admin/fai/faiTemplateEntry.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: 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
+#: plugins/gofon/macro/generic.tpl:49
+#: plugins/gofon/macro/class_gofonMacro.inc:544
+#: plugins/gofon/conference/generic.tpl:87
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:685
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:158
+#: html/getxls.php:287
 msgid "Description"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:24
-#: plugins/admin/fai/faiScriptEntry.tpl:34
+#: plugins/admin/fai/faiScriptEntry.tpl:38
 msgid "Priority"
 msgstr ""
 
@@ -3738,54 +3927,24 @@ msgstr ""
 msgid "Script can be replaced by user"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/blocklists/generic.tpl:88
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/addons/notifications/contents.tpl:12
-#: plugins/admin/groups/class_groupManagement.inc:329
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/users/class_userManagement.inc:653
-#: plugins/admin/applications/class_applicationManagement.inc:349
-#: 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:331
-#: 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
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
-#: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
-#: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
-msgid "Apply"
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:86
+#: plugins/personal/environment/class_kioskManagementDialog.inc:69
+#: plugins/personal/environment/class_kioskManagementDialog.inc:88
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:89
+#: plugins/personal/environment/class_kioskManagementDialog.inc:72
+#: plugins/personal/environment/class_kioskManagementDialog.inc:91
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:131
+#: plugins/personal/environment/class_kioskManagementDialog.inc:133
 msgid ""
 "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:137
+#: plugins/personal/environment/class_kioskManagementDialog.inc:139
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
@@ -3847,7 +4006,7 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: plugins/admin/fai/class_faiSummaryTab.inc:202
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
 #: include/class_MultiSelectWindow.inc:81
 msgid "Close"
 msgstr ""
@@ -3857,37 +4016,37 @@ msgid "Nagios Account"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
 msgid "Alias"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:269
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
 msgid "Host notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
 msgid "Service notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
 msgid "Service notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
 msgid "Host notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/nagios/class_nagiosAccount.inc:278
 msgid "Service notification commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#: plugins/personal/nagios/class_nagiosAccount.inc:274
 msgid "Host notification commands"
 msgstr ""
 
@@ -3923,97 +4082,97 @@ msgstr ""
 msgid "trigger all host commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:96
+#: plugins/personal/nagios/class_nagiosAccount.inc:103
 msgid "This account has no nagios extensions."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:105
+#: plugins/personal/nagios/class_nagiosAccount.inc:112
 msgid "Remove nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:106
+#: plugins/personal/nagios/class_nagiosAccount.inc:113
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:108
+#: plugins/personal/nagios/class_nagiosAccount.inc:115
 msgid "Create nagios account"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:108
+#: plugins/personal/nagios/class_nagiosAccount.inc:115
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:157
+#: plugins/personal/nagios/class_nagiosAccount.inc:164
 #, php-format
 msgid "Saving of user/nagios account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:177
+#: plugins/personal/nagios/class_nagiosAccount.inc:184
 msgid "The required field 'NagiosAlias' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:180
+#: plugins/personal/nagios/class_nagiosAccount.inc:187
 msgid "The required field 'NagiosMail' is not set."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:184
-#: plugins/personal/nagios/class_nagiosAccount.inc:188
+#: plugins/personal/nagios/class_nagiosAccount.inc:191
+#: plugins/personal/nagios/class_nagiosAccount.inc:195
 msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:238
+#: plugins/personal/nagios/class_nagiosAccount.inc:245
 #, php-format
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Nagios account settings"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:282
 msgid "View all hosts"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
 msgid "View all services"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:285
 msgid "Trigger system commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
 msgid "Trigger all host commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
 msgid "Trigger all service commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:289
 msgid "View configuration information"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
 msgid "View system informations"
 msgstr ""
 
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr ""
 
 #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:347
+#: plugins/personal/netatalk/class_netatalk.inc:365
 msgid "Share"
 msgstr ""
 
 #: plugins/personal/netatalk/netatalk.tpl:16
-#: plugins/admin/systems/servnfs.tpl:25
-#: plugins/admin/systems/class_servNfs.inc:275
+#: plugins/admin/systems/servnfs.tpl:29
+#: plugins/admin/systems/class_goShareServer.inc:375
 msgid "Path"
 msgstr ""
 
@@ -4025,46 +4184,46 @@ msgstr ""
 msgid "Manage netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:156
+#: plugins/personal/netatalk/class_netatalk.inc:167
 msgid "This account has no netatalk extensions."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:165
+#: plugins/personal/netatalk/class_netatalk.inc:176
 msgid "Remove netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:165
+#: plugins/personal/netatalk/class_netatalk.inc:176
 msgid ""
 "This account has netatalk features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:176
-#: plugins/personal/netatalk/class_netatalk.inc:178
+#: plugins/personal/netatalk/class_netatalk.inc:187
+#: plugins/personal/netatalk/class_netatalk.inc:189
 msgid "Create netatalk account"
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:176
+#: plugins/personal/netatalk/class_netatalk.inc:187
 msgid ""
 "This account has netatalk features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:210
+#: plugins/personal/netatalk/class_netatalk.inc:222
 msgid "You must select a share to use."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:263
+#: plugins/personal/netatalk/class_netatalk.inc:281
 #, php-format
 msgid "Saving of user/netatalk account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:323
+#: plugins/personal/netatalk/class_netatalk.inc:341
 #, php-format
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:346
+#: plugins/personal/netatalk/class_netatalk.inc:364
 msgid "User home path"
 msgstr ""
 
@@ -4072,59 +4231,65 @@ msgstr ""
 msgid "List name"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:10
+#: plugins/gofax/blocklists/generic.tpl:12
 msgid "Name of blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
+#: plugins/gofax/blocklists/generic.tpl:20 plugins/admin/groups/generic.tpl:34
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:26
+#: plugins/admin/systems/phone.tpl:20 plugins/admin/systems/workstation.tpl:30
+#: plugins/admin/systems/component.tpl:20 plugins/admin/ogroups/generic.tpl:29
+#: plugins/admin/acl/acl_role.tpl:31 plugins/gofon/macro/generic.tpl:30
+msgid "Choose subtree to place group in"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:37
-#: plugins/admin/systems/servnfs.tpl:47
-#: plugins/admin/systems/class_servNfs.inc:273
+#: plugins/gofax/blocklists/generic.tpl:40
+#: plugins/admin/systems/servnfs.tpl:56
 #: plugins/admin/systems/workstationService.tpl:54
 #: plugins/admin/systems/workstationService.tpl:156
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/class_glpiAccount.inc:783
+#: plugins/admin/systems/terminalService.tpl:48
+#: plugins/admin/systems/terminalService.tpl:138
+#: plugins/admin/systems/class_glpiAccount.inc:785
 #: 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/class_glpiPrinterAccount.inc:787
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/fai/class_faiSummaryTab.inc:309
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+#: plugins/admin/systems/class_goShareServer.inc:373
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
 msgid "Type"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:39
+#: plugins/gofax/blocklists/generic.tpl:43
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:48
+#: plugins/gofax/blocklists/generic.tpl:54
 msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:61
+#: plugins/gofax/blocklists/generic.tpl:68
 msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/blocklists/generic.tpl:92
 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/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.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
+#: html/index.php:49 html/index.php:341 html/index.php:347
 #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2
 msgid "Warning"
@@ -4151,80 +4316,73 @@ msgid "Blocklist management"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
 msgid "FAX Blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
 msgid "You have no permission to remove this blocklist."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
 msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 msgid "send"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 msgid "receive"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:409
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
 #, php-format
 msgid "Removing of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:449
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
-#: plugins/admin/departments/class_departmentGeneric.inc:246
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
 msgid "Required field 'Name' is not set."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
 msgid "Required field 'Name' contains invalid characters"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:465
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
 msgid "Specified name is already used."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:472
-msgid "No permission to create a blocklist on this base."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:520
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
 #, php-format
 msgid "Saving of blocklist with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:560
-msgid "Fax Blocklists"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+msgid "Fax blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:572
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/groups/class_groupGeneric.inc:905
-#: plugins/admin/applications/class_applicationGeneric.inc:516
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/systems/class_terminalGeneric.inc:502
-#: plugins/admin/systems/class_servGeneric.inc:324
-#: plugins/admin/systems/class_printGeneric.inc:811
-#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/address_info.tpl:24
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_servGeneric.inc:371
+#: plugins/admin/systems/class_printGeneric.inc:881
+#: plugins/admin/systems/class_componentGeneric.inc:268
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:418
-#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4242,31 +4400,44 @@ msgstr ""
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/class_goShareServer.inc:370
 #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:763
-#: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:488
-#: plugins/admin/fai/class_faiTemplate.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:704 plugins/admin/acl/acl_role.tpl:7
+#: plugins/admin/acl/class_aclRole.inc:938 plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
 #: plugins/admin/fai/faiPackage.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/class_faiScriptEntry.inc:179
 #: plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/class_faiPackage.inc:552
-#: plugins/admin/fai/class_faiProfile.inc:445
-#: plugins/admin/fai/class_faiHook.inc:493 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:531
+#: plugins/admin/fai/class_faiProfile.inc:451
+#: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/class_faiVariableEntry.inc:142
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#: plugins/admin/fai/class_faiPartitionTable.inc:528
+#: plugins/admin/fai/class_faiHookEntry.inc:188
 #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:392
+#: plugins/admin/fai/class_faiVariable.inc:416
+#: plugins/admin/fai/class_faiTemplateEntry.inc:247
 #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/gofon/macro/parameter.tpl:6
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:683
+#: html/getxls.php:223 html/getxls.php:290
 msgid "Name"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:575
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
+msgid "Blocklist"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
 msgid "Blocklist type"
 msgstr ""
 
@@ -4294,7 +4465,7 @@ msgstr ""
 #: plugins/admin/departments/class_divListDepartment.inc:42
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/systems/class_divListSystem.inc:64
 #: plugins/admin/systems/class_divListSystemService.inc:31
 #: plugins/admin/ogroups/class_divListOGroup.inc:60
 #: plugins/admin/acl/class_divListACL.inc:50
@@ -4326,9 +4497,10 @@ msgstr ""
 #: plugins/admin/users/class_divListUsers.inc:69
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:76
+#: plugins/admin/systems/class_divListSystem.inc:77
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
 #: plugins/gofon/macro/class_divListMacros.inc:57
 #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4339,243 +4511,113 @@ msgstr ""
 msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
-msgid "Go to root department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:98
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
-msgid "Root"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:100
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:120
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
-msgid "Go up one department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:100
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:299
-#: plugins/admin/fai/class_divListFai.inc:120
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:102
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
-msgid "Go to users department"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
+msgid "Create new blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:102
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:123
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
-msgid "Home"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
+msgid "New Blocklist"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:122
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/departments/class_divListDepartment.inc:79
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:125
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/conference/class_divListConferences.inc:87
-msgid "Reload list"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:190
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:121
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+msgid "Submit department"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:122
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:79
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
 #: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/systems/class_divListSystem.inc:121
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:126
-#: plugins/admin/fai/class_divListFai.inc:156
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:95
+#: plugins/admin/systems/class_divListSystem.inc:190
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:121
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
-msgid "Create new blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
-msgid "New Blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_divListSystem.inc:121
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:156
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:95
-msgid "Submit department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
-#: plugins/admin/systems/glpiPrinter.tpl:15
-#: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
-#: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:220
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/systems/glpiPrinter.tpl:18
+#: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
+#: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:160
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:256
-#: plugins/admin/fai/class_faiScript.inc:259
-#: plugins/admin/fai/class_faiTemplate.inc:236
-#: plugins/admin/fai/class_faiTemplate.inc:239
-#: plugins/admin/fai/class_faiHook.inc:261
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_divListFai.inc:221
-#: plugins/admin/fai/class_divListFai.inc:226
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:196
-#: 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:370 include/class_acl.inc:415
+#: plugins/admin/systems/class_divListSystem.inc:264
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:165
+#: plugins/admin/acl/class_divListACL.inc:187
+#: plugins/admin/acl/class_aclRole.inc:339
+#: plugins/admin/acl/class_aclRole.inc:384
+#: plugins/admin/fai/class_faiScript.inc:294
+#: plugins/admin/fai/class_faiScript.inc:296
+#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/fai/class_faiTemplate.inc:273
+#: plugins/admin/fai/class_faiHook.inc:295
+#: plugins/admin/fai/class_faiHook.inc:297
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
 msgid "edit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/users/class_divListUsers.inc:250
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:221
 msgid "Edit user"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/users/class_divListUsers.inc:266
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
-#: plugins/admin/systems/class_divListSystem.inc:162
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:260
-#: plugins/admin/fai/class_faiTemplate.inc:240
-#: plugins/admin/fai/class_faiHook.inc:265
-#: plugins/admin/fai/class_divListFai.inc:229
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
-#: plugins/gofon/macro/class_divListMacros.inc:111
-#: 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:371 include/class_acl.inc:416
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:273
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:175
+#: plugins/admin/acl/class_divListACL.inc:191
+#: plugins/admin/acl/class_aclRole.inc:340
+#: plugins/admin/acl/class_aclRole.inc:385
+#: plugins/admin/fai/class_faiScript.inc:298
+#: plugins/admin/fai/class_faiTemplate.inc:275
+#: plugins/admin/fai/class_faiHook.inc:299
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
 msgid "delete"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
-#: plugins/admin/users/class_divListUsers.inc:267
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:240
 msgid "Delete user"
 msgstr ""
 
@@ -4585,10 +4627,10 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
-#: plugins/admin/ogroups/phonequeue.tpl:47
-#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
+#: plugins/admin/ogroups/phonequeue.tpl:62
+#: plugins/admin/ogroups/class_phonequeue.inc:936 html/getxls.php:86
+#: html/getxls.php:281 setup/setup_step1.tpl:7
 msgid "Language"
 msgstr ""
 
@@ -4597,7 +4639,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:816
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Delivery format"
 msgstr ""
 
@@ -4618,12 +4660,12 @@ msgid "Deliver fax as mail to"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
 msgid "Deliver fax as mail"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -4679,104 +4721,108 @@ msgstr ""
 msgid "Add the list to the blocklists"
 msgstr ""
 
-#: plugins/gofax/faxaccount/main.inc:98
+#: plugins/gofax/faxaccount/main.inc:110
 msgid "FAX settings"
 msgstr ""
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:206
-#: plugins/addons/addressbook/address_info.tpl:88
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/addons/addressbook/address_info.tpl:171
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:134
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
 msgid "This account has no fax extensions."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:143
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
 msgid "Remove fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:144
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
 msgid "Create fax account"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:147
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:210
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
 msgid "You're trying to add an invalid phone number."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:419
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:500
-#: plugins/admin/groups/class_groupApplication.inc:644
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
+#: plugins/admin/groups/class_groupApplication.inc:674
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
 msgid "back"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:612
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
 #, php-format
 msgid "Removing of user/fax account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:627
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:631
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:641
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 msgid "The mail address you've entered is invalid."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:647
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:729
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
 #, php-format
 msgid "Saving of user/fax account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:800
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
 msgid "Fax account settings"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:809
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
 msgid "Enable/Disable fax"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:810
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
 msgid "Receive blocklist"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:811
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Send blocklist"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Alternate fax number"
 msgstr ""
 
+#: plugins/gofax/faxaccount/paste_generic.tpl:18
+msgid "Alternate fax numbers will not be copied"
+msgstr ""
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4784,7 +4830,7 @@ msgid "Filter"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/addressbook/contents.tpl:109
 #: plugins/addons/logview/contents.tpl:47
 #: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/gofon/fonreports/contents.tpl:6
@@ -4814,24 +4860,28 @@ msgid "during"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
+#: plugins/addons/logview/contents.tpl:68
 #: plugins/addons/mailqueue/contents.tpl:10
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+#: setup/setup_step4.tpl:72
 msgid "Search"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:790
-#: plugins/admin/ogroups/class_ogroupManagement.inc:378
-#: plugins/admin/fai/faiTemplateEntry.tpl:94
+#: plugins/admin/systems/class_printGeneric.inc:860
+#: plugins/admin/ogroups/class_ogroupManagement.inc:345
+#: plugins/admin/fai/faiTemplateEntry.tpl:110 setup/setup_step6.tpl:198
+#: setup/setup_step6.tpl:220
 msgid "User"
 msgstr ""
 
 #: plugins/gofax/faxreports/contents.tpl:31
+#: plugins/gofax/faxreports/class_faxreport.inc:486
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
+#: plugins/gofon/fonreports/class_fonreport.inc:399
 msgid "Date"
 msgstr ""
 
@@ -4872,18 +4922,22 @@ msgid "Date / Time"
 msgstr ""
 
 #: plugins/gofax/faxreports/detail.tpl:29
+#: plugins/gofax/faxreports/class_faxreport.inc:489
 msgid "Sender MSN"
 msgstr ""
 
 #: plugins/gofax/faxreports/detail.tpl:33
+#: plugins/gofax/faxreports/class_faxreport.inc:488
 msgid "Sender ID"
 msgstr ""
 
 #: plugins/gofax/faxreports/detail.tpl:37
+#: plugins/gofax/faxreports/class_faxreport.inc:491
 msgid "Receiver MSN"
 msgstr ""
 
 #: plugins/gofax/faxreports/detail.tpl:41
+#: plugins/gofax/faxreports/class_faxreport.inc:490
 msgid "Receiver ID"
 msgstr ""
 
@@ -4892,10 +4946,11 @@ msgid "Status message"
 msgstr ""
 
 #: plugins/gofax/faxreports/detail.tpl:53
+#: plugins/gofax/faxreports/class_faxreport.inc:494
 msgid "Transfer time"
 msgstr ""
 
-#: plugins/gofax/faxreports/main.inc:18
+#: plugins/gofax/faxreports/main.inc:14
 msgid "FAX reports"
 msgstr ""
 
@@ -4903,49 +4958,94 @@ msgstr ""
 msgid "FAX Reports"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:106
-#: plugins/gofax/faxreports/class_faxreport.inc:116
-msgid "Can't connect to fax database, no reports can be shown!"
+#: plugins/gofax/faxreports/class_faxreport.inc:108
+msgid ""
+"No fax extension defined in your server configuration, no reports can be "
+"shown!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofax/faxreports/class_faxreport.inc:111
+#: plugins/addons/logview/class_logview.inc:75
+#: plugins/gofon/fonreports/class_fonreport.inc:163
 msgid "There is no mysql extension available, please check your php setup."
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:120
-#: plugins/gofax/faxreports/class_faxreport.inc:125
+#: plugins/gofax/faxreports/class_faxreport.inc:118
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:122
 msgid "Can't select fax database for report generation!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:148
-#: plugins/gofax/faxreports/class_faxreport.inc:266
+#: plugins/gofax/faxreports/class_faxreport.inc:127
+msgid "Can't query fax table 'faxlog' for report generation!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
 msgid "Query for fax database failed!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:157
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-#: plugins/gofon/fonreports/class_fonreport.inc:202
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:389
-#: plugins/gofax/faxreports/class_faxreport.inc:390
+#: plugins/gofax/faxreports/class_faxreport.inc:309
+#: plugins/gofon/fonreports/class_fonreport.inc:204
+msgid "Insufficient permissions to view this attribute"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:309
+#: plugins/admin/groups/class_groupApplication.inc:427
+#: plugins/gofon/fonreports/class_fonreport.inc:204
+msgid "Insufficient permissions"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
 msgid "Fax report"
 msgstr ""
 
-#: plugins/gofax/faxreports/class_faxreport.inc:399
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
+msgid "All entries are readonly"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:479
+msgid "Fax reports"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
 msgid "Detailed view"
 msgstr ""
 
+#: plugins/gofax/faxreports/class_faxreport.inc:485
+msgid "Fax ID"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:486
+msgid "Time"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:492
+msgid "Number of pages"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:493
+msgid "Status Message"
+msgstr ""
+
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
-#: plugins/addons/addressbook/address_info.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:74
+#: plugins/addons/addressbook/address_info.tpl:53
 msgid "Private"
 msgstr ""
 
@@ -4960,48 +5060,48 @@ msgid ""
 "find 'Gonicus'. Use the filters below to narrow down your search."
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:47
+#: plugins/addons/addressbook/contents.tpl:48
 msgid "Add entry"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:743
+#: plugins/addons/addressbook/contents.tpl:54
+#: plugins/admin/groups/class_groupApplication.inc:756
 msgid "Edit entry"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:58
 msgid "Remove entry"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:75
 msgid "Select to see regular users"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:75
 msgid "Show organizational entries"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:76
 msgid "Select to see users in addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:76
 msgid "Show addressbook entries"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:77
+#: plugins/addons/addressbook/contents.tpl:84
 msgid "Display results for department"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:90
+#: plugins/addons/addressbook/contents.tpl:97
 msgid "Match object"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:93
+#: plugins/addons/addressbook/contents.tpl:100
 msgid "Choose the object that will be searched in"
 msgstr ""
 
-#: plugins/addons/addressbook/contents.tpl:105
+#: plugins/addons/addressbook/contents.tpl:112
 msgid "Search string"
 msgstr ""
 
@@ -5010,10 +5110,10 @@ msgid "Dial connection..."
 msgstr ""
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:374
-#: plugins/addons/addressbook/class_addressbook.inc:378
-#: plugins/addons/addressbook/class_addressbook.inc:460
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
 msgid "Dial"
 msgstr ""
 
@@ -5029,134 +5129,145 @@ msgid "Choose the department to store entry in"
 msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:24
-#: plugins/addons/addressbook/address_info.tpl:12
+#: plugins/addons/addressbook/address_info.tpl:18
 msgid "Personal"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:48
+#: plugins/addons/addressbook/class_addressbook.inc:807
+#: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
+#: html/getxls.php:298
 msgid "Initials"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:118
+#: plugins/addons/addressbook/address_info.tpl:83
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:46
 msgid "Email"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:119
-#: plugins/addons/addressbook/address_info.tpl:53
+#: plugins/addons/addressbook/address_edit.tpl:134
+#: plugins/addons/addressbook/address_info.tpl:99
 msgid "Organizational"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:128
-#: plugins/addons/addressbook/address_info.tpl:61
+#: plugins/addons/addressbook/address_edit.tpl:143
+#: plugins/addons/addressbook/address_info.tpl:109
 msgid "Company"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:148
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:167
+#: plugins/addons/addressbook/address_info.tpl:125 html/getxls.php:225
+#: html/getxls.php:298
 msgid "City"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:168
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/addons/addressbook/address_edit.tpl:191
+#: plugins/addons/addressbook/address_info.tpl:141
+#: plugins/admin/departments/class_departmentGeneric.inc:588
 msgid "Country"
 msgstr ""
 
-#: plugins/addons/addressbook/main.inc:37
+#: plugins/addons/addressbook/main.inc:36
 msgid "Address book"
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:6
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
 msgid "Addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:160
+#: plugins/addons/addressbook/class_addressbook.inc:173
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:164
+#: plugins/addons/addressbook/class_addressbook.inc:177
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:187
-#: plugins/addons/addressbook/class_addressbook.inc:657
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
 #, php-format
 msgid "Removing of addressbook entry '%s' failed."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:194
-#: plugins/addons/addressbook/class_addressbook.inc:295
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
 msgid "You are not allowed to delete this entry!"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:289
+#: plugins/addons/addressbook/class_addressbook.inc:313
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:384
+#: plugins/addons/addressbook/class_addressbook.inc:446
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:388
+#: plugins/addons/addressbook/class_addressbook.inc:452
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:565
 msgid "global addressbook"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:568
 msgid "user database"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:479
+#: plugins/addons/addressbook/class_addressbook.inc:572
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:481
+#: plugins/addons/addressbook/class_addressbook.inc:574
 msgid "Creating new entry in"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/logview/class_logview.inc:94
-#: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:305
-#: plugins/addons/mailqueue/class_mailqueue.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/logview/class_logview.inc:112
+#: plugins/addons/logview/class_logview.inc:133
+#: plugins/addons/mailqueue/class_mailqueue.inc:306
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "All"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:614
 msgid "Work phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:614
 msgid "Cell phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
 msgid "Home phone"
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:604
+#: plugins/addons/addressbook/class_addressbook.inc:704
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: plugins/addons/addressbook/class_addressbook.inc:612
-msgid ""
-"You have no permissions to create or modify a global address book entry."
+#: plugins/addons/addressbook/class_addressbook.inc:784
+msgid "Addressbook entry acls"
+msgstr ""
+
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
+msgid "Title"
+msgstr ""
+
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
+#: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
+msgid "Common name"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:2
@@ -5191,7 +5302,7 @@ msgstr ""
 msgid "Selected Template"
 msgstr ""
 
-#: plugins/addons/ldapmanager/main.inc:40
+#: plugins/addons/ldapmanager/main.inc:34
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 msgid "LDAP manager"
 msgstr ""
@@ -5201,49 +5312,49 @@ msgstr ""
 msgid "LDIF export"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:101
+#: plugins/addons/ldapmanager/class_csvimport.inc:98
 msgid "You've no permission to do CSV imports."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:161
+#: plugins/addons/ldapmanager/class_csvimport.inc:159
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:209
+#: plugins/addons/ldapmanager/class_csvimport.inc:207
 msgid "failed"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:213
+#: plugins/addons/ldapmanager/class_csvimport.inc:211
 msgid "ok"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:277
+#: plugins/addons/ldapmanager/class_csvimport.inc:275
 msgid "status"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:281
+#: plugins/addons/ldapmanager/class_csvimport.inc:279
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:319
+#: plugins/addons/ldapmanager/class_csvimport.inc:317
 msgid "Nothing to import!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:331
-#: plugins/addons/ldapmanager/class_csvimport.inc:342
-#: plugins/addons/ldapmanager/class_csvimport.inc:347
-#: plugins/addons/ldapmanager/class_import.inc:62
-#: plugins/addons/ldapmanager/class_import.inc:70
+#: plugins/addons/ldapmanager/class_csvimport.inc:329
+#: plugins/addons/ldapmanager/class_csvimport.inc:340
+#: plugins/addons/ldapmanager/class_csvimport.inc:345
+#: plugins/addons/ldapmanager/class_import.inc:61
+#: plugins/addons/ldapmanager/class_import.inc:69
 msgid "There is no file uploaded."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:336
-#: plugins/addons/ldapmanager/class_import.inc:55
+#: plugins/addons/ldapmanager/class_csvimport.inc:334
+#: plugins/addons/ldapmanager/class_import.inc:54
 msgid "The specified file is empty."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:490
+#: plugins/addons/ldapmanager/class_csvimport.inc:488
 msgid "The selected file does not contain any CSV Data..."
 msgstr ""
 
@@ -5275,11 +5386,11 @@ msgstr ""
 msgid "Import successful"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:41
-msgid "You've no permission to do LDAP imports."
+#: plugins/addons/ldapmanager/class_import.inc:45
+msgid "You need full access to all objects, to execute the import command."
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:108
+#: plugins/addons/ldapmanager/class_import.inc:102
 msgid "Unknown Error"
 msgstr ""
 
@@ -5324,18 +5435,27 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr ""
 
+#: plugins/addons/ldapmanager/class_ldif.inc:35
+msgid "Ldap manager"
+msgstr ""
+
+#: plugins/addons/ldapmanager/class_ldif.inc:41
+msgid "Ldap manager addon"
+msgstr ""
+
 #: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_export.inc:38
-#: plugins/addons/ldapmanager/class_exportxls.inc:39
-msgid "You've no permission to do LDAP exports."
+#: plugins/addons/ldapmanager/class_export.inc:77
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
+msgid "Error while exporting the requested entries!"
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_export.inc:83
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
-msgid "Error while exporting the requested entries!"
+#: plugins/addons/ldapmanager/class_export.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
+#, php-format
+msgid "You are not allowed to export the given ldap entry (%s)"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
@@ -5398,65 +5518,81 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:33
+#: plugins/addons/logview/main.inc:36
 msgid "System log view"
 msgstr ""
 
 #: plugins/addons/logview/class_logview.inc:6
+#: plugins/addons/logview/class_logview.inc:390
 msgid "System logs"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:63
+#: plugins/addons/logview/class_logview.inc:71
 msgid "No LOG servers defined!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:73
-#: plugins/addons/logview/class_logview.inc:168
+#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:182
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:77
-#: plugins/addons/logview/class_logview.inc:171
+#: plugins/addons/logview/class_logview.inc:92
+#: plugins/addons/logview/class_logview.inc:185
 msgid "Can't select log database for log generation!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:86
-#: plugins/addons/logview/class_logview.inc:103
+#: plugins/addons/logview/class_logview.inc:104
+msgid "Query for log database failed!. Requesting host names failed."
+msgstr ""
+
+#: plugins/addons/logview/class_logview.inc:125
 msgid "Query for log database failed!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "one hour"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "6 hours"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "12 hours"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "24 hours"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "2 days"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "one week"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:146
 msgid "2 weeks"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:146
 msgid "one month"
 msgstr ""
 
+#: plugins/addons/logview/class_logview.inc:163
+msgid "You have insufficient permissions to view syslog entries."
+msgstr ""
+
+#: plugins/addons/logview/class_logview.inc:384
+msgid "Log view"
+msgstr ""
+
+#: plugins/addons/logview/class_logview.inc:385
+msgid "Log view addon"
+msgstr ""
+
 #: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
 msgstr ""
@@ -5482,6 +5618,7 @@ msgid "Remove all messages from selected servers queue"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/class_mailqueue.inc:394
 msgid "Hold all messages"
 msgstr ""
 
@@ -5498,6 +5635,7 @@ msgid "Release all messages in selected servers queue"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/addons/mailqueue/class_mailqueue.inc:396
 msgid "Requeue all messages"
 msgstr ""
 
@@ -5526,47 +5664,48 @@ msgid "Error"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Active"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
 msgid "Delete this message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
 msgid "unhold"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
 msgid "Release message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
 msgid "hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
+#: plugins/addons/mailqueue/class_mailqueue.inc:398
 msgid "Hold message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
 msgid "requeue"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
 msgid "Requeue this message"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
 msgid "header"
 msgstr ""
 
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
 msgid "Display header from this message"
 msgstr ""
 
-#: plugins/addons/mailqueue/main.inc:38
+#: plugins/addons/mailqueue/main.inc:42
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr ""
@@ -5579,7 +5718,7 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:112
 #: plugins/addons/mailqueue/class_mailqueue.inc:171
-#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#: plugins/addons/mailqueue/class_mailqueue.inc:199
 #, php-format
 msgid ""
 "You do not have permission to execute the command '%s' on the mailqueue."
@@ -5588,43 +5727,83 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:93
 #: plugins/addons/mailqueue/class_mailqueue.inc:121
 #: plugins/addons/mailqueue/class_mailqueue.inc:181
-#: plugins/addons/mailqueue/class_mailqueue.inc:213
+#: plugins/addons/mailqueue/class_mailqueue.inc:214
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:225
+#: plugins/addons/mailqueue/class_mailqueue.inc:226
 msgid "There are no mail server specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:275
+#: plugins/addons/mailqueue/class_mailqueue.inc:276
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:277
+#: plugins/addons/mailqueue/class_mailqueue.inc:278
 msgid "down"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:320
+#: plugins/addons/mailqueue/class_mailqueue.inc:321
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/addons/mailqueue/class_mailqueue.inc:326
 msgid "hours"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:371
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:372
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:374
+#: plugins/addons/mailqueue/class_mailqueue.inc:375
 msgid "Not active"
 msgstr ""
 
+#: plugins/addons/mailqueue/class_mailqueue.inc:384
+msgid "Mailqueue"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:385
+msgid "Mailqueue addon"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:390
+msgid "Mail queue addon"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:393
+msgid "Unhold all messages"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:395
+msgid "Delete all messages"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:397
+msgid "Unhold message"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:399
+msgid "Delete message"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:400
+msgid "Requeue message"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:401
+msgid "Gathering queue data"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:402
+msgid "Get header information"
+msgstr ""
+
 #: plugins/addons/godfs/contents.tpl:8
 msgid "DFS Shares"
 msgstr ""
@@ -5681,16 +5860,36 @@ msgstr ""
 msgid "Go up one dfsshare"
 msgstr ""
 
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/admin/acl/class_aclRole.inc:337
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr ""
+
 #: plugins/addons/godfs/class_dfsManagment.inc:214
 msgid "Go to dfs root"
 msgstr ""
 
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr ""
+
 #: plugins/addons/godfs/class_dfsManagment.inc:215
 msgid "Create new dfsshare"
 msgstr ""
 
 #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:23
+#: ihtml/themes/default/copyPasteDialog.tpl:28
 msgid "Finish"
 msgstr ""
 
@@ -5733,45 +5932,6 @@ msgstr ""
 msgid "Distributed File System Administration"
 msgstr ""
 
-#: plugins/addons/notifications/main.inc:42
-#: plugins/addons/notifications/class_msgplug.inc:6
-msgid "Notifications"
-msgstr ""
-
-#: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:902 include/class_acl.inc:164
-#: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr ""
-
-#: plugins/addons/notifications/class_msgplug.inc:104
-msgid "You have no permissions to send a message!"
-msgstr ""
-
-#: plugins/addons/notifications/class_msgplug.inc:108
-msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
-msgstr ""
-
-#: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:171
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_servGeneric.inc:80
-#: plugins/admin/systems/class_workstationGeneric.inc:144
-#: plugins/admin/ogroups/class_termgroup.inc:216
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr ""
-
-#: plugins/addons/notifications/class_msgplug.inc:122
-msgid "Please specify at least one recipient to send a message!"
-msgstr ""
-
-#: plugins/addons/notifications/class_msgplug.inc:214
-msgid "No DESC tag in message file:"
-msgstr ""
-
 #: plugins/addons/notifications/contents.tpl:2
 msgid "Notification target"
 msgstr ""
@@ -5798,38 +5958,89 @@ msgstr ""
 msgid "List message recipients"
 msgstr ""
 
-#: plugins/addons/notifications/contents.tpl:57
+#: plugins/addons/notifications/contents.tpl:60
 msgid "Send message"
 msgstr ""
 
-#: plugins/addons/notifications/contents.tpl:68
+#: plugins/addons/notifications/contents.tpl:72
 msgid "Notification send!"
 msgstr ""
 
-#: plugins/addons/notifications/contents.tpl:71
+#: plugins/addons/notifications/contents.tpl:75
 msgid ""
 "Your message has been sent successfully. Press the continue button to get "
 "back to the notification plugin."
 msgstr ""
 
-#: plugins/addons/notifications/contents.tpl:74
+#: plugins/addons/notifications/contents.tpl:78
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:441
-#: plugins/admin/departments/class_departmentGeneric.inc:526
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:564
 #: 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:595
-#: plugins/admin/fai/class_faiManagement.inc:601
-#: plugins/admin/fai/faiPackageNew.tpl:50
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/snapshotdialog.tpl:87
 msgid "Continue"
 msgstr ""
 
+#: plugins/addons/notifications/main.inc:46
+#: plugins/addons/notifications/class_msgplug.inc:6
+msgid "Notifications"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:35
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
+#: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
+msgid "Groups"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:93
+msgid "You have no permissions to send a message!"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:97
+msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:105
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:107
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:111
+msgid "Please specify at least one recipient to send a message!"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:207
+msgid "No DESC tag in message file:"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:234
+msgid "Notification"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:235
+#: plugins/addons/notifications/class_msgplug.inc:240
+msgid "Notification plugin"
+msgstr ""
+
+#: plugins/addons/notifications/class_msgplug.inc:243
+msgid "Allow sending notifications"
+msgstr ""
+
 #: plugins/admin/groups/mail.tpl:13 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
 msgstr ""
@@ -5864,7 +6075,7 @@ msgstr ""
 
 #: plugins/admin/groups/generic.tpl:6 plugins/admin/groups/paste_generic.tpl:5
 #: plugins/admin/ogroups/generic.tpl:7
-#: plugins/admin/ogroups/class_ogroup.inc:738
+#: plugins/admin/ogroups/paste_generic.tpl:4
 msgid "Group name"
 msgstr ""
 
@@ -5876,10 +6087,6 @@ msgstr ""
 msgid "Descriptive text for this group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:34 plugins/admin/ogroups/generic.tpl:29
-msgid "Choose subtree to place group in"
-msgstr ""
-
 #: plugins/admin/groups/generic.tpl:53
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
@@ -5925,113 +6132,108 @@ msgstr ""
 msgid "Group administration"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:241
+#: plugins/admin/groups/class_groupManagement.inc:243
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:247
-#: plugins/admin/groups/class_groupManagement.inc:278
+#: plugins/admin/groups/class_groupManagement.inc:249
+#: plugins/admin/groups/class_groupManagement.inc:281
 msgid "You are not allowed to delete this group!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:122
+#: plugins/admin/groups/class_groupGeneric.inc:124
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:173
+#: plugins/admin/groups/class_groupGeneric.inc:177
 msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:339
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:340
+#: plugins/admin/groups/class_groupGeneric.inc:319
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:345
+#: plugins/admin/groups/class_groupGeneric.inc:324
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:458
+#: plugins/admin/groups/class_groupGeneric.inc:437
 msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:495
+#: plugins/admin/groups/class_groupGeneric.inc:474
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:524
-#: plugins/admin/groups/class_groupGeneric.inc:732
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
 #, php-format
 msgid "Removing of groups/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:642
+#: plugins/admin/groups/class_groupGeneric.inc:628
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:647
+#: plugins/admin/groups/class_groupGeneric.inc:633
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:758
-#: plugins/admin/ogroups/class_ogroup.inc:657
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:768
+#: plugins/admin/groups/class_groupGeneric.inc:750
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:779
-#: plugins/admin/groups/class_groupGeneric.inc:793
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
 msgid "Value specified as 'Name' is already used."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:879
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:909
+#: plugins/admin/groups/class_groupGeneric.inc:891
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:910
+#: plugins/admin/groups/class_groupGeneric.inc:892
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:913
+#: plugins/admin/groups/class_groupGeneric.inc:895
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:914
+#: plugins/admin/groups/class_groupGeneric.inc:896
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:915
+#: plugins/admin/groups/class_groupGeneric.inc:897
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:916
+#: plugins/admin/groups/class_groupGeneric.inc:898 setup/setup_step6.tpl:18
 msgid "Samba SID"
 msgstr ""
 
@@ -6055,78 +6257,100 @@ msgstr ""
 msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:542
-#: include/class_acl.inc:633
+#: plugins/admin/groups/class_groupMail.inc:288
+#: plugins/admin/acl/class_aclRole.inc:546
+#: plugins/admin/acl/class_aclRole.inc:637 include/class_acl.inc:612
+#: include/class_acl.inc:703
 msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:285
+#: plugins/admin/groups/class_groupMail.inc:289
 msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/admin/groups/class_groupMail.inc:290
 msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:291
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:543
-#: include/class_acl.inc:635
+#: plugins/admin/groups/class_groupMail.inc:292
+#: plugins/admin/acl/class_aclRole.inc:547
+#: plugins/admin/acl/class_aclRole.inc:639 include/class_acl.inc:613
+#: include/class_acl.inc:705
 msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/admin/groups/class_groupMail.inc:293
+#: plugins/admin/users/class_userManagement.inc:449
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroup.inc:291
+msgid "none"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:331
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:394
+#: plugins/admin/groups/class_groupMail.inc:353
+msgid ""
+"Remove shared folder from mail server database when entry gets removed in "
+"LDAP"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:354
+msgid "Remove the shared folder and all its contents after saving this account"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:413
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:395
+#: plugins/admin/groups/class_groupMail.inc:414
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:653
+#: plugins/admin/groups/class_groupMail.inc:680
 #, php-format
 msgid "Removing of groups/mail with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:825
+#: plugins/admin/groups/class_groupMail.inc:876
 #, php-format
 msgid "Saving of groups/mail with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:905
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:887
+#: plugins/admin/groups/class_groupMail.inc:938
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:891
+#: plugins/admin/groups/class_groupMail.inc:942
 msgid "Please select a valid mail server."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1029
+#: plugins/admin/groups/class_groupMail.inc:1089
 msgid "Group mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1037
+#: plugins/admin/groups/class_groupMail.inc:1097
 msgid "Alternate addresses"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1038
+#: plugins/admin/groups/class_groupMail.inc:1098
 msgid "Forwarding addresses"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1041
-#: plugins/admin/systems/printer.tpl:63
-#: plugins/admin/systems/class_printGeneric.inc:816
+#: plugins/admin/groups/class_groupMail.inc:1101
+#: plugins/admin/systems/printer.tpl:82
+#: plugins/admin/systems/class_printGeneric.inc:887
 msgid "Permissions"
 msgstr ""
 
@@ -6148,7 +6372,7 @@ msgid "Select users to add"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:66
+#: plugins/admin/systems/class_divListSystem.inc:67
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
@@ -6166,136 +6390,153 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:395
+#: plugins/admin/groups/class_groupApplication.inc:407
 msgid "This 'dn' is no appgroup."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:403
+#: plugins/admin/groups/class_groupApplication.inc:415
 msgid "Remove applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:404
+#: plugins/admin/groups/class_groupApplication.inc:416
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:406
+#: plugins/admin/groups/class_groupApplication.inc:418
 msgid "Create applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:407
+#: plugins/admin/groups/class_groupApplication.inc:419
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:420
+#: plugins/admin/groups/class_groupApplication.inc:426
+#: plugins/admin/acl/class_divListACL.inc:231
+#: plugins/admin/acl/class_divListACL.inc:232
+#: plugins/admin/acl/class_divListACL.inc:237 include/class_tabs.inc:302
+msgid "ACL"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:429
+msgid ""
+"You do not have permission to query application entries. All your changes "
+"will not be saved."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:442
 msgid "Invalid character in category name."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:428
+#: plugins/admin/groups/class_groupApplication.inc:450
 msgid "The specified category already exists."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:562
+#: plugins/admin/groups/class_groupApplication.inc:594
 msgid "The selected application has no options."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:650
-#: plugins/admin/departments/class_divListDepartment.inc:137
+#: plugins/admin/groups/class_groupApplication.inc:682
+#: plugins/admin/departments/class_divListDepartment.inc:147
 msgid "department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:658
+#: plugins/admin/groups/class_groupApplication.inc:691
 msgid "application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:694
-#: plugins/admin/groups/class_groupApplication.inc:736
+#: plugins/admin/groups/class_groupApplication.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:748
 msgid "Delete entry"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:696
-#: plugins/admin/groups/class_groupApplication.inc:731
+#: plugins/admin/groups/class_groupApplication.inc:709
+#: plugins/admin/groups/class_groupApplication.inc:743
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:699
-#: plugins/admin/groups/class_groupApplication.inc:734
+#: plugins/admin/groups/class_groupApplication.inc:712
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "Move down"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:729
+#: plugins/admin/groups/class_groupApplication.inc:741
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:769
+#: plugins/admin/groups/class_groupApplication.inc:786
 msgid "This application is no longer available."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:772
+#: plugins/admin/groups/class_groupApplication.inc:789
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:776
+#: plugins/admin/groups/class_groupApplication.inc:793
 msgid "Check parameter"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:778
+#: plugins/admin/groups/class_groupApplication.inc:795
 msgid "This application has changed parameters."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:871
+#: plugins/admin/groups/class_groupApplication.inc:916
 #, php-format
 msgid "Removing of groups/applications with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:916
+#: plugins/admin/groups/class_groupApplication.inc:969
 #, php-format
 msgid "Saving of groups/applications with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:960
+#: plugins/admin/groups/class_groupApplication.inc:1020
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:1103
+#: plugins/admin/groups/class_groupApplication.inc:1025
+msgid ""
+"There are no releases available. You will not be able to select another "
+"release."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:1166
 msgid "Group applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:1110
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:513
-#: plugins/admin/applications/class_divListApplication.inc:144
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_groupApplication.inc:1173
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:1111
+#: plugins/admin/groups/class_groupApplication.inc:1174
 #: plugins/admin/systems/workstationStartup.tpl:53
 #: plugins/admin/systems/workstationStartup.tpl:87
-#: plugins/admin/systems/servRepositorySetup.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33
-#: plugins/admin/fai/class_faiPackage.inc:557
-#: plugins/admin/fai/faiPackageNew.tpl:21
-#: plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/systems/servRepositorySetup.tpl:19
+#: plugins/admin/systems/class_servRepository.inc:252
+#: plugins/admin/fai/faiPackage.tpl:37
+#: plugins/admin/fai/class_faiPackage.inc:537
 msgid "Release"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:1112
+#: plugins/admin/groups/class_groupApplication.inc:1175
 msgid "Application parameter"
 msgstr ""
 
@@ -6321,8 +6562,8 @@ msgstr ""
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
 #: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/gofon/conference/generic.tpl:4
+#: plugins/admin/fai/faiScriptEntry.tpl:33
+#: plugins/gofon/conference/generic.tpl:5
 msgid "Properties"
 msgstr ""
 
@@ -6370,59 +6611,62 @@ msgstr ""
 msgid "Create new group"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
 msgid "Posix"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:184
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:214
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/acl/class_divListACL.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:184
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:214
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/acl/class_divListACL.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:191
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:216
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/acl/class_divListACL.inc:160
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:191
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:216
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/acl/class_divListACL.inc:160
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:196
-#: plugins/gofon/conference/class_divListConferences.inc:124
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
-#: plugins/gofon/conference/class_divListConferences.inc:127
-#: plugins/gofon/conference/class_divListConferences.inc:129
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
 msgid "Delete this entry"
 msgstr ""
 
@@ -6448,32 +6692,25 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:193
-#: plugins/admin/users/class_userManagement.inc:273
+#: plugins/admin/users/class_userManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:276
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:309
+#: plugins/admin/users/class_userManagement.inc:311
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:340
+#: plugins/admin/users/class_userManagement.inc:341
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:448
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:291
-msgid "none"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:468
 msgid "Please select a valid template."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:560
+#: plugins/admin/users/class_userManagement.inc:561
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -6489,12 +6726,12 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:768
-#: plugins/admin/fai/class_faiTemplate.inc:451
+#: plugins/admin/systems/class_systemManagement.inc:1028
+#: plugins/admin/fai/class_faiTemplate.inc:500
 msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+#: plugins/admin/users/main.inc:42 plugins/admin/users/main.inc:48
 msgid "User administration"
 msgstr ""
 
@@ -6566,113 +6803,105 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/class_divListUsers.inc:121
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/class_divListUsers.inc:121
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:123
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:123
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:173
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/users/class_divListUsers.inc:174
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:178
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:180
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:182
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:186
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:188
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/users/class_divListUsers.inc:189
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:190
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:254
+#: plugins/admin/users/class_divListUsers.inc:225
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:258
+#: plugins/admin/users/class_divListUsers.inc:229
 msgid "You are not allowed to change the password for this user."
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:243
 msgid "You are not allowed to remove this user."
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:289
-msgid "Online"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:296
-msgid "Offline"
-msgstr ""
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:479
+#: plugins/admin/applications/class_applicationGeneric.inc:495
 #: plugins/admin/applications/class_divListApplication.inc:51
 msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:15
-#: plugins/gofon/macro/generic.tpl:10
-#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:14
+#: plugins/gofon/macro/class_gofonMacro.inc:545 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Display name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:519
-#: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
-#: plugins/admin/systems/workstation.tpl:103
-#: plugins/admin/systems/goMailServer.tpl:160
-#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
+#: plugins/admin/systems/goMailServer.tpl:215
+#: plugins/admin/systems/goImapServer.tpl:110
 #: plugins/admin/ogroups/termgroup.tpl:101
-#: plugins/admin/fai/faiTemplateEntry.tpl:89
+#: plugins/admin/fai/faiTemplateEntry.tpl:105
 msgid "Execute"
 msgstr ""
 
@@ -6685,114 +6914,118 @@ msgstr ""
 msgid "Choose subtree to place application in"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:64
-#: plugins/admin/applications/class_applicationGeneric.inc:521
-#: plugins/admin/mimetypes/generic.tpl:66
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/applications/generic.tpl:66
+#: plugins/admin/applications/class_applicationGeneric.inc:537
+#: plugins/admin/mimetypes/generic.tpl:67
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
 msgid "Icon"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:76
-#: plugins/admin/mimetypes/generic.tpl:78
+#: plugins/admin/applications/generic.tpl:78
+#: plugins/admin/mimetypes/generic.tpl:79
 msgid "Update"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:76
+#: plugins/admin/applications/generic.tpl:78
 msgid "Reload picture from LDAP"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:94
-#: plugins/admin/applications/class_applicationGeneric.inc:525
-msgid "Only executable for members"
+#: plugins/admin/applications/generic.tpl:81
+msgid "Remove picture from LDAP"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:99
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:541
+msgid "Only executable for members"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
 msgid "Replace user configuration on startup"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:105
-#: plugins/admin/applications/class_applicationGeneric.inc:526
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
 msgid "Place icon on members desktop"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:110
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
 msgid "Place entry in members startmenu"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:115
-#: plugins/admin/applications/class_applicationGeneric.inc:527
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
 msgid "Place entry in members launch bar"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:133
+#: plugins/admin/applications/generic.tpl:138
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
-#: plugins/admin/fai/faiTemplateEntry.tpl:40
+#: plugins/admin/fai/faiTemplateEntry.tpl:49
 msgid "Upload"
 msgstr ""
 
-#: plugins/admin/applications/generic.tpl:135
-#: plugins/admin/fai/class_faiScript.inc:269
-#: plugins/admin/fai/class_faiTemplate.inc:252
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:308
+#: plugins/admin/fai/class_faiTemplate.inc:285
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:274
+#: plugins/admin/fai/class_faiHook.inc:309
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
+#: plugins/admin/applications/class_applicationParameters.inc:54
 msgid "Remove options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:53
+#: plugins/admin/applications/class_applicationParameters.inc:55
 msgid "This application has options. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:55
+#: plugins/admin/applications/class_applicationParameters.inc:57
 msgid "Create options"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:56
+#: plugins/admin/applications/class_applicationParameters.inc:58
 msgid ""
 "This application has options disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/admin/fai/class_faiVariable.inc:384
+#: plugins/admin/applications/class_applicationParameters.inc:98
+#: plugins/admin/fai/class_faiVariable.inc:408
 msgid "Variable"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/gofon/macro/parameter.tpl:9
+#: plugins/admin/applications/class_applicationParameters.inc:98
+#: plugins/gofon/macro/parameter.tpl:10
 msgid "Default value"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:128
+#: plugins/admin/applications/class_applicationParameters.inc:130
 msgid "Add option"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:157
+#: plugins/admin/applications/class_applicationParameters.inc:159
 #, php-format
 msgid "Removing of application parameters with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:188
+#: plugins/admin/applications/class_applicationParameters.inc:190
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:219
+#: plugins/admin/applications/class_applicationParameters.inc:221
 #, php-format
 msgid "Saving of application parameters with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:231
+#: plugins/admin/applications/class_applicationParameters.inc:233
 msgid "Parameter configuration"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationParameters.inc:239
+#: plugins/admin/applications/class_applicationParameters.inc:241
 msgid "Application parameter settings"
 msgstr ""
 
@@ -6809,76 +7042,72 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:96
+#: plugins/admin/applications/class_applicationGeneric.inc:101
 msgid "no example"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:127
+#: plugins/admin/applications/class_applicationGeneric.inc:126
 msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:223
+#: plugins/admin/applications/class_applicationGeneric.inc:227
 #, php-format
 msgid "Removing of application with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:235
+#: plugins/admin/applications/class_applicationGeneric.inc:239
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:242
+#: plugins/admin/applications/class_applicationGeneric.inc:246
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:284
+#: plugins/admin/applications/class_applicationGeneric.inc:297
 msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:356
+#: plugins/admin/applications/class_applicationGeneric.inc:372
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:368
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:373
+#: plugins/admin/applications/class_applicationGeneric.inc:389
 msgid "Required field 'Name' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:377
+#: plugins/admin/applications/class_applicationGeneric.inc:393
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:381
+#: plugins/admin/applications/class_applicationGeneric.inc:397
 msgid "Required field 'Execute' is not filled."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:396
-#: plugins/admin/applications/class_applicationGeneric.inc:404
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:450
+#: plugins/admin/applications/class_applicationGeneric.inc:466
 #, php-format
 msgid "Saving of application with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:475
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 msgid "Application settings"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:508
+#: plugins/admin/applications/class_applicationGeneric.inc:524
 msgid "Application generic"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:522
+#: plugins/admin/applications/class_applicationGeneric.inc:538
 msgid "Flag"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/applications/class_applicationGeneric.inc:539
 msgid "Script content"
 msgstr ""
 
@@ -6907,13 +7136,13 @@ msgid ""
 "working with a large number of applications."
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:122
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
 msgid "new"
 msgstr ""
 
-#: plugins/admin/applications/class_divListApplication.inc:113
+#: plugins/admin/applications/class_divListApplication.inc:131
 msgid "Create new application"
 msgstr ""
 
@@ -6929,6 +7158,18 @@ msgstr ""
 msgid "Current release"
 msgstr ""
 
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:35
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -6938,12 +7179,12 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:19
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:93
 msgid "Descriptive text for department"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:554
+#: plugins/admin/departments/class_departmentGeneric.inc:593
 msgid "Category"
 msgstr ""
 
@@ -6952,7 +7193,7 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:127
+#: plugins/gofon/conference/generic.tpl:177
 msgid "Choose subtree to place department in"
 msgstr ""
 
@@ -6968,20 +7209,20 @@ msgstr ""
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:87
+#: plugins/admin/departments/generic.tpl:86
 msgid "Base telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:95
+#: plugins/admin/departments/generic.tpl:94
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:110
-#: plugins/admin/departments/class_departmentGeneric.inc:557
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:596
 msgid "Administrative settings"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:112
+#: plugins/admin/departments/generic.tpl:119
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
@@ -7010,119 +7251,101 @@ msgid ""
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr ""
-
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
 #: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:183
+#: plugins/admin/departments/class_departmentGeneric.inc:190
 #, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:232
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:239
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
 msgid "Department with that 'Name' already exists."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/admin/departments/class_departmentGeneric.inc:261
 msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:253
+#: plugins/admin/departments/class_departmentGeneric.inc:265
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:305
+#: plugins/admin/departments/class_departmentGeneric.inc:319
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:351
+#: plugins/admin/departments/class_departmentGeneric.inc:368
 #, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:393
+#: plugins/admin/departments/class_departmentGeneric.inc:421
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:471
+#: plugins/admin/departments/class_departmentGeneric.inc:506
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:507
-#: include/class_ldap.inc:455 include/class_acl.inc:500
-#: include/class_acl.inc:507 include/class_acl.inc:514
-#: include/class_acl.inc:520 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:54
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: plugins/admin/acl/class_aclRole.inc:504
+#: plugins/admin/acl/class_aclRole.inc:511
+#: plugins/admin/acl/class_aclRole.inc:518
+#: plugins/admin/acl/class_aclRole.inc:524 include/class_ldap.inc:458
+#: include/class_acl.inc:570 include/class_acl.inc:577
+#: include/class_acl.inc:584 include/class_acl.inc:590
+#: ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:510
+#: plugins/admin/departments/class_departmentGeneric.inc:547
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:579
+#: plugins/admin/departments/class_departmentGeneric.inc:584
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:552
+#: plugins/admin/departments/class_departmentGeneric.inc:591
 #: plugins/admin/systems/workstationService.tpl:89
-#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:79
 #: plugins/gofon/phoneaccount/generic.tpl:32
 #: plugins/gofon/phoneaccount/generic.tpl:34
 #: plugins/gofon/phoneaccount/paste_generic.tpl:29
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:553
+#: plugins/admin/departments/class_departmentGeneric.inc:592
 #: plugins/admin/departments/class_divListDepartment.inc:41
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:353
 msgid ".."
 msgstr ""
 
@@ -7142,13 +7365,28 @@ msgstr ""
 msgid "Regular expression for matching department names"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/fai/class_divListFai.inc:123
-msgid "Go to users home department"
+#: plugins/admin/departments/class_divListDepartment.inc:94
+msgid "Create new department"
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+msgid "You are currently moving/renaming this department."
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:84
-msgid "Create new department"
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:1
@@ -7159,39 +7397,38 @@ msgstr ""
 msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:13
+#: plugins/admin/systems/network.tpl:17
 msgid "MAC-address"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:19
+#: plugins/admin/systems/network.tpl:29
 msgid "Autodetect"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:41
+#: plugins/admin/systems/network.tpl:58
 msgid "Enable DNS for this device"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/class_servDNS.inc:404
+#: plugins/admin/systems/network.tpl:59
+#: plugins/admin/systems/class_servDNS.inc:403
 #: plugins/admin/systems/servdnseditzone.tpl:67
-#: plugins/admin/fai/faiPackageNew.tpl:31
-#: plugins/gofon/phoneaccount/generic.tpl:84
+#: plugins/gofon/phoneaccount/generic.tpl:95
 msgid "Refresh"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:50
+#: plugins/admin/systems/network.tpl:67
 msgid "Zone"
 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/network.tpl:77
+#: plugins/admin/systems/class_servDNS.inc:168
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/class_termDNS.inc:571
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:63
+#: plugins/admin/systems/network.tpl:85
 msgid "Dns records"
 msgstr ""
 
@@ -7201,10 +7438,10 @@ msgid "present"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
-#: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:230
-#: plugins/admin/systems/class_workstationStartup.inc:470
+#: plugins/admin/systems/class_terminalService.inc:261
+#: plugins/admin/systems/class_terminalStartup.inc:162
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -7237,40 +7474,90 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/class_goLdapServer.inc:47
-msgid "LDAP Service"
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:70
-msgid "Terminal Service"
+#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
+#: plugins/admin/systems/workstation.tpl:44
+#: plugins/admin/systems/class_terminalGeneric.inc:549
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:75
-#: plugins/admin/systems/class_goTerminalServer.inc:231
-#: plugins/admin/systems/goTerminalServer.tpl:6
-msgid "Temporary disable login"
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
 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"
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:537
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:91
-#: plugins/admin/systems/goSyslogServer.tpl:1
-msgid "Syslog Service"
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+msgid "Choose server to use for logging"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:99
-#: plugins/admin/systems/goCupsServer.tpl:1
-msgid "Print Service"
+#: plugins/admin/systems/terminal.tpl:66
+#: plugins/admin/systems/class_terminalGeneric.inc:550
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/class_terminalGeneric.inc:551
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:79
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -7327,7 +7614,7 @@ msgstr ""
 
 #: plugins/admin/systems/info.tpl:73
 #: plugins/admin/systems/workstationService.tpl:107
-#: plugins/admin/systems/terminalService.tpl:83
+#: plugins/admin/systems/terminalService.tpl:95
 msgid "Graphic device"
 msgstr ""
 
@@ -7356,8 +7643,9 @@ msgid "SSH service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:119
-#: plugins/admin/systems/class_goCupsServer.inc:26
-#: plugins/admin/systems/class_goCupsServer.inc:46
+#: plugins/admin/systems/class_goCupsServer.inc:28
+#: plugins/admin/systems/class_goCupsServer.inc:43
+#: plugins/admin/systems/class_goCupsServer.inc:64
 msgid "Print service"
 msgstr ""
 
@@ -7373,52 +7661,51 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_winGeneric.inc:89
 #: plugins/admin/systems/class_componentGeneric.inc:50
 msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:126
+#: plugins/admin/systems/class_winGeneric.inc:147
 #, php-format
 msgid "Removing of system wingeneric/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:164
-#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:197
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: 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:631
-#: plugins/admin/systems/class_componentGeneric.inc:165
-#: plugins/admin/systems/class_phoneGeneric.inc:312
+#: plugins/admin/systems/class_winGeneric.inc:207
+#: plugins/admin/systems/class_terminalGeneric.inc:435
+#: plugins/admin/systems/class_servGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:674
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:224
+#: plugins/admin/systems/class_winGeneric.inc:261
 #, php-format
 msgid "Saving of system wingeneric/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:235
+#: plugins/admin/systems/class_winGeneric.inc:272
 msgid "Win generic"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:236
+#: plugins/admin/systems/class_winGeneric.inc:273
 msgid "Windows workstation generic"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:241
+#: plugins/admin/systems/class_winGeneric.inc:278
 msgid "Win workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:244
+#: plugins/admin/systems/class_winGeneric.inc:281
 #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:474
+#: plugins/admin/systems/class_workstationGeneric.inc:533
 msgid "Workstation name"
 msgstr ""
 
@@ -7426,131 +7713,40 @@ msgstr ""
 msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
-#: 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"
-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:47
-#: plugins/admin/ogroups/class_termgroup.inc:397
-msgid "Mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:36 plugins/admin/systems/server.tpl:34
-#: plugins/admin/systems/workstation.tpl:41
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-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:58
-#: plugins/admin/ogroups/class_termgroup.inc:398
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:44
-#: plugins/admin/systems/workstation.tpl:49
-#: plugins/admin/ogroups/termgroup.tpl:61
-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 ""
-
-#: plugins/admin/systems/terminal.tpl:61
-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 ""
-
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:86
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Inherit time server attributes"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:90
-#: plugins/admin/systems/workstation.tpl:69
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:92
-#: plugins/admin/systems/workstation.tpl:71
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:115 plugins/admin/systems/server.tpl:50
-#: plugins/admin/systems/workstation.tpl:93
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:119
-#: plugins/admin/systems/workstation.tpl:97
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_terminalService.inc:71
 #: plugins/admin/systems/class_workstationService.inc:92
 #: plugins/admin/systems/workstationService.tpl:157
 msgid "unknown"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
+#: plugins/admin/systems/class_terminalService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
 #: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
 #: plugins/admin/systems/class_terminalStartup.inc:39
-#: plugins/admin/systems/class_terminalStartup.inc:121
-#: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:783
+#: plugins/admin/systems/class_terminalStartup.inc:122
+#: plugins/admin/systems/class_terminalStartup.inc:142
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:829
 #: plugins/admin/systems/class_workstationService.inc:201
 #: plugins/admin/systems/class_workstationService.inc:204
 #: plugins/admin/systems/class_workstationService.inc:207
@@ -7568,10 +7764,10 @@ msgstr ""
 msgid "inherited"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
 #: plugins/admin/systems/class_terminalService.inc:103
 #: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
 #: plugins/admin/systems/class_workstationService.inc:95
 #: plugins/admin/systems/class_workstationService.inc:96
 #: plugins/admin/systems/class_workstationService.inc:97
@@ -7579,208 +7775,232 @@ msgstr ""
 msgid "bit"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:155
+#: plugins/admin/systems/class_terminalService.inc:157
 msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_terminalService.inc:158
 #: plugins/admin/systems/class_workstationService.inc:138
 msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_terminalService.inc:159
 #: plugins/admin/systems/class_workstationService.inc:139
 msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_terminalService.inc:162
 #: plugins/admin/systems/class_workstationService.inc:142
 msgid "load balanced"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_terminalService.inc:165
 #: plugins/admin/systems/class_workstationService.inc:145
 msgid "Windows RDP"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_terminalService.inc:166
 #: plugins/admin/systems/class_workstationService.inc:146
 msgid "ICA client"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_terminalService.inc:221
 #: plugins/admin/systems/class_workstationService.inc:204
 msgid "Bit"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_terminalService.inc:316
 #: plugins/admin/systems/class_workstationService.inc:314
 msgid "Choose the phone located at the current terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:365
-#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
 #: plugins/admin/systems/class_workstationService.inc:380
 #: plugins/admin/systems/class_workstationService.inc:385
 msgid "Please specify a valid VSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:380
-#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
 #: plugins/admin/systems/class_workstationService.inc:395
 #: plugins/admin/systems/class_workstationService.inc:400
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:416
+#: plugins/admin/systems/class_terminalService.inc:457
 #, php-format
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_terminalService.inc:466
 #: plugins/admin/systems/class_workstationService.inc:451
 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/class_terminalService.inc:467
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
 #: plugins/admin/systems/goTerminalServer.tpl:1
 msgid "Terminal service"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_terminalService.inc:475
 #: plugins/admin/systems/class_workstationService.inc:460
 msgid "Monitor"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:435
-#: plugins/admin/ogroups/class_phonequeue.inc:748
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:937
 msgid "Method"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:436
-#: plugins/admin/systems/terminalService.tpl:141
+#: plugins/admin/systems/class_terminalService.inc:477
+#: plugins/admin/systems/terminalService.tpl:173
 msgid "Remote desktop"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_terminalService.inc:478
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+msgid "Font path"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:479
 #: plugins/admin/systems/class_workstationService.inc:461
 msgid "Gfx driver"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_terminalService.inc:480
 #: plugins/admin/systems/class_workstationService.inc:462
 msgid "Gfx resolution"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_terminalService.inc:481
 #: plugins/admin/systems/class_workstationService.inc:463
 msgid "Gfx color depth"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_terminalService.inc:482
 #: plugins/admin/systems/class_workstationService.inc:464
 msgid "Hsync"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_terminalService.inc:483
 #: plugins/admin/systems/class_workstationService.inc:465
 msgid "Vsync"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:443
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
 msgid "Printer service enabled"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/terminalService.tpl:189
+#: plugins/admin/systems/class_terminalService.inc:486
+#: plugins/admin/systems/terminalService.tpl:229
 msgid "Spool server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_terminalService.inc:487
 #: plugins/admin/systems/class_workstationService.inc:467
 msgid "Scanner enabled"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:446
+#: plugins/admin/systems/class_terminalService.inc:488
 msgid "Scanner model"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+msgid "..."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:491
 #: plugins/admin/systems/class_workstationService.inc:468
 msgid "Keyboard model"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_terminalService.inc:492
 #: plugins/admin/systems/class_workstationService.inc:469
 msgid "Keyboard layout"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:493
 #: plugins/admin/systems/class_workstationService.inc:470
 msgid "Keyboard variant"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_terminalService.inc:494
 #: plugins/admin/systems/class_workstationService.inc:471
 msgid "Mouse type"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_terminalService.inc:495
 #: plugins/admin/systems/class_workstationService.inc:472
 msgid "Mouse port"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_terminalService.inc:496
 #: plugins/admin/systems/class_workstationService.inc:473
 #: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:76
 #: plugins/gofon/phoneaccount/generic.tpl:30
 #: 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
+#: plugins/admin/systems/class_terminalStartup.inc:94
+#: plugins/admin/systems/class_workstationStartup.inc:337
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
 "exist."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:396
+#: plugins/admin/systems/class_terminalStartup.inc:401
 #, php-format
 msgid "Saving of system terminal/startup with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:442
+#: plugins/admin/systems/class_terminalStartup.inc:447
 msgid "Terminal startup"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:450
-#: plugins/admin/systems/class_workstationStartup.inc:1109
+#: plugins/admin/systems/class_terminalStartup.inc:455
+#: plugins/admin/systems/class_workstationStartup.inc:1168
 msgid "Ldap server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_terminalStartup.inc:457
+#: plugins/admin/systems/class_workstationStartup.inc:1172
+msgid "Kernel modules"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalStartup.inc:458
+#: plugins/admin/systems/class_workstationStartup.inc:1169
 #: plugins/admin/systems/workstationStartup.tpl:8
 #: plugins/admin/systems/terminalStartup.tpl:8
 msgid "Boot kernel"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1111
+#: plugins/admin/systems/class_terminalStartup.inc:459
+#: plugins/admin/systems/class_workstationStartup.inc:1170
 msgid "Kernel parameter"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:185
 msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:54
+#: plugins/admin/systems/server.tpl:67
 msgid "Select action to execute for this server"
 msgstr ""
 
@@ -7788,49 +8008,49 @@ msgstr ""
 msgid "Phone name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
+#: plugins/admin/systems/printer.tpl:5
 msgid "General"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:9
+#: plugins/admin/systems/printer.tpl:8
 msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
+#: plugins/admin/systems/printer.tpl:43
 msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:39
+#: plugins/admin/systems/printer.tpl:46
 msgid "Printer location"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:43
+#: plugins/admin/systems/printer.tpl:54
 msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:51
+#: plugins/admin/systems/printer.tpl:66
 #: plugins/admin/systems/workstationService.tpl:110
-#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:98
 msgid "Driver"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:70
+#: plugins/admin/systems/printer.tpl:89
 msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+#: plugins/admin/systems/printer.tpl:96 plugins/admin/systems/printer.tpl:120
 msgid "Add user"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+#: plugins/admin/systems/printer.tpl:99 plugins/admin/systems/printer.tpl:123
 msgid "Add group"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/printer.tpl:113
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/printer.tpl:115
 msgid "Admins"
 msgstr ""
 
@@ -7838,197 +8058,262 @@ msgstr ""
 msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:98
-msgid "text"
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:99
-msgid "graphic"
+#: plugins/admin/systems/glpiPrinter.tpl:23 plugins/admin/systems/glpi.tpl:37
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:161
-#, php-format
+#: plugins/admin/systems/glpiPrinter.tpl:39
+msgid "Supported interfaces"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:48
+#: plugins/admin/systems/class_servDNS.inc:402
+msgid "Serial"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:58
+msgid "Parallel"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:68
+msgid "USB"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:80 plugins/admin/systems/glpi.tpl:52
+msgid "Contacts"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:83 plugins/admin/systems/glpi.tpl:66
+#: plugins/admin/systems/class_glpiAccount.inc:779
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:94 plugins/admin/systems/glpi.tpl:56
+#: plugins/admin/systems/class_glpiAccount.inc:783
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+msgid "Contact person"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:107
+#: plugins/admin/systems/glpi.tpl:117
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:790
+msgid "Attachments"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:139
+msgid "Installed cartridges"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:105
+msgid "text"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:106
+msgid "graphic"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:181
+#, php-format
 msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:167
+#: plugins/admin/systems/class_terminalGeneric.inc:188
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:200
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_terminalGeneric.inc:212
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:262
-#: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/systems/class_workstationGeneric.inc:246
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
 msgid "Switch off"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:263
-#: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/systems/class_workstationGeneric.inc:246
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:200
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
 msgid "Reboot"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:264
-#: plugins/admin/systems/class_terminalGeneric.inc:268
-#: plugins/admin/systems/class_servGeneric.inc:166
-#: plugins/admin/systems/class_servGeneric.inc:172
-#: plugins/admin/systems/class_workstationGeneric.inc:251
-#: plugins/admin/systems/class_workstationGeneric.inc:257
-#: plugins/admin/ogroups/class_termgroup.inc:307
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:205
+#: plugins/admin/systems/class_servGeneric.inc:211
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
 msgid "Memory test"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:265
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-#: plugins/admin/systems/class_servGeneric.inc:167
-#: plugins/admin/systems/class_servGeneric.inc:173
-#: plugins/admin/systems/class_workstationGeneric.inc:252
-#: plugins/admin/systems/class_workstationGeneric.inc:258
-#: plugins/admin/ogroups/class_termgroup.inc:308
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:212
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
 msgid "System analysis"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:267
-#: plugins/admin/systems/class_servGeneric.inc:169
-#: plugins/admin/systems/class_workstationGeneric.inc:254
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:208
+#: plugins/admin/systems/class_workstationGeneric.inc:292
 msgid "Wake up"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:319
+#: plugins/admin/systems/class_terminalGeneric.inc:348
 #, php-format
 msgid "Removing of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:374
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:378
+#: plugins/admin/systems/class_terminalGeneric.inc:416
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:401
-#: plugins/admin/systems/class_workstationGeneric.inc:371
+#: plugins/admin/systems/class_terminalGeneric.inc:445
+#: plugins/admin/systems/class_workstationGeneric.inc:424
 msgid ""
 "There must be at least one NTP server selected, or the inherit mode "
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:476
+#: plugins/admin/systems/class_terminalGeneric.inc:529
 #, php-format
 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_terminalGeneric.inc:540
+#: plugins/admin/systems/class_terminalGeneric.inc:546
+#: plugins/admin/systems/class_systemManagement.inc:1029
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/systems/class_goTerminalServer.inc:222
-#: plugins/admin/ogroups/class_ogroupManagement.inc:385
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:541
 msgid "Terminal generic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:499
+#: plugins/admin/systems/class_terminalGeneric.inc:552
 msgid "Syslog server enabled"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:553
 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:399
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+msgid "Root password"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:557
+#: plugins/admin/systems/class_servGeneric.inc:375
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:392
 msgid "Action flag"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:47
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
 msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:67
+#: plugins/admin/systems/class_servGeneric.inc:94
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:75
-#: plugins/admin/systems/class_workstationGeneric.inc:140
-#: plugins/admin/ogroups/class_termgroup.inc:212
+#: plugins/admin/systems/class_servGeneric.inc:102
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
 msgid "No ACTIONCMD definition found in your gosa.conf"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:111
+#: plugins/admin/systems/class_servGeneric.inc:140
 #, php-format
 msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:162
-#: plugins/admin/systems/class_workstationGeneric.inc:247
-#: plugins/admin/ogroups/class_termgroup.inc:303
+#: plugins/admin/systems/class_servGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
 msgid "Instant update"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:163
-#: plugins/admin/systems/class_servGeneric.inc:171
-#: plugins/admin/systems/class_workstationGeneric.inc:248
-#: plugins/admin/systems/class_workstationGeneric.inc:256
-#: plugins/admin/ogroups/class_termgroup.inc:304
+#: plugins/admin/systems/class_servGeneric.inc:202
+#: plugins/admin/systems/class_servGeneric.inc:210
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
 msgid "Scheduled update"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:164
-#: plugins/admin/systems/class_servGeneric.inc:170
-#: plugins/admin/systems/class_workstationGeneric.inc:249
-#: plugins/admin/systems/class_workstationGeneric.inc:255
-#: plugins/admin/ogroups/class_termgroup.inc:305
+#: plugins/admin/systems/class_servGeneric.inc:203
+#: plugins/admin/systems/class_servGeneric.inc:209
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
 msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:165
-#: plugins/admin/systems/class_workstationGeneric.inc:250
-#: plugins/admin/ogroups/class_termgroup.inc:306
+#: plugins/admin/systems/class_servGeneric.inc:204
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
 msgid "Rescan hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:233
 #, php-format
 msgid "Removing of system server/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:224
+#: plugins/admin/systems/class_servGeneric.inc:278
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:231
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_servGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:347
 #, php-format
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:316
+#: plugins/admin/systems/class_servGeneric.inc:363
 msgid "Server generic"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:326
-#: plugins/admin/systems/class_workstationGeneric.inc:475
+#: plugins/admin/systems/class_servGeneric.inc:373
+#: plugins/admin/systems/class_workstationGeneric.inc:536
 msgid "Goto mode"
 msgstr ""
 
@@ -8052,50 +8337,45 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:174
-#: plugins/admin/ogroups/class_termgroup.inc:255
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
 #, php-format
 msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:184
+#: plugins/admin/systems/class_workstationGeneric.inc:209
 msgid "This 'dn' has no workstation features."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_workstationGeneric.inc:332
 #, php-format
 msgid "Removing of system workstation/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:344
-#: plugins/admin/ogroups/class_termgroup.inc:115
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:348
+#: plugins/admin/systems/class_workstationGeneric.inc:396
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:438
-#: plugins/admin/systems/class_workstationGeneric.inc:456
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:515
 #, php-format
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:466
+#: plugins/admin/systems/class_workstationGeneric.inc:525
 msgid "Workstation generic"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:471
-#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_workstationGeneric.inc:530
+#: plugins/admin/systems/class_systemManagement.inc:1030
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/ogroups/class_termgroup.inc:400
+#: plugins/admin/systems/class_workstationGeneric.inc:538
+#: plugins/admin/ogroups/class_termgroup.inc:393
 msgid "Ntp server"
 msgstr ""
 
@@ -8103,453 +8383,420 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:211
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:263
+msgid "You are not allowed to create a new object of this type."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:314
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:236
+#: plugins/admin/systems/class_systemManagement.inc:342
+#: plugins/admin/systems/class_systemManagement.inc:408
+msgid "You are not allowed to change the password for this object."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:354
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:253
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/class_systemManagement.inc:411
+msgid "Can't detect object to change password."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:307
+#: plugins/admin/systems/class_systemManagement.inc:473
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:313
-#: plugins/admin/systems/class_systemManagement.inc:373
-#: plugins/admin/fai/class_faiManagement.inc:160
-#: plugins/admin/fai/class_faiManagement.inc:211
+#: plugins/admin/systems/class_systemManagement.inc:479
+#: plugins/admin/systems/class_systemManagement.inc:539
+#: plugins/admin/fai/class_faiManagement.inc:168
+#: plugins/admin/fai/class_faiManagement.inc:221
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/systems/class_systemManagement.inc:579
+#, php-format
+msgid ""
+"Can't set gotoMode to status 'avtice', the current object couldn't be "
+"identified."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:868
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:650
+#: plugins/admin/systems/class_systemManagement.inc:870
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:872
 msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:667
+#: plugins/admin/systems/class_systemManagement.inc:891
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:679
+#: plugins/admin/systems/class_systemManagement.inc:907
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:1027
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:1031
 msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/class_systemManagement.inc:1032
 msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/admin/systems/class_systemManagement.inc:1033
 msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:776
+#: plugins/admin/systems/class_systemManagement.inc:1036
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:777
+#: plugins/admin/systems/class_systemManagement.inc:1037
 msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:778
+#: plugins/admin/systems/class_systemManagement.inc:1038
 msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:779
+#: plugins/admin/systems/class_systemManagement.inc:1039
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:780
+#: plugins/admin/systems/class_systemManagement.inc:1040
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_systemManagement.inc:1041
+#: plugins/admin/systems/class_divListSystem.inc:149
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:782
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_systemManagement.inc:1042
+#: plugins/admin/systems/class_divListSystem.inc:155
 msgid "New Workstation"
 msgstr ""
 
+#: plugins/admin/systems/class_systemManagement.inc:1088
+#: plugins/admin/systems/class_systemManagement.inc:1089
+msgid "Incoming objects"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:1094
+msgid "Incoming"
+msgstr ""
+
 #: plugins/admin/systems/servdns.tpl:1
 msgid "Zones"
 msgstr ""
 
 #: plugins/admin/systems/servkolab.tpl:9
-#: plugins/admin/systems/class_servKolab.inc:422
+#: plugins/admin/systems/class_servKolab.inc:383
 msgid "Postfix mydomain"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:16
+#: plugins/admin/systems/servkolab.tpl:18
 msgid "Postfix mydestination"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:33
-#: plugins/admin/systems/class_servKolab.inc:432
+#: plugins/admin/systems/servkolab.tpl:27
+#: plugins/admin/systems/class_servKolab.inc:385
+msgid "Cyrus admins"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:48
+#: plugins/admin/systems/class_servKolab.inc:396
 msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:41
-#: plugins/admin/systems/class_servKolab.inc:434
+#: plugins/admin/systems/servkolab.tpl:58
+#: plugins/admin/systems/class_servKolab.inc:398
 msgid "POP3/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:49
-#: plugins/admin/systems/class_servKolab.inc:430
+#: plugins/admin/systems/servkolab.tpl:68
+#: plugins/admin/systems/class_servKolab.inc:394
 msgid "IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:57
-#: plugins/admin/systems/class_servKolab.inc:433
+#: plugins/admin/systems/servkolab.tpl:78
+#: plugins/admin/systems/class_servKolab.inc:397
 msgid "IMAP/SSL service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:65
-#: plugins/admin/systems/class_servKolab.inc:435
+#: plugins/admin/systems/servkolab.tpl:88
+#: plugins/admin/systems/class_servKolab.inc:399
 msgid "Sieve service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:73
+#: plugins/admin/systems/servkolab.tpl:98
 msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/servkolab.tpl:108
 msgid "HTTP FreeBusy service (legacy)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:89
+#: plugins/admin/systems/servkolab.tpl:118
 msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:100
-#: plugins/admin/systems/class_servKolab.inc:436
+#: plugins/admin/systems/servkolab.tpl:129
+#: plugins/admin/systems/class_servKolab.inc:400
 msgid "Quota settings"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:116
+#: plugins/admin/systems/servkolab.tpl:147
 msgid "Free/Busy settings"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:121
+#: plugins/admin/systems/servkolab.tpl:153
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:136
-#: plugins/admin/systems/class_servKolab.inc:425
+#: plugins/admin/systems/servkolab.tpl:171
+#: plugins/admin/systems/class_servKolab.inc:387
 msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:141
+#: plugins/admin/systems/servkolab.tpl:176
 msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
+#: plugins/admin/systems/servkolab.tpl:181
 msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:157
+#: plugins/admin/systems/servkolab.tpl:194
 msgid "SMTP smarthost/relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
+#: plugins/admin/systems/servkolab.tpl:202
+#: plugins/admin/systems/class_servKolab.inc:390
 msgid "Enable MX lookup for relayhost"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:168
+#: plugins/admin/systems/servkolab.tpl:207
 msgid "Host used to relay mails"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:182
-#: plugins/admin/systems/class_servKolab.inc:429
+#: plugins/admin/systems/servkolab.tpl:223
+#: plugins/admin/systems/class_servKolab.inc:393
 msgid "Accept Internet Mail"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:188
+#: plugins/admin/systems/servkolab.tpl:231
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:32
-msgid "Domain name system service"
+#: plugins/admin/systems/class_servDNS.inc:34
+#: plugins/admin/systems/class_servDNS.inc:360
+#: plugins/admin/systems/class_servDNS.inc:389
+#: plugins/admin/systems/class_servDNS.inc:390
+msgid "DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:73
+#: plugins/admin/systems/class_servDNS.inc:75
 #: plugins/admin/systems/class_inventory.inc:36
 msgid "Remove DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:74
+#: plugins/admin/systems/class_servDNS.inc:76
 #: plugins/admin/systems/class_inventory.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:76
+#: plugins/admin/systems/class_servDNS.inc:78
 #: plugins/admin/systems/class_inventory.inc:39
 msgid "Add DNS service"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:77
+#: plugins/admin/systems/class_servDNS.inc:79
 #: plugins/admin/systems/class_inventory.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:165
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:167
+#: plugins/admin/systems/class_servDNS.inc:399
 msgid "Reverse zone"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/systems/class_servDNS.inc:169
+#: plugins/admin/fai/faiTemplateEntry.tpl:102
 msgid "Class"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:229
+#: plugins/admin/systems/class_servDNS.inc:233
 #, php-format
 msgid ""
 "Can't delete the selected zone, because it is still in use by these entry/"
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:288
+#: plugins/admin/systems/class_servDNS.inc:297
 #, php-format
 msgid "Updating of system server/dns with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:297
+#: plugins/admin/systems/class_servDNS.inc:306
 #, php-format
 msgid "Removing of system server/dns with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:318
+#: plugins/admin/systems/class_servDNS.inc:327
 #, php-format
 msgid "Saving of system server/dns with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:342
+#: plugins/admin/systems/class_servDNS.inc:351
 #, php-format
 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/class_servDNS.inc:398
+#: plugins/admin/systems/class_termDNS.inc:570
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_servDNS.inc:400
 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/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:70
-#: plugins/admin/ogroups/class_phonequeue.inc:751
+#: plugins/admin/ogroups/phonequeue.tpl:85
+#: plugins/admin/ogroups/class_phonequeue.inc:940
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/class_servDNS.inc:405
 #: plugins/admin/systems/servdnseditzone.tpl:79
 msgid "Expire"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/class_servDNS.inc:407
 #: 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 ""
-
-#: plugins/admin/systems/servdb.tpl:10 plugins/admin/systems/goKrbServer.tpl:4
-msgid "Kerberos Realm"
-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 ""
-
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:30 plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:42
-#: plugins/admin/systems/class_goFonServer.inc:52
-msgid "Asterisk management"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:46 plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:54
-#: plugins/admin/systems/goFonServer.tpl:12
-msgid "Country dial prefix"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:58
-#: plugins/admin/systems/goFonServer.tpl:16
-msgid "Local dial prefix"
-msgstr ""
-
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
+#: plugins/admin/systems/gencd.tpl:2
+msgid "CD-Install-Image generation"
 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"
+#: plugins/admin/systems/gencd.tpl:5
+msgid ""
+"This option enables you to generate FAI install CD images for the selected "
+"workstation. The procedure may take about 10 minutes to complete, so please "
+"be patient after pressing the 'Create ISO-Image' button."
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:100
-#: plugins/admin/systems/class_goLogDBServer.inc:29
-#: plugins/admin/systems/class_goLogDBServer.inc:49
-msgid "Logging database"
+#: plugins/admin/systems/gencd.tpl:9
+msgid "Create ISO-Image"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-#: plugins/admin/systems/goGlpiServer.tpl:4
-#: plugins/admin/systems/goLogDBServer.tpl:4
-msgid "Logging DB user"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:133
-#: plugins/admin/systems/class_goGlpiServer.inc:227
-#: plugins/admin/systems/goGlpiServer.tpl:14
-msgid "Database"
+#: plugins/admin/systems/class_goFaxServer.inc:31
+msgid "FAX database"
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_goFaxServer.inc:55
+msgid "FAX database configuration"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-msgid "FAX service"
+#: plugins/admin/systems/class_goFaxServer.inc:64
+#: plugins/admin/systems/class_goGlpiServer.inc:63
+msgid "The attribute user is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:49
-msgid "FAX database configuration"
+#: plugins/admin/systems/class_goFaxServer.inc:67
+#: plugins/admin/systems/class_goFonServer.inc:70
+msgid "The attribute password is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:79
-#, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+#: plugins/admin/systems/class_goFaxServer.inc:84
+#: plugins/admin/systems/class_goFaxServer.inc:85
+msgid "Fax database"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
-#, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+#: plugins/admin/systems/class_goFaxServer.inc:93
+msgid "Login name"
 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/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
 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/glpi.tpl:23
+#: plugins/admin/systems/class_glpiAccount.inc:781
+msgid "Operating system"
 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."
+#: plugins/admin/systems/glpi.tpl:79
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+msgid "Comment"
 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:743
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
-#: plugins/admin/systems/class_goVirusServer.inc:305
-#: plugins/admin/systems/class_goSpamServer.inc:451
-#, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+#: plugins/admin/systems/glpi.tpl:96
+msgid "Installed devices"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:215
-msgid "Fax server"
+#: plugins/admin/systems/glpi.tpl:112
+msgid "Trading"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:216
-msgid "Fax server service"
+#: plugins/admin/systems/glpi.tpl:113
+msgid "Software"
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:224
-msgid "Login name"
+#: plugins/admin/systems/glpi.tpl:114
+msgid "Contracts"
 msgstr ""
 
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
@@ -8558,7 +8805,7 @@ msgid ""
 "really want to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:99
+#: plugins/admin/systems/class_servKolab.inc:100
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
@@ -8568,225 +8815,217 @@ msgstr ""
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:191
-#: plugins/admin/systems/class_servKolab.inc:207
+#: plugins/admin/systems/class_servKolab.inc:195
+#: plugins/admin/systems/class_servKolab.inc:211
 #, php-format
 msgid "Removing host entry from system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:246
+#: plugins/admin/systems/class_servKolab.inc:262
 msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:248
+#: plugins/admin/systems/class_servKolab.inc:264
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:252
+#: plugins/admin/systems/class_servKolab.inc:268
 msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:254
+#: plugins/admin/systems/class_servKolab.inc:270
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:256
+#: plugins/admin/systems/class_servKolab.inc:272
 msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:260
+#: plugins/admin/systems/class_servKolab.inc:276
 msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:332
+#: plugins/admin/systems/class_servKolab.inc:348
 #, php-format
 msgid "Saving system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:354
+#: plugins/admin/systems/class_servKolab.inc:364
+#: plugins/admin/systems/class_servKolab.inc:375
 msgid "Kolab mail service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:383
-#, php-format
-msgid "Set status flag for system server/kolab with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:414
-msgid "Kolab service"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:423
+#: plugins/admin/systems/class_servKolab.inc:384
 msgid "My destination"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:424
+#: plugins/admin/systems/class_servKolab.inc:386
 msgid "FTP FreeBusy service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:426
+#: plugins/admin/systems/class_servKolab.inc:388
 msgid "Enable virus scan"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:427
+#: plugins/admin/systems/class_servKolab.inc:389
 msgid "Relayhost"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:428
+#: plugins/admin/systems/class_servKolab.inc:391
 msgid "HTTP FreeBusy service"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:431
+#: plugins/admin/systems/class_servKolab.inc:392
+msgid "Allow unauthenticated free busy"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:395
 msgid "kolabFreeBusyFuture"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:108
+#: plugins/admin/systems/class_printGeneric.inc:111
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:239
-#: plugins/admin/systems/class_printGeneric.inc:247
-#: plugins/admin/systems/class_printGeneric.inc:252
-#: plugins/admin/systems/class_printGeneric.inc:291
-#: plugins/admin/systems/class_printGeneric.inc:307
-#: plugins/admin/systems/class_printGeneric.inc:310
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:261
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:248
+#: plugins/admin/systems/class_printGeneric.inc:269
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:253
+#: plugins/admin/systems/class_printGeneric.inc:274
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:284
+#: plugins/admin/systems/class_printGeneric.inc:315
 msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:292
+#: plugins/admin/systems/class_printGeneric.inc:323
 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:299
-#: plugins/admin/systems/class_printGeneric.inc:302
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
 msgid "Remove printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:300
+#: plugins/admin/systems/class_printGeneric.inc:331
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:334
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:308
+#: plugins/admin/systems/class_printGeneric.inc:339
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:311
+#: plugins/admin/systems/class_printGeneric.inc:342
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:477
+#: plugins/admin/systems/class_printGeneric.inc:512
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:485
+#: plugins/admin/systems/class_printGeneric.inc:520
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:498
+#: plugins/admin/systems/class_printGeneric.inc:533
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:500
+#: plugins/admin/systems/class_printGeneric.inc:535
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:555
+#: plugins/admin/systems/class_printGeneric.inc:590
 #, php-format
 msgid "Removing of system print/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:613
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:763
+#: plugins/admin/systems/class_printGeneric.inc:832
 #, php-format
 msgid "Saving of system print/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:785
-#: plugins/admin/systems/class_printGeneric.inc:787
-#: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:857
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
+#: plugins/admin/fai/faiTemplateEntry.tpl:85
+#: plugins/admin/fai/faiTemplateEntry.tpl:127
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:803
+#: plugins/admin/systems/class_printGeneric.inc:873
 msgid "Print generic"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:885
 msgid "LabeledURL"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:815
+#: plugins/admin/systems/class_printGeneric.inc:886
 msgid "Printer PPD"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:832
+#: plugins/admin/systems/class_printGeneric.inc:903
 #, 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:849
+#: plugins/admin/systems/class_printGeneric.inc:920
 #, php-format
 msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:854
+#: plugins/admin/systems/class_printGeneric.inc:925
 #, 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:889
+#: plugins/admin/systems/class_printGeneric.inc:960
 #, php-format
 msgid "Can't add '%s' to the list of members, it is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:900
+#: plugins/admin/systems/class_printGeneric.inc:971
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -8806,38 +9045,68 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:101
+#: plugins/admin/systems/class_componentGeneric.inc:125
 #, php-format
 msgid "Removing of system component/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:172
 msgid "The required field 'Component name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:144
-#: plugins/admin/systems/class_phoneGeneric.inc:284
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
 msgid "The required field IP address is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:147
-#: plugins/admin/systems/class_phoneGeneric.inc:287
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
 msgid "The field IP address contains an invalid address."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:223
+#: plugins/admin/systems/class_componentGeneric.inc:249
 #, php-format
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:234
+#: plugins/admin/systems/class_componentGeneric.inc:260
 msgid "Component generic"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:239
+#: plugins/admin/systems/class_componentGeneric.inc:265
 msgid "Network device"
 msgstr ""
 
+#: plugins/admin/systems/goKrbServer.tpl:1
+msgid "Kerberos kadmin access"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:4
+msgid "Kerberos Realm"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:12
+#: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goImapServer.inc:171
+msgid "Admin user"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr ""
+
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
 msgstr ""
@@ -8880,140 +9149,38 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: plugins/admin/systems/goNtpServer.tpl:2
-msgid "Time server"
+#: plugins/admin/systems/servnfs.tpl:1
+msgid "Edit share"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 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
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-msgid "Manufacturer"
+#: plugins/admin/systems/servnfs.tpl:29
+#: plugins/admin/systems/class_goShareServer.inc:377
+msgid "Volume"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-msgid "Supported interfaces"
+#: plugins/admin/systems/servnfs.tpl:69
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
-msgstr ""
-
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr ""
-
-#: plugins/admin/systems/glpiPrinter.tpl:66 plugins/admin/systems/glpi.tpl:40
-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 ""
-
-#: plugins/admin/systems/glpiPrinter.tpl:88 plugins/admin/systems/glpi.tpl:95
-msgid "Attachments"
-msgstr ""
-
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:1
-msgid "Edit share"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:25
-#: plugins/admin/systems/class_servNfs.inc:277
-msgid "Volume"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:54
-msgid "Auto-mount share on Apple systems"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:94
+#: plugins/admin/systems/servnfs.tpl:109
 msgid "Codepage"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:104
-#: plugins/admin/systems/class_servNfs.inc:276
+#: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/class_goShareServer.inc:376
 msgid "Option"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-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
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-msgid "Comment"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
-msgstr ""
-
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
 msgstr ""
 
 #: plugins/admin/systems/remove_glpi.tpl:10
@@ -9023,206 +9190,221 @@ msgid ""
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
+#: plugins/admin/systems/class_phoneGeneric.inc:118
 msgid "This 'dn' has no phone features."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:229
+#: plugins/gofon/macro/class_divListMacros.inc:125
 msgid "yes"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/admin/systems/class_phoneGeneric.inc:229
+#: plugins/gofon/macro/class_divListMacros.inc:126
 msgid "no"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
+#: plugins/admin/systems/class_phoneGeneric.inc:246
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
+#: plugins/admin/systems/class_phoneGeneric.inc:246
 msgid "Networksettings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:240
+#: plugins/admin/systems/class_phoneGeneric.inc:262
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:247
+#: plugins/admin/systems/class_phoneGeneric.inc:269
 #, php-format
 msgid "Removing of system phone/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:292
+#: plugins/admin/systems/class_phoneGeneric.inc:325
 msgid "The required field 'Phone name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:295
+#: plugins/admin/systems/class_phoneGeneric.inc:328
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:302
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:397
+#: plugins/admin/systems/class_phoneGeneric.inc:418
 #, php-format
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:410
+#: plugins/admin/systems/class_phoneGeneric.inc:431
 msgid "Phone generic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:415
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1234
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1465
 msgid "Phone hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:421
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
+#: plugins/admin/systems/class_phoneGeneric.inc:442
+msgid "SIP Mode"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:443
+msgid "SIP DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:444
+msgid "SIP Default ip"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:445
+msgid "SIP Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:446
+msgid "IAX authentication type"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:447
+msgid "IAX secret"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:448
+msgid "IAX account code"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:449
+msgid "IAX trunk lines"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:450
+msgid "IAX permit settings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:422
-msgid "Default ip"
+#: plugins/admin/systems/class_phoneGeneric.inc:451
+msgid "IAX deny settings"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:423
-msgid "Qualify"
+#: plugins/admin/systems/class_phoneGeneric.inc:452
+msgid "CAPI MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:424
+#: plugins/admin/systems/class_phoneGeneric.inc:453
 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."
+#, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
 #: plugins/admin/systems/class_servNfs.inc:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, php-format
+msgid "Can't read '%s/encodings', please check permissions."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:180
+#: plugins/admin/systems/class_servNfs.inc:178
 msgid "Please specify a valid path for your setup."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:186
+#: plugins/admin/systems/class_servNfs.inc:184
 msgid "Please specify a valid name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:189
+#: plugins/admin/systems/class_servNfs.inc:187
 msgid "Please specify a name for your share."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:194
+#: plugins/admin/systems/class_servNfs.inc:192
 msgid "Description contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:198
+#: plugins/admin/systems/class_servNfs.inc:196
 msgid "Volume contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:202
+#: plugins/admin/systems/class_servNfs.inc:200
 msgid "Path contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:206
+#: plugins/admin/systems/class_servNfs.inc:204
 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:401
+#: plugins/admin/systems/class_workstationStartup.inc:434
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:446
+#: plugins/admin/systems/class_workstationStartup.inc:479
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:508
+#: plugins/admin/systems/class_workstationStartup.inc:542
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:856
+#: plugins/admin/systems/class_workstationStartup.inc:759
+msgid "Not available in current setup"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:902
 #, php-format
 msgid ""
 "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
 "Server was reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:870
+#: plugins/admin/systems/class_workstationStartup.inc:918
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+"configurations, possibly some classes where deleted or renamed. Server was "
+"reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1031
+#: plugins/admin/systems/class_workstationStartup.inc:1090
 #, php-format
 msgid "Saving of system workstation/startup with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1081
+#: plugins/admin/systems/class_workstationStartup.inc:1140
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1083
-#: plugins/admin/systems/class_servRepositorySetup.inc:189
+#: plugins/admin/systems/class_workstationStartup.inc:1142
+#: plugins/admin/systems/class_servRepositorySetup.inc:203
 #, php-format
 msgid ""
 "The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
 "empty string."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1101
+#: plugins/admin/systems/class_workstationStartup.inc:1160
 msgid "System startup"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1113
-msgid "Kernel modules"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationStartup.inc:1116
-#: plugins/admin/fai/class_faiProfile.inc:447
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/systems/class_workstationStartup.inc:1175
+#: plugins/admin/fai/class_faiProfile.inc:453
+#: plugins/admin/fai/faiProfile.tpl:36
 msgid "FAI classes"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1117
+#: plugins/admin/systems/class_workstationStartup.inc:1176
 msgid "Debian mirror"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1177
 msgid "Debian release"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1179
 msgid "FAI status flag"
 msgstr ""
 
@@ -9234,67 +9416,71 @@ msgstr ""
 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
+#: plugins/admin/systems/phonesettings.tpl:8
+#: plugins/admin/systems/phonesettings.tpl:30
+#: plugins/admin/systems/phonesettings.tpl:42
+#: plugins/admin/systems/phonesettings.tpl:58
+#: plugins/admin/systems/phonesettings.tpl:91
+#: plugins/admin/systems/phonesettings.tpl:128
+#: plugins/admin/systems/phonesettings.tpl:181
 msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:11
+#: plugins/admin/systems/phonesettings.tpl:13
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:87
+#: plugins/admin/systems/phonesettings.tpl:38
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:54
+#: plugins/admin/systems/phonesettings.tpl:99
 msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:58
-#: plugins/admin/systems/phonesettings.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:66
+#: plugins/admin/systems/phonesettings.tpl:109
 msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:77
+#: plugins/admin/systems/phonesettings.tpl:87
 msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:108
+#: plugins/admin/systems/phonesettings.tpl:124
 msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:118
+#: plugins/admin/systems/phonesettings.tpl:136
 msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:126
+#: plugins/admin/systems/phonesettings.tpl:146
 msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:134
+#: plugins/admin/systems/phonesettings.tpl:154
 msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:147
+#: plugins/admin/systems/phonesettings.tpl:167
 msgid "Account code"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:155
+#: plugins/admin/systems/phonesettings.tpl:177
 msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:170
+#: plugins/admin/systems/phonesettings.tpl:194
 msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:185
+#: plugins/admin/systems/phonesettings.tpl:217
 msgid "Hosts that are not allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:207
+#: plugins/admin/systems/phonesettings.tpl:247
 msgid "MSN"
 msgstr ""
 
@@ -9377,18 +9563,20 @@ msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
-#: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/fai/class_faiPackage.inc:555
+#: plugins/admin/fai/faiPackage.tpl:45
+#: plugins/admin/fai/class_faiPackage.inc:534
 msgid "Section"
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:462
 #: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:290
 msgid "True"
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:463
 #: plugins/admin/systems/class_printerPPDDialog.inc:466
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
 msgid "False"
 msgstr ""
 
@@ -9397,7 +9585,23 @@ msgstr ""
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
 msgid ""
 "Please select a valid ppd file or use 'Cancel' to go back to printer "
 "configuration."
@@ -9410,8 +9614,8 @@ msgstr ""
 #: plugins/admin/systems/printerPPDDialog.tpl:5
 #: 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
+#: plugins/admin/systems/terminalService.tpl:254
+#: plugins/admin/systems/class_glpiAccount.inc:784
 msgid "Model"
 msgstr ""
 
@@ -9429,8 +9633,8 @@ msgid "Select objects to add"
 msgstr ""
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
-#: plugins/admin/systems/servRepository.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/systems/servRepository.tpl:48
+#: plugins/admin/ogroups/ogroup_objects.tpl:45
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
@@ -9438,19 +9642,35 @@ msgid "Display objects matching"
 msgstr ""
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
-#: plugins/admin/systems/servRepository.tpl:50
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/systems/servRepository.tpl:52
+#: plugins/admin/ogroups/ogroup_objects.tpl:46
 #: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
 #, php-format
 msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
 msgid "Printer ppd selection."
 msgstr ""
 
@@ -9473,111 +9693,112 @@ msgid "Keyboard"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:11
-#: plugins/admin/systems/terminalService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:10
 msgid "Choose keyboard model"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:19
-#: plugins/admin/systems/terminalService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:17
 msgid "Layout"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:20
 msgid "Choose keyboard layout"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:31
-#: plugins/admin/systems/terminalService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:27
 msgid "Variant"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:35
-#: plugins/admin/systems/terminalService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:30
 msgid "Choose keyboard variant"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:51
-#: plugins/admin/systems/terminalService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:45
 msgid "Mouse"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:58
-#: plugins/admin/systems/terminalService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:51
 msgid "Choose mouse type"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:58
 msgid "Port"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:70
-#: plugins/admin/systems/terminalService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:61
 msgid "Choose mouse port"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:114
-#: plugins/admin/systems/terminalService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:101
 msgid "Choose graphic driver that is needed by the installed graphic board"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:126
-#: plugins/admin/systems/terminalService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:111
 msgid "Choose screen resolution used in graphic mode"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:134
-#: plugins/admin/systems/terminalService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:118
 msgid "Color depth"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:138
-#: plugins/admin/systems/terminalService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:121
 msgid "Choose colordepth used in graphic mode"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:153
-#: plugins/admin/systems/terminalService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:135
 msgid "Display device"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
 msgid "Use DDC for automatic detection"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:124
+#: plugins/admin/systems/terminalService.tpl:150
 msgid "HSync"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:126
+#: plugins/admin/systems/terminalService.tpl:154
 msgid "Horizontal refresh frequency for installed monitor"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:129
+#: plugins/admin/systems/terminalService.tpl:158
 msgid "VSync"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:131
+#: plugins/admin/systems/terminalService.tpl:162
 msgid "Vertical refresh frequency for installed monitor"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:203
+#: plugins/admin/systems/terminalService.tpl:245
 msgid "Scan device"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:204
+#: plugins/admin/systems/terminalService.tpl:247
 msgid "Select to start SANE scan service on terminal"
 msgstr ""
 
 #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:205
+#: plugins/admin/systems/terminalService.tpl:249
 msgid "Provide scan services"
 msgstr ""
 
@@ -9587,19 +9808,19 @@ msgid "Boot parameters"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:19
 msgid "Custom options"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:23
-#: plugins/admin/systems/terminalStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:23
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
 msgstr ""
 
 #: plugins/admin/systems/workstationStartup.tpl:28
-#: plugins/admin/systems/terminalStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:27
 msgid "LDAP server"
 msgstr ""
 
@@ -9617,155 +9838,190 @@ msgstr ""
 msgid "set"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:137
-#: plugins/admin/systems/terminalStartup.tpl:53
+#: plugins/admin/systems/workstationStartup.tpl:141
+#: plugins/admin/systems/terminalStartup.tpl:66
 msgid "Kernel modules (format: name parameters)"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:140
-#: plugins/admin/systems/terminalStartup.tpl:55
+#: plugins/admin/systems/workstationStartup.tpl:144
+#: plugins/admin/systems/terminalStartup.tpl:69
 msgid "Add additional modules to load on startup"
 msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:176
-#: plugins/admin/systems/terminalStartup.tpl:79
+#: plugins/admin/systems/workstationStartup.tpl:180
+#: plugins/admin/systems/terminalStartup.tpl:105
 msgid "Mountpoint"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:35
+#: plugins/admin/systems/terminalStartup.tpl:43
 msgid "Select if terminal supports graphical startup with progress bar"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:36
+#: plugins/admin/systems/terminalStartup.tpl:45
 msgid "use graphical bootup"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:38
+#: plugins/admin/systems/terminalStartup.tpl:48
 msgid "Select if terminal should boot in text mode"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:39
+#: plugins/admin/systems/terminalStartup.tpl:50
 msgid "use standard linux textual bootup"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:41
+#: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Select to get more verbose output during startup"
 msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:42
+#: plugins/admin/systems/terminalStartup.tpl:55
 msgid "use debug mode for startup"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:145
+#: plugins/admin/systems/terminalService.tpl:177
 msgid "Connect method"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:147
+#: plugins/admin/systems/terminalService.tpl:180
 msgid "Choose method to connect to terminal server"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:188
 msgid "Terminal server"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:156
+#: plugins/admin/systems/terminalService.tpl:191
 msgid "Select specific terminal server to use"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:163
+#: plugins/admin/systems/terminalService.tpl:199
 msgid "Font server"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:165
+#: plugins/admin/systems/terminalService.tpl:202
 msgid "Select specific font server to use"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:181
+#: plugins/admin/systems/terminalService.tpl:219
 msgid "Print device"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:182
+#: plugins/admin/systems/terminalService.tpl:221
 msgid "Select to start IPP based printing service on terminal"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:223
 msgid "Provide print services"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:232
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:212
+#: plugins/admin/systems/terminalService.tpl:257
 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
+#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/fai/faiPackage.tpl:33
 msgid "Repository"
 msgstr ""
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:442
+#: plugins/admin/systems/class_servRepository.inc:380
 msgid "Parent server"
 msgstr ""
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:245
-#: plugins/admin/systems/class_servRepository.inc:266
+#: plugins/admin/systems/servRepositorySetup.tpl:39
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
 msgid "Sections"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:136
+#: plugins/admin/systems/class_servRepositorySetup.inc:150
 msgid "Please enter a value for 'release'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:140
+#: plugins/admin/systems/class_servRepositorySetup.inc:154
 msgid "Please specify a valid value for 'url'."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:187
+#: plugins/admin/systems/class_servRepositorySetup.inc:201
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:392
-#: plugins/admin/systems/class_servRepository.inc:432
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
 msgid "Repository service"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:137
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
 #, php-format
 msgid ""
 "You can't delete this release, it is still used by these workstations [%s]. "
 "Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:171
+#: plugins/admin/systems/class_servRepository.inc:186
 #, php-format
 msgid ""
 "Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:204
+#: plugins/admin/systems/class_servRepository.inc:212
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
-#: plugins/admin/fai/class_faiManagement.inc:331
+#: plugins/admin/fai/class_faiManagement.inc:343
 msgid "This name is already in use."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:421
-#, php-format
-msgid "Set status flag for server services/repository with dn '%s' failed."
+#: plugins/admin/systems/class_servRepository.inc:375
+#: plugins/admin/systems/class_goGlpiServer.inc:92
+#: plugins/admin/systems/class_goCupsServer.inc:71
+#: plugins/admin/systems/class_serverService.inc:8
+#: plugins/admin/systems/class_goFonServer.inc:133
+#: plugins/admin/systems/class_goLogDBServer.inc:92
+#: plugins/admin/systems/class_goImapServer.inc:164
+#: plugins/admin/systems/class_goVirusServer.inc:220
+msgid "Start"
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:376
+#: plugins/admin/systems/class_goGlpiServer.inc:93
+#: plugins/admin/systems/class_goCupsServer.inc:72
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/admin/systems/class_goFonServer.inc:134
+#: plugins/admin/systems/class_goLogDBServer.inc:93
+#: plugins/admin/systems/class_goImapServer.inc:165
+#: plugins/admin/systems/class_goVirusServer.inc:221
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1320
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:441
+#: plugins/admin/systems/class_servRepository.inc:377
+#: plugins/admin/systems/class_goGlpiServer.inc:94
+#: plugins/admin/systems/class_goCupsServer.inc:73
+#: plugins/admin/systems/class_serverService.inc:9
+#: plugins/admin/systems/class_goFonServer.inc:135
+#: plugins/admin/systems/class_goLogDBServer.inc:94
+#: plugins/admin/systems/class_goImapServer.inc:166
+#: plugins/admin/systems/class_goVirusServer.inc:222
+msgid "Restart"
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:378
 msgid "Releases"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:443
+#: plugins/admin/systems/class_servRepository.inc:381
 msgid "Url"
 msgstr ""
 
@@ -9773,54 +10029,38 @@ msgstr ""
 msgid "List of configured repositories."
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/servRepository.tpl:12
 msgid "Add repository"
 msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:29
+#: plugins/admin/systems/servRepository.tpl:31
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
+#: plugins/admin/systems/class_goGlpiServer.inc:33
+#: plugins/admin/systems/class_goGlpiServer.inc:83
+#: plugins/admin/systems/class_goGlpiServer.inc:84
 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."
+#: plugins/admin/systems/class_goGlpiServer.inc:54
+msgid "Inventory database service"
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
+#: plugins/admin/systems/class_goGlpiServer.inc:66
 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"
+#: plugins/admin/systems/class_goGlpiServer.inc:96
+#: plugins/admin/systems/class_goFonServer.inc:137
+#: plugins/admin/systems/class_goLogDBServer.inc:95
+#: plugins/admin/systems/class_goKrbServer.inc:97
+msgid "Admin"
 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"
+#: plugins/admin/systems/class_goGlpiServer.inc:97
+#: plugins/admin/systems/goGlpiServer.tpl:20
+msgid "Database"
 msgstr ""
 
 #: plugins/admin/systems/glpi_edit_type.tpl:1
@@ -9870,124 +10110,111 @@ msgstr ""
 msgid "Use"
 msgstr ""
 
-#: plugins/admin/systems/goFonServer.tpl:1
-msgid "VoIP database information"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:147
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:161
 msgid "There is no server with valid glpi database service."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:154
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:157
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:171
 msgid "Can't connect to glpi database, the php-mysql extension is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:164
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:167
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:181
 msgid "Can't connect to glpi database, check configuration twice."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
+#: plugins/admin/systems/class_glpiAccount.inc:181
+#: plugins/admin/systems/class_glpiAccount.inc:187
+#: plugins/admin/systems/class_glpiAccount.inc:193
 msgid "This feature is not implemented yet."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
+#: plugins/admin/systems/class_glpiAccount.inc:295
 msgid "Adding new sytem type failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
+#: plugins/admin/systems/class_glpiAccount.inc:315
 #, php-format
 msgid ""
 "You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
+#: plugins/admin/systems/class_glpiAccount.inc:326
 msgid "Rename failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
+#: plugins/admin/systems/class_glpiAccount.inc:382
 msgid "Adding new operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
+#: plugins/admin/systems/class_glpiAccount.inc:404
 #, php-format
 msgid ""
 "You can't delete this operating system, it is still in use by these system"
 "(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
+#: plugins/admin/systems/class_glpiAccount.inc:416
 msgid "Updating operating system failed, specifed name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:565
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:495
+#, php-format
+msgid ""
+"Could not add the given user, the users dn is too long, only 100 characters "
+"are allowed here."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:576
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:208
 msgid "Remove inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:566
+#: plugins/admin/systems/class_glpiAccount.inc:577
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:579
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:211
 msgid "Add inventory"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:569
+#: plugins/admin/systems/class_glpiAccount.inc:580
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:633
-#: plugins/admin/systems/class_glpiAccount.inc:648
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
+#: plugins/admin/systems/class_glpiAccount.inc:639
+#: plugins/admin/systems/class_glpiAccount.inc:654
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:612
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:627
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:273
 msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:667
+#: plugins/admin/systems/class_glpiAccount.inc:674
 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
+#: plugins/admin/systems/class_glpiAccount.inc:770
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:771
 msgid "Glpi"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:769
+#: plugins/admin/systems/class_glpiAccount.inc:771
 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 ""
 
@@ -10000,7 +10227,7 @@ msgid "Attachment"
 msgstr ""
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
 msgid "File"
 msgstr ""
 
@@ -10016,6 +10243,37 @@ msgstr ""
 msgid "use"
 msgstr ""
 
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr ""
+
 #: plugins/admin/systems/glpiSelectUser.tpl:23
 msgid ""
 "This dialog allows you to select a user as technical responsible person."
@@ -10027,7 +10285,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/class_glpiPrinterAccount.inc:784
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr ""
@@ -10050,7 +10308,8 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:71
 #: plugins/admin/systems/glpi_devices.tpl:176
 #: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
+#: plugins/admin/systems/glpi_devices.tpl:361 setup/class_setupStep6.inc:75
+#: setup/class_setupStep4.inc:62 setup/class_setupStep5.inc:78
 msgid "Yes"
 msgstr ""
 
@@ -10060,7 +10319,8 @@ msgstr ""
 #: plugins/admin/systems/glpi_devices.tpl:72
 #: plugins/admin/systems/glpi_devices.tpl:177
 #: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
+#: plugins/admin/systems/glpi_devices.tpl:362 setup/class_setupStep6.inc:75
+#: setup/class_setupStep4.inc:62 setup/class_setupStep5.inc:78
 msgid "No"
 msgstr ""
 
@@ -10155,7 +10415,7 @@ msgid "Add/Edit network interface"
 msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:561
 msgid "MAC address"
 msgstr ""
 
@@ -10235,7 +10495,7 @@ msgid "New processor"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:131
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "P"
 msgstr ""
 
@@ -10341,10 +10601,9 @@ msgid "Website"
 msgstr ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:146
-#: plugins/admin/ogroups/class_phonequeue.inc:701
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/ogroups/class_phonequeue.inc:889
+#: plugins/gofon/conference/generic.tpl:109 html/getxls.php:226
+#: html/getxls.php:298 html/getxls.php:300
 msgid "Phone number"
 msgstr ""
 
@@ -10369,7 +10628,8 @@ msgid "Upload wasn't successfull."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -10451,52 +10711,52 @@ msgstr ""
 msgid "Specified name is already in use, please choose another one."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:209
 msgid ""
 "This server has inventory features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:212
 msgid ""
 "This server has inventory features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:235
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:273
 #, php-format
 msgid ""
 "Can't rename given printer type to '%s', because this type name already "
 "exists."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:287
 #, php-format
 msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:761
 msgid "since"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:772
 msgid "Printer inventory extension"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 msgid "Supports serial interface"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 msgid "Supports parallel interface"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:782
 msgid "Supports usb interface"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:792
 msgid "Cartridge settings"
 msgstr ""
 
@@ -10516,75 +10776,90 @@ msgstr ""
 msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:132
+#: plugins/admin/systems/class_termDNS.inc:143
 #, php-format
 msgid ""
 "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:298
+#: plugins/admin/systems/class_termDNS.inc:237
+msgid "Not matching"
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:337
 msgid "The required field 'IP-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:305
+#: plugins/admin/systems/class_termDNS.inc:341
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:312
+#: plugins/admin/systems/class_termDNS.inc:348
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:319
+#: plugins/admin/systems/class_termDNS.inc:351
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:339
+#: plugins/admin/systems/class_termDNS.inc:365
+#, php-format
+msgid ""
+"The specified IP address '%s' is not matching the selected reverse zone "
+"entry '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:377
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:347
+#: plugins/admin/systems/class_termDNS.inc:385
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:358
+#: plugins/admin/systems/class_termDNS.inc:396
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
 "please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:365
+#: plugins/admin/systems/class_termDNS.inc:403
 #: plugins/admin/systems/class_servDNSeditZone.inc:409
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:448
+#: plugins/admin/systems/class_termDNS.inc:487
 #, php-format
 msgid "Saving of terminal/dns account with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:511
-msgid "DNS settings"
+#: plugins/admin/systems/class_termDNS.inc:551
+msgid "DNS"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:519
-msgid "DNS records"
+#: plugins/admin/systems/class_termDNS.inc:552
+msgid "DNS settings"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:560
 msgid "IP address"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+#: plugins/admin/systems/class_termDNS.inc:569
+msgid "DNS records"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:109
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:291
 msgid "The selected name is already in use."
 msgstr ""
 
@@ -10668,19 +10943,12 @@ msgid "Choose an object group"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
-#: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:369
+#: plugins/admin/ogroups/phonequeue.tpl:27
+#: plugins/admin/acl/class_aclRole.inc:338
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:351
-msgid "This zoneName is already in use"
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZone.inc:354
-msgid "This reverse zone is already in use"
-msgstr ""
-
 #: plugins/admin/systems/class_servDNSeditZone.inc:359
 #, php-format
 msgid "Please choose a valid zone name."
@@ -10761,42 +11029,37 @@ msgid ""
 "our zone editing dialog."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
 #, php-format
 msgid "Entry name '%s' contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
 #, php-format
 msgid "Can not rename '%s' to '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
 #, php-format
 msgid "Can not create '%s',the destination name already exists."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
 #, php-format
 msgid "The name '%s' is used more than once."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
 #, php-format
 msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
 #, php-format
 msgid "There is an empty '%s' for host '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
 #, php-format
 msgid "There is a duplicate entry in '%s' for '%s'."
 msgstr ""
@@ -10823,163 +11086,165 @@ msgstr ""
 msgid "Create a new DNS zone entry"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:41
 #: plugins/admin/systems/class_divListSystem.inc:42
+#: plugins/admin/systems/class_divListSystem.inc:43
 msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:47
 msgid ""
 "This menu allows you to add, remove and change the properties of specific "
 "systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/systems/class_divListSystem.inc:63
 msgid "System / Department"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:66
+#: plugins/admin/systems/class_divListSystem.inc:67
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:67
+#: plugins/admin/systems/class_divListSystem.inc:68
 msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:67
+#: plugins/admin/systems/class_divListSystem.inc:68
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:68
+#: plugins/admin/systems/class_divListSystem.inc:69
 msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:68
+#: plugins/admin/systems/class_divListSystem.inc:69
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:69
+#: plugins/admin/systems/class_divListSystem.inc:70
 msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:69
+#: plugins/admin/systems/class_divListSystem.inc:70
 msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:70
+#: plugins/admin/systems/class_divListSystem.inc:71
 msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:70
+#: plugins/admin/systems/class_divListSystem.inc:71
 msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/systems/class_divListSystem.inc:72
 msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/systems/class_divListSystem.inc:72
 #: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/systems/class_divListSystem.inc:73
 msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/systems/class_divListSystem.inc:73
 msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:80
+#: plugins/admin/systems/class_divListSystem.inc:81
 msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_divListSystem.inc:149
 msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_divListSystem.inc:155
 msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:110
-#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_divListSystem.inc:161
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:112
-#: plugins/admin/systems/class_divListSystem.inc:113
+#: plugins/admin/systems/class_divListSystem.inc:167
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/class_divListSystem.inc:115
+#: plugins/admin/systems/class_divListSystem.inc:173
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:116
-#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/systems/class_divListSystem.inc:179
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_divListSystem.inc:204
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/systems/class_divListSystem.inc:205
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:206
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:138
+#: plugins/admin/systems/class_divListSystem.inc:207
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:208
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:209
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:210
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:142
+#: plugins/admin/systems/class_divListSystem.inc:211
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:212
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:144
+#: plugins/admin/systems/class_divListSystem.inc:213
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:160
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:264
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:162
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:273
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:193
+#: plugins/admin/systems/class_divListSystem.inc:316
 msgid "Set root       password"
 msgstr ""
 
+#: plugins/admin/systems/class_divListSystem.inc:323
+msgid "Create CD"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:324
+msgid "Create FAI CD"
+msgstr ""
+
 #: plugins/admin/systems/ServiceAddDialog.tpl:3
 msgid "Adding a new service to the current server"
 msgstr ""
@@ -10998,53 +11263,19 @@ msgstr ""
 msgid "All available services are already in use."
 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_goCupsServer.inc:206
+#: plugins/admin/systems/class_goCupsServer.inc:63
 msgid "Cups"
 msgstr ""
 
-#: plugins/admin/systems/class_goCupsServer.inc:207
-msgid "Cups service"
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
 msgstr ""
 
 #: plugins/admin/systems/goLdapServer.tpl:1
-#: plugins/admin/systems/class_goLdapServer.inc:27
+#: plugins/admin/systems/class_goLdapServer.inc:28
 msgid "LDAP 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/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
 msgid "Installed services"
@@ -11122,324 +11353,274 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1100
-msgid "Stop"
+#: plugins/admin/systems/class_goTerminalServer.inc:78
+#, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_serverService.inc:8
-msgid "Start"
+#: plugins/admin/systems/class_goTerminalServer.inc:91
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_serverService.inc:9
-msgid "Restart"
+#: plugins/admin/systems/class_goTerminalServer.inc:126
+#: plugins/admin/systems/goTerminalServer.tpl:8
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_serverService.inc:262
+#: plugins/admin/systems/class_serverService.inc:297
 msgid "Can't set status while this server is not saved."
 msgstr ""
 
-#: plugins/admin/systems/class_serverService.inc:274
+#: plugins/admin/systems/class_serverService.inc:309
 #, php-format
 msgid "The specified method '%s' can't executed for services."
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-msgid "Time service"
-msgstr ""
-
+#: plugins/admin/systems/class_goNtpServer.inc:29
 #: 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 "Removing server services/goNtpServer with dn '%s' failed."
+msgid "Time service (NTP)"
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:122
+#: plugins/admin/systems/class_goNtpServer.inc:93
 #, php-format
 msgid "Saving server services/goNtpServer with dn '%s' failed."
 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/class_goNtpServer.inc:106
+msgid "Time service"
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:219
-msgid "NTP"
+#: plugins/admin/systems/class_goNtpServer.inc:107
+msgid "Time service - NTP"
 msgstr ""
 
-#: plugins/admin/systems/class_goNtpServer.inc:228
+#: plugins/admin/systems/class_goNtpServer.inc:115
 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."
+#: plugins/admin/systems/class_goLdapServer.inc:49
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:133
+#: plugins/admin/systems/class_goLdapServer.inc:60
 msgid "The given base is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:210
+#: plugins/admin/systems/class_goLdapServer.inc:78
+#: plugins/admin/systems/class_goLdapServer.inc:79
 msgid "Ldap"
 msgstr ""
 
-#: plugins/admin/systems/class_goLdapServer.inc:211
-msgid "Ldap service"
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:219
+#: plugins/admin/systems/class_goLdapServer.inc:87
 msgid "Ldap base"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:7
+#: plugins/admin/systems/class_goMailServer.inc:694
 msgid "Visible full qualified hostname"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:10
+#: plugins/admin/systems/goMailServer.tpl:11
 msgid "The full qualified host name."
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:14
+#: plugins/admin/systems/goMailServer.tpl:16
 msgid "Max mail header size"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:18
+#: plugins/admin/systems/goMailServer.tpl:21
 msgid "This value specifies the maximal header size."
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:22
-#: plugins/admin/systems/class_goMailServer.inc:790
+#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/admin/systems/class_goMailServer.inc:697
 msgid "Max mailbox size"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/admin/systems/goMailServer.tpl:31
 msgid "Defines the maximal size of mail box."
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:30
-#: plugins/admin/systems/class_goMailServer.inc:791
+#: plugins/admin/systems/goMailServer.tpl:35
+#: plugins/admin/systems/class_goMailServer.inc:698
 msgid "Max message size"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:34
+#: plugins/admin/systems/goMailServer.tpl:40
 msgid "Specify the maximal size of a message."
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:38
-#: plugins/admin/systems/class_goMailServer.inc:794
+#: plugins/admin/systems/goMailServer.tpl:45
+#: plugins/admin/systems/class_goMailServer.inc:701
 msgid "Relay host"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:42
+#: plugins/admin/systems/goMailServer.tpl:50
 msgid "Relay messages to following host:"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:51
-#: plugins/admin/systems/class_goMailServer.inc:793
+#: plugins/admin/systems/goMailServer.tpl:60
+#: plugins/admin/systems/class_goMailServer.inc:700
 msgid "Local networks"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:52
+#: plugins/admin/systems/goMailServer.tpl:62
 msgid "Postfix networks"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:66
+#: plugins/admin/systems/goMailServer.tpl:83
 msgid "Domains and routing"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:74
-#: plugins/admin/systems/class_goMailServer.inc:792
+#: plugins/admin/systems/goMailServer.tpl:91
+#: plugins/admin/systems/class_goMailServer.inc:699
 msgid "Domains to accept mail for"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:75
+#: plugins/admin/systems/goMailServer.tpl:93
 msgid "Postfix is responsible for the following domains:"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:89
+#: plugins/admin/systems/goMailServer.tpl:114
 msgid "Transports"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:92
+#: plugins/admin/systems/goMailServer.tpl:123
 msgid "Select a transport protocol."
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:105
+#: plugins/admin/systems/goMailServer.tpl:141
 msgid "Restrictions"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:113
-#: plugins/admin/systems/class_goMailServer.inc:796
+#: plugins/admin/systems/goMailServer.tpl:149
+#: plugins/admin/systems/class_goMailServer.inc:703
 msgid "Restrictions for sender"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:116
-#: plugins/admin/systems/goMailServer.tpl:132
+#: plugins/admin/systems/goMailServer.tpl:157
+#: plugins/admin/systems/goMailServer.tpl:183
 msgid "Restriction filter"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:129
-#: plugins/admin/systems/class_goMailServer.inc:797
+#: plugins/admin/systems/goMailServer.tpl:175
+#: plugins/admin/systems/class_goMailServer.inc:704
 msgid "Restrictions for recipient"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:149
-#: plugins/admin/systems/goImapServer.tpl:76
+#: plugins/admin/systems/goMailServer.tpl:204
+#: plugins/admin/systems/goImapServer.tpl:99
 msgid "The server must be saved before you can use the status flag."
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:151
-#: plugins/admin/systems/goImapServer.tpl:78
+#: plugins/admin/systems/goMailServer.tpl:206
+#: plugins/admin/systems/goImapServer.tpl:101
 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
+#: plugins/admin/systems/goMailServer.tpl:209
+#: plugins/admin/systems/goImapServer.tpl:104
 msgid "Set new status"
 msgstr ""
 
-#: plugins/admin/systems/goMailServer.tpl:160
-#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/systems/goMailServer.tpl:215
+#: plugins/admin/systems/goImapServer.tpl:110
 msgid "Set status"
 msgstr ""
 
-#: plugins/admin/systems/goImapServer.tpl:44
-#: plugins/admin/systems/class_goImapServer.inc:287
-msgid "Start IMAP service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:51
-#: plugins/admin/systems/class_goImapServer.inc:288
-msgid "Start IMAP SSL service"
-msgstr ""
-
-#: plugins/admin/systems/goImapServer.tpl:58
-#: plugins/admin/systems/class_goImapServer.inc:289
-msgid "Start POP3 service"
+#: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:169
+msgid "Server identifier"
 msgstr ""
 
-#: plugins/admin/systems/goImapServer.tpl:65
-#: plugins/admin/systems/class_goImapServer.inc:290
-msgid "Start POP3 SSL service"
+#: plugins/admin/systems/goImapServer.tpl:16
+#: plugins/admin/systems/class_goImapServer.inc:170
+msgid "Connect URL"
 msgstr ""
 
-#: plugins/admin/systems/class_goSyslogServer.inc:26
-msgid "Logging service"
+#: plugins/admin/systems/goImapServer.tpl:43
+#: plugins/admin/systems/class_goImapServer.inc:173
+msgid "Sieve port"
 msgstr ""
 
-#: plugins/admin/systems/class_goSyslogServer.inc:46
-#: plugins/admin/systems/class_goSyslogServer.inc:205
-msgid "Syslog service"
+#: plugins/admin/systems/goImapServer.tpl:61
+#: plugins/admin/systems/class_goImapServer.inc:174
+msgid "Start IMAP service"
 msgstr ""
 
-#: plugins/admin/systems/class_goSyslogServer.inc:76
-#, php-format
-msgid "Removing server services/goSysLog with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:70
+#: plugins/admin/systems/class_goImapServer.inc:175
+msgid "Start IMAP SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_goSyslogServer.inc:94
-#, php-format
-msgid "Saving server services/goSysLog with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:79
+#: plugins/admin/systems/class_goImapServer.inc:176
+msgid "Start POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_goSyslogServer.inc:121
-#, php-format
-msgid "Set status flag for server services/goSysLog with dn '%s' failed."
+#: plugins/admin/systems/goImapServer.tpl:88
+#: plugins/admin/systems/class_goImapServer.inc:177
+msgid "Start POP3 SSL service"
 msgstr ""
 
-#: plugins/admin/systems/class_goSyslogServer.inc:204
-msgid "Syslog"
+#: plugins/admin/systems/class_goSyslogServer.inc:28
+#: plugins/admin/systems/class_goSyslogServer.inc:42
+#: plugins/admin/systems/class_goSyslogServer.inc:63
+#: plugins/admin/systems/class_goSyslogServer.inc:64
+msgid "Logging service"
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:32
+#: plugins/admin/systems/class_goFonServer.inc:34
+#: plugins/admin/systems/class_goFonServer.inc:124
 msgid "VoIP service"
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:82
-#, php-format
-msgid "Removing server services/gofon with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goFonServer.inc:100
-#, php-format
-msgid "Saving server services/gofon with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goFonServer.inc:127
-#, php-format
-msgid "Set status flag for server services/gofon with dn '%s' failed."
+#: plugins/admin/systems/class_goFonServer.inc:58
+msgid "VoIP service - Asterisk management"
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:137
-#, php-format
+#: plugins/admin/systems/class_goFonServer.inc:67
 msgid "The attribute DB user is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:143
-#, php-format
+#: plugins/admin/systems/class_goFonServer.inc:73
 msgid ""
 "The attribute local dial prefix is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:146
-#, php-format
+#: plugins/admin/systems/class_goFonServer.inc:76
 msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:224
-msgid "GoFon server"
+#: plugins/admin/systems/class_goFonServer.inc:113
+#, php-format
+msgid ""
+"You can't remove the asterisk database extension, it is still in use by "
+"these objects '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:225
-msgid "GoFon server service"
+#: plugins/admin/systems/class_goFonServer.inc:125
+msgid "VoIP - asterisk management"
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:235
+#: plugins/admin/systems/class_goFonServer.inc:139
 msgid "Area code"
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:236
+#: plugins/admin/systems/class_goFonServer.inc:140
 msgid "Country code"
 msgstr ""
 
-#: plugins/admin/systems/class_goLogDBServer.inc:79
-#, php-format
-msgid "Removing server services/goLogDB with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLogDBServer.inc:97
-#, php-format
-msgid "Saving server services/goLogDB with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLogDBServer.inc:124
-#, php-format
-msgid "Set status flag for server services/goLogDB with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLogDBServer.inc:215
-msgid "Log"
+#: plugins/admin/systems/class_goLogDBServer.inc:30
+#: plugins/admin/systems/class_goLogDBServer.inc:53
+#: plugins/admin/systems/class_goLogDBServer.inc:83
+#: plugins/admin/systems/class_goLogDBServer.inc:84
+msgid "Logging database"
 msgstr ""
 
-#: plugins/admin/systems/class_goLogDBServer.inc:216
-msgid "Log service"
+#: plugins/admin/systems/goSyslogServer.tpl:1
+msgid "Syslog Service"
 msgstr ""
 
 #: plugins/admin/systems/goSyslogServer.tpl:1
@@ -11447,93 +11628,72 @@ msgstr ""
 msgid "enabled"
 msgstr ""
 
-#: plugins/admin/systems/class_goKrbServer.inc:29
-#: plugins/admin/systems/class_goKrbServer.inc:220
+#: plugins/admin/systems/class_goKrbServer.inc:30
 msgid "Kerberos service"
 msgstr ""
 
-#: plugins/admin/systems/class_goKrbServer.inc:49
-msgid "Kerberos kadmin access informations"
-msgstr ""
-
-#: plugins/admin/systems/class_goKrbServer.inc:79
-#, php-format
-msgid "Removing server services/gokrb with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goKrbServer.inc:97
-#, php-format
-msgid "Saving server services/gokrb with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goKrbServer.inc:124
-#, php-format
-msgid "Set status flag for server services/gokrb with dn '%s' failed."
+#: plugins/admin/systems/class_goKrbServer.inc:53
+msgid "Kerberos service (kadmin access informations)"
 msgstr ""
 
-#: plugins/admin/systems/class_goKrbServer.inc:135
+#: plugins/admin/systems/class_goKrbServer.inc:63
 #, php-format
 msgid "The specified kerberos password is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_goKrbServer.inc:138
+#: plugins/admin/systems/class_goKrbServer.inc:66
 #, php-format
 msgid "The specified kerberos admin is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_goKrbServer.inc:141
+#: plugins/admin/systems/class_goKrbServer.inc:69
 #, php-format
 msgid "The specified kerberos realm is empty."
 msgstr ""
 
-#: plugins/admin/systems/class_goKrbServer.inc:228
-msgid "Realm"
-msgstr ""
-
-#: plugins/admin/systems/class_goMailServer.inc:44
-msgid "Mail service (SMTP)"
+#: plugins/admin/systems/class_goKrbServer.inc:88
+msgid "Kerberos access information"
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:488
-msgid "Postfix"
+#: plugins/admin/systems/class_goKrbServer.inc:96
+msgid "Realm"
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:518
-#, php-format
-msgid "Removing server services/mail with dn '%s' failed."
+#: plugins/admin/systems/class_goMailServer.inc:46
+#: plugins/admin/systems/class_goMailServer.inc:508
+msgid "Mail smtp service (Postfix)"
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:586
+#: plugins/admin/systems/class_goMailServer.inc:577
 #, php-format
 msgid "Saving server services/mail with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:614
-#, php-format
-msgid "Set status flag for server services/mail with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goMailServer.inc:625
+#: plugins/admin/systems/class_goMailServer.inc:592
 msgid "Please specify a numeric value for header size limit."
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:629
+#: plugins/admin/systems/class_goMailServer.inc:596
 msgid "Please specify a numeric value for mailbox size limit."
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:633
+#: plugins/admin/systems/class_goMailServer.inc:600
 msgid "Please specify a numeric value for message size limit."
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:780
-msgid "Mail service"
+#: plugins/admin/systems/class_goMailServer.inc:685
+msgid "Mail smtp (Postfix)"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:686
+msgid "Mail smtp - Postfix"
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:789
+#: plugins/admin/systems/class_goMailServer.inc:696
 msgid "Header size limit"
 msgstr ""
 
-#: plugins/admin/systems/class_goMailServer.inc:795
+#: plugins/admin/systems/class_goMailServer.inc:702
 msgid "Transport table"
 msgstr ""
 
@@ -11541,227 +11701,254 @@ msgstr ""
 msgid "GLPI database information"
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:48
-msgid "IMAP/POP3 service"
-msgstr ""
-
-#: plugins/admin/systems/class_goImapServer.inc:53
-msgid "Repair database"
+#: plugins/admin/systems/goGlpiServer.tpl:4
+#: plugins/admin/systems/goLogDBServer.tpl:4
+msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:83
-msgid "Cyrus service"
+#: plugins/admin/systems/goCupsServer.tpl:1
+msgid "Print Service"
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:112
-#, php-format
-msgid "Removing server services/imap with dn '%s' failed."
+#: plugins/admin/systems/class_goImapServer.inc:50
+msgid "IMAP/POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:130
-#, php-format
-msgid "Saving server services/imap with dn '%s' failed."
+#: plugins/admin/systems/class_goImapServer.inc:55
+#: plugins/admin/systems/class_goImapServer.inc:167
+msgid "Repair database"
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:158
-#, php-format
-msgid "Set status flag for server services/imap with dn '%s' failed."
+#: plugins/admin/systems/class_goImapServer.inc:96
+msgid "IMAP/POP3 (Cyrus) service"
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:168
+#: plugins/admin/systems/class_goImapServer.inc:106
 msgid "Please specify a server identifier."
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:171
+#: plugins/admin/systems/class_goImapServer.inc:109
 msgid "Please specify a connect url."
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:174
+#: plugins/admin/systems/class_goImapServer.inc:112
 msgid "Please specify an admin user."
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:177
+#: plugins/admin/systems/class_goImapServer.inc:115
 msgid "Please specify a password for the admin user."
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:182
+#: plugins/admin/systems/class_goImapServer.inc:120
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:186
+#: plugins/admin/systems/class_goImapServer.inc:124
 msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:273
-msgid "Imap"
-msgstr ""
-
-#: plugins/admin/systems/class_goImapServer.inc:274
-msgid "Imap service"
+#: plugins/admin/systems/class_goImapServer.inc:154
+#: plugins/admin/systems/class_goImapServer.inc:155
+msgid "IMAP/POP3"
 msgstr ""
 
-#: plugins/admin/systems/class_goImapServer.inc:285
-#: ihtml/themes/default/setup_step4.tpl:27
+#: plugins/admin/systems/class_goImapServer.inc:172
+#: ihtml/themes/default/setup_step4.tpl:27 setup/setup_step4.tpl:85
 msgid "Admin password"
 msgstr ""
 
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr ""
-
-#: plugins/admin/systems/class_goShareServer.inc:31
+#: plugins/admin/systems/class_goShareServer.inc:32
 msgid "File service"
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:178
-#, php-format
-msgid "Removing of system server/shares with dn '%s' failed."
+#: plugins/admin/systems/class_goShareServer.inc:153
+#: plugins/admin/systems/class_goShareServer.inc:361
+msgid "File service (Shares)"
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:212
+#: plugins/admin/systems/class_goShareServer.inc:187
 #, php-format
 msgid "Saving of system server/shares with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:239
+#: plugins/admin/systems/class_goShareServer.inc:223
 #, php-format
-msgid "Set status flag for system server/shares with dn '%s' failed."
+msgid "The share can't be removed since it is still used by %d users:"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:228
+msgid "Please correct the share-/profile settings of these users"
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:287
+#: plugins/admin/systems/class_goShareServer.inc:256
 #, php-format
 msgid "Creating system server/shares (mount container) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:301
+#: plugins/admin/systems/class_goShareServer.inc:270
 #, php-format
 msgid "Removing system server/shares (mount container) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:312
+#: plugins/admin/systems/class_goShareServer.inc:281
 #, php-format
 msgid "Saving system server/shares (mount container) with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:449
-msgid "Share service"
+#: plugins/admin/systems/class_goShareServer.inc:362
+msgid "File service - Shares"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:371
+msgid "Apple mounts"
 msgstr ""
 
-#: plugins/admin/systems/class_goShareServer.inc:457
-msgid "Share entry"
+#: plugins/admin/systems/class_goShareServer.inc:374
+msgid "Charset"
 msgstr ""
 
 #: plugins/admin/systems/goLogDBServer.tpl:1
 msgid "Logging database information"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:46
-#: plugins/admin/systems/class_goVirusServer.inc:244
+#: plugins/admin/systems/class_goVirusServer.inc:47
+#: plugins/admin/systems/class_goVirusServer.inc:202
+#: plugins/admin/systems/class_goVirusServer.inc:211
+#: plugins/admin/systems/class_goVirusServer.inc:212
 msgid "Anti virus"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:80
-msgid "Remove anti virus extension"
-msgstr ""
-
-#: plugins/admin/systems/class_goVirusServer.inc:81
-msgid ""
-"This server has anti virus features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-
-#: plugins/admin/systems/class_goVirusServer.inc:84
-msgid "Add anti virus service"
-msgstr ""
-
-#: plugins/admin/systems/class_goVirusServer.inc:85
-msgid ""
-"This server has anti virus features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-
-#: plugins/admin/systems/class_goVirusServer.inc:151
-#, php-format
-msgid "Removing of server services/anti virus with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goVirusServer.inc:196
+#: plugins/admin/systems/class_goVirusServer.inc:147
 #, php-format
 msgid "Saving of server services/anti virus with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:204
+#: plugins/admin/systems/class_goVirusServer.inc:155
+#: plugins/admin/systems/class_goVirusServer.inc:230
 msgid "Maximum directory recursions"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:205
-#: plugins/admin/systems/goVirusServer.tpl:37
+#: plugins/admin/systems/class_goVirusServer.inc:156
+#: plugins/admin/systems/class_goVirusServer.inc:229
+#: plugins/admin/systems/goVirusServer.tpl:43
 msgid "Maximum threads"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:206
-#: plugins/admin/systems/goVirusServer.tpl:114
+#: plugins/admin/systems/class_goVirusServer.inc:157
+#: plugins/admin/systems/class_goVirusServer.inc:232
+#: plugins/admin/systems/goVirusServer.tpl:134
 msgid "Maximum file size"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:207
+#: plugins/admin/systems/class_goVirusServer.inc:158
+#: plugins/admin/systems/class_goVirusServer.inc:233
 msgid "Maximum recursions"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:208
-#: plugins/admin/systems/goVirusServer.tpl:128
+#: plugins/admin/systems/class_goVirusServer.inc:159
+#: plugins/admin/systems/class_goVirusServer.inc:234
+#: plugins/admin/systems/goVirusServer.tpl:152
 msgid "Maximum compression ratio"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:209
-#: plugins/admin/systems/goVirusServer.tpl:61
+#: plugins/admin/systems/class_goVirusServer.inc:160
+#: plugins/admin/systems/class_goVirusServer.inc:236
+#: plugins/admin/systems/goVirusServer.tpl:71
 msgid "Checks per day"
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:213
+#: plugins/admin/systems/class_goVirusServer.inc:164
 #, php-format
 msgid "The specified value for '%s' must be a numeric value."
 msgstr ""
 
-#: plugins/admin/systems/class_goVirusServer.inc:329
+#: plugins/admin/systems/class_goVirusServer.inc:168
+#: plugins/admin/systems/goVirusServer.tpl:13
+msgid "Database user"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:168
+#: plugins/admin/systems/class_goVirusServer.inc:237
+#: plugins/admin/systems/goVirusServer.tpl:33
+msgid "Http proxy URL"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:168
+#: plugins/admin/systems/class_goVirusServer.inc:235
+#: plugins/admin/systems/goVirusServer.tpl:23
+msgid "Database mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:170
 #, php-format
-msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgid "Please specify a valid value for '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:224
+#: plugins/admin/systems/goVirusServer.tpl:84
+msgid "Enable debugging"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:225
+#: plugins/admin/systems/goVirusServer.tpl:92
+msgid "Enable mail scanning"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:226
+#: plugins/admin/systems/goVirusServer.tpl:117
+msgid "Enable scanning of archives"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:227
+#: plugins/admin/systems/goVirusServer.tpl:125
+msgid "Block encrypted archives"
+msgstr ""
+
+#: plugins/admin/systems/class_goVirusServer.inc:231
+msgid "Anti virus user"
 msgstr ""
 
 #: plugins/admin/systems/goSpamServer.tpl:8
+#: plugins/admin/systems/class_goSpamServer.inc:328
 msgid "Rewrite header"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:16
+#: plugins/admin/systems/goSpamServer.tpl:18
+#: plugins/admin/systems/class_goSpamServer.inc:330
 msgid "Required score"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:19
+#: plugins/admin/systems/goSpamServer.tpl:22
 msgid "Select required score to tag mail as spam"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:56
+#: plugins/admin/systems/goSpamServer.tpl:69
+#: plugins/admin/systems/class_goSpamServer.inc:333
 msgid "Enable use of bayes filtering"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:57
+#: plugins/admin/systems/goSpamServer.tpl:72
 msgid "Enable bayes auto learning"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:58
+#: plugins/admin/systems/goSpamServer.tpl:75
+#: plugins/admin/systems/class_goSpamServer.inc:335
 msgid "Enable RBL checks"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:67
+#: plugins/admin/systems/goSpamServer.tpl:86
+#: plugins/admin/systems/class_goSpamServer.inc:336
 msgid "Enable use of Razor"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:68
+#: plugins/admin/systems/goSpamServer.tpl:89
+#: plugins/admin/systems/class_goSpamServer.inc:337
 msgid "Enable use of DDC"
 msgstr ""
 
-#: plugins/admin/systems/goSpamServer.tpl:69
+#: plugins/admin/systems/goSpamServer.tpl:92
+#: plugins/admin/systems/class_goSpamServer.inc:338
 msgid "Enable use of Pyzor"
 msgstr ""
 
@@ -11773,96 +11960,92 @@ msgstr ""
 msgid "Generic virus filtering"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:13
-msgid "Database user"
+#: plugins/admin/systems/goVirusServer.tpl:47
+msgid "Select number of maximal threads"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:21
-msgid "Database mirror"
+#: plugins/admin/systems/goVirusServer.tpl:61
+msgid "Max directory recursions"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:29
-msgid "Http proxy URL"
+#: plugins/admin/systems/goVirusServer.tpl:101
+msgid "Archive scanning"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:40
-msgid "Select number of maximal threads"
+#: plugins/admin/systems/goVirusServer.tpl:143
+msgid "Maximum recursion"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:53
-msgid "Max directory recursions"
+#: plugins/admin/systems/class_goSpamServer.inc:49
+#: plugins/admin/systems/class_goSpamServer.inc:319
+#: plugins/admin/systems/class_goSpamServer.inc:320
+#: plugins/admin/systems/class_goSpamServer.inc:346
+msgid "Spamassassin"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:70
-msgid "Enable debugging"
+#: plugins/admin/systems/class_goSpamServer.inc:219
+msgid "Specified value is not a valid 'trusted network' value."
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:76
-msgid "Enable mail scanning"
+#: plugins/admin/systems/class_goSpamServer.inc:277
+#, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:85
-msgid "Archive scanning"
+#: plugins/admin/systems/class_goSpamServer.inc:286
+msgid "Required score must be a numeric value."
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:99
-msgid "Enable scanning of archives"
+#: plugins/admin/systems/class_goSpamServer.inc:329
+msgid "Trusted networks"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:105
-msgid "Block encrypted archives"
+#: plugins/admin/systems/class_goSpamServer.inc:331
+msgid "Rules"
 msgstr ""
 
-#: plugins/admin/systems/goVirusServer.tpl:121
-msgid "Maximum recursion"
+#: plugins/admin/systems/class_goSpamServer.inc:334
+msgid "Enabled bayes auto learning"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:47
-#: plugins/admin/systems/class_goSpamServer.inc:391
-msgid "Spamassassin"
+#: plugins/admin/systems/class_goService.inc:25
+#: plugins/admin/systems/class_goService.inc:55
+msgid "Empty service"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:102
-msgid "Remove spamassassin extension"
+#: plugins/admin/systems/class_goService.inc:92
+#, php-format
+msgid "Removing of server services/"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:103
-msgid ""
-"This server has spamassassin features enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/class_goService.inc:92
+#: plugins/admin/systems/class_goService.inc:116
+#: plugins/admin/systems/class_goService.inc:147
+#, php-format
+msgid " - ("
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:106
-msgid "Add spamassassin service"
+#: plugins/admin/systems/class_goService.inc:92
+#: plugins/admin/systems/class_goService.inc:116
+#: plugins/admin/systems/class_goService.inc:147
+#, php-format
+msgid ") with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:107
-msgid ""
-"This server has spamassassin features disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/systems/class_goService.inc:116
+#, php-format
+msgid "Saving of server services/"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:233
-msgid "Specified value is not a valid 'trusted network' value."
-msgstr ""
-
-#: plugins/admin/systems/class_goSpamServer.inc:274
-#, php-format
-msgid "Removing of server services/spamassassin with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goSpamServer.inc:322
+#: plugins/admin/systems/class_goService.inc:147
 #, php-format
-msgid "Saving of server services/spamassassin with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goSpamServer.inc:331
-msgid "Required score must be a numeric value."
+msgid "Set status flag for server services/"
 msgstr ""
 
-#: plugins/admin/systems/class_goSpamServer.inc:475
+#: plugins/admin/systems/class_goService.inc:204
 #, php-format
-msgid "Set status flag for server services/spamassassin with dn '%s' failed."
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
 msgstr ""
 
 #: plugins/admin/ogroups/termgroup.tpl:2
@@ -11880,34 +12063,38 @@ msgstr ""
 msgid "Member objects"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:62
-#: plugins/admin/ogroups/tabs_ogroups.inc:174
+#: plugins/admin/ogroups/tabs_ogroups.inc:67
+#: plugins/admin/ogroups/tabs_ogroups.inc:183
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:389
+#: plugins/admin/ogroups/tabs_ogroups.inc:92
+#: plugins/admin/ogroups/class_termgroup.inc:382
 msgid "System"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:154
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
 msgid "Terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_termgroup.inc:120
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
 msgid "There must be at least one NTP server selected."
 msgstr ""
 
-#: plugins/admin/ogroups/class_termgroup.inc:174
+#: plugins/admin/ogroups/class_termgroup.inc:167
 #, php-format
 msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_termgroup.inc:382
+#: plugins/admin/ogroups/class_termgroup.inc:375
 msgid "Saving workstation failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_termgroup.inc:390
+#: plugins/admin/ogroups/class_termgroup.inc:383
 msgid "System group"
 msgstr ""
 
@@ -11963,27 +12150,27 @@ msgstr ""
 msgid "Select to see phones"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects of department"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:760
+#: plugins/admin/ogroups/class_ogroup.inc:701
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:192
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:188
 msgid "You are not allowed to delete this object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:138
+#: plugins/admin/ogroups/class_ogroup.inc:149
 msgid "This 'dn' is no object group."
 msgstr ""
 
@@ -12031,41 +12218,46 @@ msgstr ""
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:447
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:653
+#: plugins/admin/ogroups/class_ogroup.inc:589
 msgid "There is already an object with this cn."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:604
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:716
+#: plugins/admin/ogroups/class_ogroup.inc:653
 #, php-format
 msgid "Saving of object group/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:729
+#: plugins/admin/ogroups/class_ogroup.inc:666
 #, php-format
 msgid "Removing of object group/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:696
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:766
+#: plugins/admin/ogroups/class_ogroup.inc:707
 msgid "Member"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
+#: plugins/admin/ogroups/phonequeue.tpl:2
+msgid ""
+"Only users with the same asterisk home server will be included to this queue."
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:5
 msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/admin/ogroups/phonequeue.tpl:8
 #: plugins/gofon/phoneaccount/generic.tpl:1
 #: plugins/gofon/phoneaccount/generic.tpl:6
 #: plugins/gofon/phoneaccount/paste_generic.tpl:2
@@ -12073,118 +12265,127 @@ msgstr ""
 msgid "Phone numbers"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:120
+#: plugins/admin/ogroups/phonequeue.tpl:12
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:60
-#: plugins/admin/ogroups/class_phonequeue.inc:727
+#: plugins/admin/ogroups/phonequeue.tpl:50
+#: plugins/admin/ogroups/class_phonequeue.inc:917
+#: plugins/gofon/phoneaccount/generic.tpl:38
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1463
+#: plugins/gofon/conference/generic.tpl:68
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:688
+msgid "Home server"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/class_phonequeue.inc:915
 msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:80
+#: plugins/admin/ogroups/phonequeue.tpl:95
 msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
-#: plugins/admin/ogroups/class_phonequeue.inc:728
+#: plugins/admin/ogroups/phonequeue.tpl:109
+#: plugins/admin/ogroups/class_phonequeue.inc:916
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:104
-#: plugins/admin/ogroups/class_phonequeue.inc:729
+#: plugins/admin/ogroups/phonequeue.tpl:119
+#: plugins/admin/ogroups/class_phonequeue.inc:918
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:110
+#: plugins/admin/ogroups/phonequeue.tpl:125
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:118
+#: plugins/admin/ogroups/phonequeue.tpl:133
 msgid "Queue sound setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:123
+#: plugins/admin/ogroups/phonequeue.tpl:138
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:134
-#: plugins/admin/ogroups/class_phonequeue.inc:736
+#: plugins/admin/ogroups/phonequeue.tpl:149
+#: plugins/admin/ogroups/class_phonequeue.inc:925
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:144
+#: plugins/admin/ogroups/phonequeue.tpl:159
 msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:154
+#: plugins/admin/ogroups/phonequeue.tpl:169
 msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
+#: plugins/admin/ogroups/phonequeue.tpl:179
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:174
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:199
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:194
+#: plugins/admin/ogroups/phonequeue.tpl:209
 msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
+#: plugins/admin/ogroups/phonequeue.tpl:219
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:214
+#: plugins/admin/ogroups/phonequeue.tpl:229
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:239
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/phonequeue.tpl:249
 msgid "Less Than sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:252
+#: plugins/admin/ogroups/phonequeue.tpl:267
 msgid "Phone attributes "
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:262
-#: plugins/admin/ogroups/class_phonequeue.inc:749
+#: plugins/admin/ogroups/phonequeue.tpl:277
+#: plugins/admin/ogroups/class_phonequeue.inc:938
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:270
-#: plugins/admin/ogroups/class_phonequeue.inc:730
+#: plugins/admin/ogroups/phonequeue.tpl:285
+#: plugins/admin/ogroups/class_phonequeue.inc:919
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:278
-#: plugins/admin/ogroups/class_phonequeue.inc:731
+#: plugins/admin/ogroups/phonequeue.tpl:293
+#: plugins/admin/ogroups/class_phonequeue.inc:920
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:290
-#: plugins/admin/ogroups/class_phonequeue.inc:732
+#: plugins/admin/ogroups/phonequeue.tpl:305
+#: plugins/admin/ogroups/class_phonequeue.inc:921
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:298
-#: plugins/admin/ogroups/class_phonequeue.inc:734
+#: plugins/admin/ogroups/phonequeue.tpl:313
+#: plugins/admin/ogroups/class_phonequeue.inc:923
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:306
-#: plugins/admin/ogroups/class_phonequeue.inc:733
+#: plugins/admin/ogroups/phonequeue.tpl:321
+#: plugins/admin/ogroups/class_phonequeue.inc:922
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -12194,6 +12395,10 @@ msgid ""
 "GOsa to get your data back."
 msgstr ""
 
+#: plugins/admin/ogroups/paste_mail.tpl:7
+msgid "Please enter a mail address"
+msgstr ""
+
 #: plugins/admin/ogroups/mail.tpl:7
 msgid "Mail distribution list"
 msgstr ""
@@ -12222,182 +12427,233 @@ msgstr ""
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:164
+#: plugins/admin/ogroups/class_mailogroup.inc:168
 msgid "Mail group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:79
+#: plugins/admin/ogroups/class_phonequeue.inc:92
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:98
+#, php-format
+msgid ""
+"The specified home server '%s' is not available in GOsa server "
+"configuration. Saving this account will create a new entry on the server '%"
+"s'. Use cancel if you do not want to create a new entry while ignoring old "
+"accounts."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:122
 msgid "ring all"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
+#: plugins/admin/ogroups/class_phonequeue.inc:123
 msgid "round robin"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
+#: plugins/admin/ogroups/class_phonequeue.inc:124
 msgid "least recently called"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:82
+#: plugins/admin/ogroups/class_phonequeue.inc:125
 msgid "fewest completed calls"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/admin/ogroups/class_phonequeue.inc:126
 msgid "random"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:84
+#: plugins/admin/ogroups/class_phonequeue.inc:127
 msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:117
+#: plugins/admin/ogroups/class_phonequeue.inc:148
+#: plugins/gofon/macro/class_gofonMacro.inc:188
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:300
+msgid ""
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:159
+#: plugins/gofon/macro/class_gofonMacro.inc:198
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:311
+#, php-format
+msgid ""
+"The MySQL home server '%s' isn't reachable as user '%s', check GOsa log for "
+"mysql error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:166
+#: plugins/gofon/macro/class_gofonMacro.inc:205
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#, php-format
+msgid "Can't select database '%s' on home server '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:330
+#, php-format
+msgid ""
+"The MySQL initial home server '%s' isn't reachable as user '%s', check GOsa "
+"log for mysql error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:185
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:337
+#, php-format
+msgid "Can't select database '%s' on initial home server '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:208
 msgid "Remove the phone queue from this Account"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:118
+#: plugins/admin/ogroups/class_phonequeue.inc:209
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:120
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:121
+#: plugins/admin/ogroups/class_phonequeue.inc:212
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:300
+msgid ""
+"There must be at least one server with an asterisk database to create a "
+"phone queue."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:303
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1132
+msgid "Please select a valid goFonHomeServer."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:309
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:214
+#: plugins/admin/ogroups/class_phonequeue.inc:312
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:217
+#: plugins/admin/ogroups/class_phonequeue.inc:315
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:220
+#: plugins/admin/ogroups/class_phonequeue.inc:318
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:321
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:237
+#: plugins/admin/ogroups/class_phonequeue.inc:344
+#: plugins/admin/ogroups/class_phonequeue.inc:393
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:300
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:858
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:388
 msgid ""
-"There is currently no asterisk server defined. Your settings can't be saved."
+"There is currently no asterisk server defined. Possibly you are missing a "
+"server that handles the asterisk management (goFonServer). Your settings "
+"can't be saved to asterisk database."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:271
-#, php-format
-msgid ""
-"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+#: plugins/admin/ogroups/class_phonequeue.inc:376
+msgid "Error while removing old queue entries from database."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:260
-#: plugins/admin/ogroups/class_phonequeue.inc:635
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:88
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:308
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1069
-#: plugins/gofon/macro/class_gofonMacro.inc:247
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:398
-#, php-format
-msgid "Can't select database %s on %s."
+#: plugins/admin/ogroups/class_phonequeue.inc:377
+#: plugins/admin/ogroups/class_phonequeue.inc:436
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:426
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
+msgid "Please have a look a the gosa logfiles."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:291
-#: plugins/admin/ogroups/class_phonequeue.inc:505
-#: plugins/admin/ogroups/class_phonequeue.inc:671
-#, php-format
-msgid "Can't delete in Database %s, on Server %s."
+#: plugins/admin/ogroups/class_phonequeue.inc:436
+msgid "Could not detect old queue entry, query failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:535
-#: plugins/admin/ogroups/class_phonequeue.inc:537
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1174
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1176
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:440
+#: plugins/admin/ogroups/class_phonequeue.inc:522
 #, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgid ""
+"More than one entry in queue table found, that uses the name ('%s'). Please "
+"fix this issue manually first."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:597
-#, php-format
-msgid "Saving of object group/phone queue with dn '%s' failed."
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "Mysql query failed."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:625
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:81
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:297
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1058
-#: plugins/gofon/macro/class_gofonMacro.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:763
+#: plugins/admin/ogroups/class_phonequeue.inc:765
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1394
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1396
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:596
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:598
 #, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:694
-#, php-format
-msgid "Removing of object group/phone queue with dn '%s' failed."
+#: plugins/admin/ogroups/class_phonequeue.inc:830
+msgid "Saving phone queue failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:719
+#: plugins/admin/ogroups/class_phonequeue.inc:882
+msgid "Removing phone queue failed"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:907
 msgid "Phone group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:737
+#: plugins/admin/ogroups/class_phonequeue.inc:926
 msgid "Welcome music"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:738
+#: plugins/admin/ogroups/class_phonequeue.inc:927
 msgid "Report hold time"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:739
+#: plugins/admin/ogroups/class_phonequeue.inc:928
 msgid "'You are next' sound"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:740
+#: plugins/admin/ogroups/class_phonequeue.inc:929
 msgid "'There are' sound"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: plugins/admin/ogroups/class_phonequeue.inc:930
 msgid "'Call waiting' sound"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:742
+#: plugins/admin/ogroups/class_phonequeue.inc:931
 msgid "'Thank you' sound"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:743
+#: plugins/admin/ogroups/class_phonequeue.inc:932
 msgid "'Minutes' sound"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:744
+#: plugins/admin/ogroups/class_phonequeue.inc:933
 msgid "'Seconds' sound"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:745
+#: plugins/admin/ogroups/class_phonequeue.inc:934
 msgid "'Less than' sound"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:746
+#: plugins/admin/ogroups/class_phonequeue.inc:935
 msgid "Queue phone number"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:750
+#: plugins/admin/ogroups/class_phonequeue.inc:939
 msgid "Announce"
 msgstr ""
 
@@ -12489,30 +12745,46 @@ msgstr ""
 msgid "Show groups containing phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
 msgid "Create new object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
 msgid "You are not allowed to remove this entry."
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/ogroups/paste_generic.tpl:7
+msgid "Please enter the new object group name"
+msgstr ""
+
+#: plugins/admin/acl/tabs_acl.inc:8 plugins/admin/acl/class_divListACL.inc:182
+msgid "Acl"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:27
 msgid "ACLs"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:141
+msgid "You are not allowed to create a new role."
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:178
+msgid "You are not allowed to edit this acl."
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:223
 #, php-format
 msgid "You're about to delete the acl %s."
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:229
+#: plugins/admin/acl/class_aclManagement.inc:254
 msgid "You are not allowed to delete this acl!"
 msgstr ""
 
@@ -12528,96 +12800,256 @@ msgstr ""
 msgid "This menu allows you to edit and delete selected acls."
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
 msgid "Display acls matching"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:109
-msgid "Acl"
+#: plugins/admin/acl/class_divListACL.inc:115
+msgid "New acl role"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Select to display users"
+#: plugins/admin/acl/class_divListACL.inc:166
+msgid "Edit acl role"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Display user"
+#: plugins/admin/acl/class_divListACL.inc:176
+msgid "Delete acl role"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Select to display departments"
+#: plugins/admin/acl/class_divListACL.inc:188
+msgid "Edit acl"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Display departments"
+#: plugins/admin/acl/class_divListACL.inc:192
+msgid "Delete acl"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:231
+#: plugins/admin/acl/class_divListACL.inc:232
+#: plugins/admin/acl/class_divListACL.inc:237
+#: plugins/admin/acl/class_aclRole.inc:930
+msgid "ACL roles"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:232
+msgid "Access control list"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:240
+msgid "Role name"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:241
+msgid "Role description"
 msgstr ""
 
 #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
 msgid "ACL management"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.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"
+#: plugins/admin/acl/tabs_acl_role.inc:8
+msgid "ACL Templates"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
+#: plugins/admin/acl/acl_role.tpl:3 ihtml/themes/default/acl.tpl:2
+msgid "Assigned ACLs for current entry"
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+msgid "New ACL"
 msgstr ""
 
-#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
-msgid "Fully Automatic Installation"
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+msgid "ACL type"
+msgstr ""
+
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+msgid "Select an acl type"
+msgstr ""
+
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+msgid "List of available ACL categories"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:6
+msgid "Access control list templates"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:102 include/class_acl.inc:145
+msgid "All categories"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:109 include/class_acl.inc:153
+msgid "Reset ACLs"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:110 include/class_acl.inc:154
+msgid "One level"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:384
+#: plugins/admin/acl/class_aclRole.inc:111 include/class_acl.inc:155
+#: include/class_acl.inc:160
+msgid "Current object"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:112 include/class_acl.inc:156
+msgid "Complete subtree"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:113 include/class_acl.inc:157
+msgid "Complete subtree (permanent)"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:339 include/class_acl.inc:372
+msgid "Edit ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:340 include/class_acl.inc:373
+msgid "Delete ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:377 include/class_acl.inc:410
+msgid "No ACL settings for this category"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:379 include/class_acl.inc:412
 #, php-format
-msgid "Creating of FAI/script with dn '%s' failed."
+msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:481
-#: plugins/admin/fai/class_faiScript.inc:491
-#: plugins/admin/fai/class_faiHook.inc:496
-msgid "FAI script"
+#: plugins/admin/acl/class_aclRole.inc:384 include/class_acl.inc:417
+msgid "Edit categories ACLs"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:490
-msgid "Script priority"
+#: plugins/admin/acl/class_aclRole.inc:385 include/class_acl.inc:418
+msgid "Clear categories ACLs"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:366
+#: plugins/admin/acl/class_aclRole.inc:401 include/class_acl.inc:462
 #, php-format
-msgid "Saving of FAI/template with dn '%s' failed."
+msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:452
-msgid "FAI template"
+#: plugins/admin/acl/class_aclRole.inc:411 include/class_acl.inc:472
+msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:461
-msgid "Template file"
+#: plugins/admin/acl/class_aclRole.inc:506
+#: plugins/admin/acl/class_aclRole.inc:513 include/class_acl.inc:572
+#: include/class_acl.inc:579
+msgid "Show/Hide Advanced Settings"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:462
-msgid "Template path"
+#: plugins/admin/acl/class_aclRole.inc:531 include/class_acl.inc:597
+msgid "Create objects"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:463
-msgid "File owner"
+#: plugins/admin/acl/class_aclRole.inc:532 include/class_acl.inc:598
+msgid "Move objects"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:464
-msgid "File permissions"
+#: plugins/admin/acl/class_aclRole.inc:533 include/class_acl.inc:599
+msgid "Remove objects"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:535
+#: plugins/admin/acl/class_aclRole.inc:541 include/class_acl.inc:601
+#: include/class_acl.inc:607
+msgid "Modifyable by owner"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:538 include/class_acl.inc:604
+msgid "Move object"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:539 include/class_acl.inc:605
+msgid "Remove object"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:551 include/class_acl.inc:617
+msgid "Complete object"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:667 include/class_acl.inc:733
+#, php-format
+msgid "Unkown ACL type '%s'. Don't know how to handle it."
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:707 include/class_acl.inc:773
+#, php-format
+msgid "Unknown entry '%s'!"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:768 include/class_acl.inc:834
+#, php-format
+msgid "Contains settings for these objects: %s"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:776 include/class_acl.inc:842
+msgid "Members:"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:782 include/class_acl.inc:848
+msgid "ACL is valid for all users"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:897 include/class_acl.inc:956
+#, php-format
+msgid "Saving ACLs with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:935
+msgid "Acl roles"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:36
+#: plugins/admin/fai/faiPartitionTable.tpl:36
+#: plugins/admin/fai/faiScript.tpl:38 plugins/admin/fai/faiTemplate.tpl:33
+#: plugins/admin/fai/faiHook.tpl:38
+#: plugins/admin/fai/class_faiProfileEntry.inc:171
+msgid "Objects"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:38
+msgid "List of assigned variables"
+msgstr ""
+
+#: plugins/admin/fai/faiVariable.tpl:44
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
+#: plugins/admin/fai/main.inc:46 plugins/admin/fai/main.inc:48
+msgid "Fully Automatic Installation"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:434
+#, php-format
+msgid "Creating of FAI/script with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:531
+#: plugins/admin/fai/class_faiHookEntry.inc:191
+msgid "FAI script"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
+#: plugins/admin/fai/class_faiPackage.inc:534
+#: plugins/admin/fai/class_faiPackage.inc:537
+msgid "Readonly"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:415
+#, php-format
+msgid "Saving of FAI/template with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:501
+msgid "FAI template"
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:820
+#: plugins/admin/fai/class_faiManagement.inc:863
 msgid "FAI"
 msgstr ""
 
@@ -12625,61 +13057,74 @@ msgstr ""
 msgid "Fully Automatic Installation - management"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:154
+#: plugins/admin/fai/class_faiManagement.inc:162
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:204
+#: plugins/admin/fai/class_faiManagement.inc:214
 #, php-format
 msgid ""
 "Release cleanup : Removing object (tagged as remvoed) that is no longer in "
 "use '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:264
+#: plugins/admin/fai/class_faiManagement.inc:276
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:267
+#: plugins/admin/fai/class_faiManagement.inc:279
 msgid "You are not allowed to delete this release!"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:322
+#: plugins/admin/fai/class_faiManagement.inc:334
 msgid "Specified branch name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:324
+#: plugins/admin/fai/class_faiManagement.inc:336
 msgid "Specified freeze name is invalid."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:814
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
+#: plugins/admin/fai/class_faiManagement.inc:365
+msgid "You are not allowed to create a new branch."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
+#, php-format
+msgid "You are not allowed to create a new '%s' object."
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:857
+msgid "FAI releases"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:815
-msgid "FAI management"
+#: plugins/admin/fai/class_faiManagement.inc:858
+msgid "FAI release management"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:49
+#: plugins/admin/fai/faiPackage.tpl:53
 msgid "Install method"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:65
+#: plugins/admin/fai/faiPackage.tpl:57
+msgid "Please select the installation method"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:71
 msgid "Used packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:67
+#: plugins/admin/fai/faiPackage.tpl:73
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:675
 msgid "Configure"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:74
+#: plugins/admin/fai/faiPackage.tpl:87
 msgid "Toggle remove flag"
 msgstr ""
 
@@ -12689,11 +13134,11 @@ msgid ""
 "want to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTable.tpl:34
+#: plugins/admin/fai/faiPartitionTable.tpl:38
 msgid "Discs"
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTable.tpl:40
+#: plugins/admin/fai/faiPartitionTable.tpl:44
 msgid "Choose a disk to delete or edit"
 msgstr ""
 
@@ -12741,343 +13186,399 @@ msgstr ""
 msgid "Selected file is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:133
-#: plugins/admin/fai/class_faiVariableEntry.inc:102
-#: plugins/admin/fai/class_faiHookEntry.inc:147
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiScriptEntry.inc:136
+#: plugins/admin/fai/class_faiVariableEntry.inc:107
+#: plugins/admin/fai/class_faiHookEntry.inc:150
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:137
+#: plugins/admin/fai/class_faiScriptEntry.inc:140
 msgid "Please enter a script."
 msgstr ""
 
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/fai/faiScriptEntry.tpl:48
+#: plugins/admin/fai/class_faiScriptEntry.inc:171
+#: plugins/admin/fai/class_faiScriptEntry.inc:181
+msgid "Script entry"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:172
+msgid "FAI script entry"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScriptEntry.inc:182
+msgid "Script Priority"
+msgstr ""
+
+#: plugins/admin/fai/faiScriptEntry.tpl:33
+#: plugins/admin/fai/faiScriptEntry.tpl:54
 msgid "Script attributes"
 msgstr ""
 
-#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
+#: plugins/admin/fai/faiScriptEntry.tpl:43 plugins/admin/fai/faiProfile.tpl:37
 msgid "Choose a priority"
 msgstr ""
 
-#: plugins/admin/fai/faiScriptEntry.tpl:63
-#: plugins/admin/fai/faiHookEntry.tpl:63
+#: plugins/admin/fai/faiScriptEntry.tpl:74
+#: plugins/admin/fai/faiHookEntry.tpl:74
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:396
+#: plugins/admin/fai/class_faiPackage.inc:372
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:400
+#: plugins/admin/fai/class_faiPackage.inc:376
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:421
+#: plugins/admin/fai/class_faiPackage.inc:397
 msgid "package is configured"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:427
+#: plugins/admin/fai/class_faiPackage.inc:403
 msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:454
+#: plugins/admin/fai/class_faiPackage.inc:431
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:498
+#: plugins/admin/fai/class_faiPackage.inc:475
 #, php-format
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:544
+#: plugins/admin/fai/class_faiPackage.inc:523
 #: plugins/admin/fai/faiPackageConfiguration.tpl:1
 msgid "Package"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:545
+#: plugins/admin/fai/class_faiPackage.inc:524
 msgid "FAI Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:556
+#: plugins/admin/fai/class_faiPackage.inc:535
 msgid "Install Method"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:285
-#: plugins/admin/fai/class_faiProfileEntry.inc:152
+#: plugins/admin/fai/class_faiPackage.inc:536
+msgid "Package configuration"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:290
+#: plugins/admin/fai/class_faiProfileEntry.inc:168
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:288
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfileEntry.inc:135
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:289
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfileEntry.inc:136
 msgid "Template bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:290
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfileEntry.inc:137
 msgid "Script bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:291
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfileEntry.inc:138
 msgid "Variable bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:297
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
-#: plugins/admin/fai/class_faiPartitionTable.inc:490
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
-#: plugins/admin/fai/class_faiSummaryTab.inc:43
+#: plugins/admin/fai/class_faiProfile.inc:298
+#: plugins/admin/fai/class_faiPartitionTable.inc:520
+#: plugins/admin/fai/class_faiProfileEntry.inc:140
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
 msgid "Partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:301
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:386
+#: plugins/admin/fai/class_faiProfile.inc:392
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:390
+#: plugins/admin/fai/class_faiProfile.inc:396
 msgid "Please enter a valid name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:402
+#: plugins/admin/fai/class_faiProfile.inc:408
 msgid "There is already a profile with this class name defined."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:425
-#: plugins/admin/fai/class_faiProfile.inc:429
+#: plugins/admin/fai/class_faiProfile.inc:431
+#: plugins/admin/fai/class_faiProfile.inc:435
 #, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:437
+#: plugins/admin/fai/class_faiProfile.inc:443
 msgid "Profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:438
+#: plugins/admin/fai/class_faiProfile.inc:444
 msgid "FAI profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:394
+#: plugins/admin/fai/class_faiHook.inc:437
 #, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:485
+#: plugins/admin/fai/class_faiHook.inc:528
 msgid "Hook"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:486
+#: plugins/admin/fai/class_faiHook.inc:529
 msgid "FAI hook"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:495
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
+#: plugins/admin/fai/class_faiHook.inc:536
+#: plugins/admin/fai/class_faiPartitionTable.inc:528
+#: plugins/admin/fai/class_faiVariable.inc:416
+msgid "Read only"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 msgid "primary"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 msgid "logical"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
 msgid "FS type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-#: plugins/admin/fai/class_faiPartitionTable.inc:502
-#: plugins/admin/fai/class_faiSummaryTab.inc:308
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
 msgid "Mount point"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
-#: plugins/admin/fai/class_faiSummaryTab.inc:307
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
 msgid "Size in MB"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-#: plugins/admin/fai/class_faiPartitionTable.inc:504
-#: plugins/admin/fai/class_faiSummaryTab.inc:306
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
 msgid "Mount options"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
 msgid "FS option"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
 msgid "Preserve"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+msgid "Please specify a valid disc name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
 msgstr ""
 
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+msgid "Partition table entry"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+msgid "FAI partition table entry"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
+msgid "Partition type"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
+msgid "Partition no."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
+msgid "File system type"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
+msgid "Partition size"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
+msgid "File system options"
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
+msgid "Partition flags"
+msgstr ""
+
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 msgid "Device"
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:24
 msgid "Partition entries"
 msgstr ""
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:28
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 msgid "Add partition"
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:36
+#: plugins/admin/fai/faiScript.tpl:40
 msgid "List of scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:98
+#: plugins/admin/fai/class_faiVariableEntry.inc:103
 msgid "Please specify a value for the attribute 'content'."
 msgstr ""
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-msgid "Variable attributes"
+#: plugins/admin/fai/class_faiVariableEntry.inc:134
+msgid "Variable entry"
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariableEntry.inc:135
+msgid "FAI variable entry "
 msgstr ""
 
-#: plugins/admin/fai/faiVariableEntry.tpl:34
-#: plugins/admin/fai/class_faiVariable.inc:394
+#: plugins/admin/fai/class_faiVariableEntry.inc:144
+#: plugins/admin/fai/faiVariableEntry.tpl:38
 msgid "Variable content"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplate.tpl:31
-msgid "List of template files"
+#: plugins/admin/fai/faiVariableEntry.tpl:33
+msgid "Variable attributes"
 msgstr ""
 
 #: plugins/admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr ""
 
-#: plugins/admin/fai/faiSummary.tpl:9
+#: plugins/admin/fai/faiSummary.tpl:11
 msgid "Reload class and release configuration from parent object."
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:36
+#: plugins/admin/fai/faiSummary.tpl:22
+msgid "You are not allowed to view the fai summary."
+msgstr ""
+
+#: plugins/admin/fai/faiTemplate.tpl:35
+msgid "List of template files"
+msgstr ""
+
+#: plugins/admin/fai/faiHook.tpl:40
 msgid "List of hook scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:284
-#: plugins/admin/fai/class_faiPartitionTable.inc:290
+#: plugins/admin/fai/class_faiPartitionTable.inc:313
+#: plugins/admin/fai/class_faiPartitionTable.inc:319
 #, php-format
 msgid "%s partition"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:286
-#: plugins/admin/fai/class_faiPartitionTable.inc:292
+#: plugins/admin/fai/class_faiPartitionTable.inc:315
+#: plugins/admin/fai/class_faiPartitionTable.inc:321
 #, php-format
 msgid "%s partition(s)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:378
+#: plugins/admin/fai/class_faiPartitionTable.inc:408
 #, php-format
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:491
+#: plugins/admin/fai/class_faiPartitionTable.inc:521
 msgid "FAI partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:499
-msgid "Partition type"
-msgstr ""
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:500
-msgid "Partition no."
-msgstr ""
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:501
-msgid "File system type"
-msgstr ""
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:503
-msgid "Partition size"
+#: plugins/admin/fai/class_faiHookEntry.inc:146
+msgid "Please enter a value for script."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:505
-msgid "File system options"
+#: plugins/admin/fai/class_faiHookEntry.inc:180
+msgid "Hook entry"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:506
-msgid "Partition flags"
+#: plugins/admin/fai/class_faiHookEntry.inc:181
+msgid "FAI hook entry"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHookEntry.inc:143
-msgid "Please enter a value for script."
+#: plugins/admin/fai/class_faiHookEntry.inc:190
+#: plugins/admin/fai/faiHookEntry.tpl:38
+msgid "Task"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Package bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:170
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+#: plugins/admin/fai/faiHookEntry.tpl:33 plugins/admin/fai/faiHookEntry.tpl:54
 msgid "Hook attributes"
 msgstr ""
 
-#: plugins/admin/fai/faiHookEntry.tpl:36
+#: plugins/admin/fai/faiHookEntry.tpl:41
 msgid "Choose an existing FAI task"
 msgstr ""
 
@@ -13113,11 +13614,15 @@ msgstr ""
 msgid "Create new FAI object"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:146
+#: plugins/admin/fai/class_askClassName.inc:147
+msgid "Spaces are not allowed within class names."
+msgstr ""
+
+#: plugins/admin/fai/class_askClassName.inc:151
 msgid "The given class name is empty."
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:150
+#: plugins/admin/fai/class_askClassName.inc:155
 msgid "The specified class name is already in use for this object type."
 msgstr ""
 
@@ -13152,95 +13657,119 @@ msgstr ""
 msgid "A new class name."
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:306
+#: plugins/admin/fai/class_faiVariable.inc:330
 #, php-format
 msgid "Saving of FAI/variable with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:385
+#: plugins/admin/fai/class_faiVariable.inc:409
 msgid "FAI variable"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:88
+#: plugins/admin/fai/class_faiTemplateEntry.inc:95
 msgid "no file uploaded yet"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:93
+#: plugins/admin/fai/class_faiTemplateEntry.inc:101
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:184
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 msgid "Please specify a value for attribute 'file'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:188
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
 msgid "Please specify a value for attribute 'path'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:196
+#: plugins/admin/fai/class_faiTemplateEntry.inc:200
 msgid "Please enter a user."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:199
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:203
+#: plugins/admin/fai/class_faiTemplateEntry.inc:207
 msgid "Please enter a group."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:206
+#: plugins/admin/fai/class_faiTemplateEntry.inc:210
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:21
+#: plugins/admin/fai/class_faiTemplateEntry.inc:239
+msgid "Template entry"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:240
+msgid "FAI template entry"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:249
+msgid "Template file"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:250
+msgid "Template path"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:251
+msgid "File owner"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:252
+msgid "File permissions"
+msgstr ""
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:25
 msgid "Template attributes"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:35
+#: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Save template"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:47
+#: plugins/admin/fai/faiTemplateEntry.tpl:57
 msgid "Destination path"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
+#: plugins/admin/fai/faiTemplateEntry.tpl:74
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:700
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:80
+#: plugins/admin/fai/faiTemplateEntry.tpl:96
 msgid "Access"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:87
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
 msgid "Read"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:88
+#: plugins/admin/fai/faiTemplateEntry.tpl:104
 msgid "Write"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:91
+#: plugins/admin/fai/faiTemplateEntry.tpl:107
 msgid "Special"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:100
+#: plugins/admin/fai/faiTemplateEntry.tpl:124
 msgid "SUID"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:109
+#: plugins/admin/fai/faiTemplateEntry.tpl:141
 msgid "SGID"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:112
+#: plugins/admin/fai/faiTemplateEntry.tpl:144
 msgid "Others"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:118
+#: plugins/admin/fai/faiTemplateEntry.tpl:158
 msgid "sticky"
 msgstr ""
 
@@ -13275,42 +13804,6 @@ msgstr ""
 msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:1
-msgid "Repository settings"
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:3
-msgid ""
-"To add packages to your package list you have to setup the repository "
-"settings first."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:5
-msgid ""
-"Packages are usually stored on different servers called mirrors. These "
-"mirrors have different types of releases (for example woody/sarge/etch), "
-"which finally contain packages sorted by section."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:8
-msgid ""
-"Section and release can't be changed in future dialogs, but the mirror can "
-"be changed by editing the entry."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:14
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:26
-msgid "please choose a release..."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:37
-msgid "Sections for this release"
-msgstr ""
-
 #: plugins/admin/fai/faiNewBranch.tpl:5
 msgid ""
 "You are now going to create a branch or locked branch. This action clones "
@@ -13321,22 +13814,29 @@ msgid ""
 "and 'fai'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
+#: plugins/admin/fai/faiNewBranch.tpl:7
+msgid ""
+"Branches are created as subreleases of the currently selected branch. "
+"Creating a new branch named 1.0.2 in SARGE for example, will result in a new "
+"release called SARGE/1.0.2."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:13
 msgid "Please enter a name for the branch"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
+#: plugins/admin/fai/faiNewBranch.tpl:36
 msgid ""
 "As soon as the copy operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the fai management "
 "dialog."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
+#: plugins/admin/fai/faiNewBranch.tpl:44
 msgid "Perform requested operation."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
+#: plugins/admin/fai/faiNewBranch.tpl:44
 msgid "Initiate operation"
 msgstr ""
 
@@ -13347,27 +13847,33 @@ msgid ""
 "to get your data back."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:39
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:44
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:184
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
 msgid "This object has no FAI classes assigned."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:196
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
 msgid "Open"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:303
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
 msgid "No."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:305
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
 msgid "FS options"
 msgstr ""
 
@@ -13455,191 +13961,187 @@ msgstr ""
 msgid "Show partitions"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:131
+#: plugins/admin/fai/class_divListFai.inc:135
 msgid "New profile"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "New partition table"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:136
+#: plugins/admin/fai/class_divListFai.inc:151
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/fai/class_divListFai.inc:152
 msgid "New scripts"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:139
+#: plugins/admin/fai/class_divListFai.inc:152
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:153
 msgid "New hooks"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:153
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "New variables"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:154
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:148
-msgid "New templates"
+#: plugins/admin/fai/class_divListFai.inc:155
+msgid "New templates "
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:148
-msgid "T"
+#: plugins/admin/fai/class_divListFai.inc:155
+msgid "I"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:151
+#: plugins/admin/fai/class_divListFai.inc:156
 msgid "New package list"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:151
+#: plugins/admin/fai/class_divListFai.inc:156
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:222
-#: plugins/admin/fai/class_divListFai.inc:227
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
 msgid "Edit class"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:230
+#: plugins/admin/fai/class_divListFai.inc:251
 msgid "Delete class"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
 #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
 msgid "Mime type"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
 #: plugins/admin/mimetypes/paste_generic.tpl:16
 msgid "Please enter a name for the mime type here"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
 msgid "Mime group"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
 msgid "Categorize this mime type"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
 msgid "Please specify a description"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:67
+#: plugins/admin/mimetypes/generic.tpl:68
 msgid "Mime icon"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:79
+#: plugins/admin/mimetypes/generic.tpl:80
 msgid "Update mime type icon"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:93
+#: plugins/admin/mimetypes/generic.tpl:94
 msgid "Left click"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:98
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/generic.tpl:99
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
 msgid "File patterns"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:104
+#: plugins/admin/mimetypes/generic.tpl:105
 msgid "Please specify a new file pattern"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:107
+#: plugins/admin/mimetypes/generic.tpl:108
 msgid "Add a new file pattern"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:116
-#: plugins/admin/mimetypes/generic.tpl:170
+#: plugins/admin/mimetypes/generic.tpl:117
+#: plugins/admin/mimetypes/generic.tpl:171
 msgid "Enter an application name here"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:119
-#: plugins/admin/mimetypes/generic.tpl:174
+#: plugins/admin/mimetypes/generic.tpl:120
+#: plugins/admin/mimetypes/generic.tpl:175
 msgid "Add application"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:130
+#: plugins/admin/mimetypes/generic.tpl:131
 msgid "Embedding"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:143
+#: plugins/admin/mimetypes/generic.tpl:144
 msgid "Show file in embedded viewer"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:150
+#: plugins/admin/mimetypes/generic.tpl:151
 msgid "Show file in external viewer"
 msgstr ""
 
-#: plugins/admin/mimetypes/generic.tpl:157
+#: plugins/admin/mimetypes/generic.tpl:158
 msgid "Ask whether to save to local disk"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
 #, php-format
 msgid "Saving of mime type/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
 #, php-format
 msgid "Removing of mime type/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
 #, php-format
 msgid "Removing mime type from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
 msgid "Please specify a valid name for this mime type."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
 msgid "Please specify at least one file pattern."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
 msgid "There's already a mime type with this 'Name'."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
 msgid "There's already an mime with this 'Name'."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr ""
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
 msgid "Mime type generic"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 msgid "Mime types"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
 msgid "Left click action"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
 msgid "Embedded applications"
 msgstr ""
 
@@ -13647,13 +14149,13 @@ msgstr ""
 msgid "Manage mime types"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
 #, php-format
 msgid "You're about to delete the mime type '%s'."
 msgstr ""
 
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
 msgid "You are not allowed to delete this mime type!"
 msgstr ""
 
@@ -13681,7 +14183,7 @@ msgstr ""
 msgid "Display mime types matching"
 msgstr ""
 
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
 msgid "Create new mime type"
 msgstr ""
 
@@ -13689,169 +14191,225 @@ msgstr ""
 msgid "Mimetype management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:39
+#: plugins/gofon/phoneaccount/generic.tpl:42
+msgid "Select the accounts home server"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/generic.tpl:50
 #: plugins/gofon/phoneaccount/paste_generic.tpl:32
 msgid "Voicemail PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:60
 #: plugins/gofon/phoneaccount/paste_generic.tpl:40
 msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:71
-#: plugins/gofon/phoneaccount/generic.tpl:73
+#: plugins/gofon/phoneaccount/generic.tpl:82
+#: plugins/gofon/phoneaccount/generic.tpl:84
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:120
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+#, php-format
+msgid ""
+"The specified goFonHomeServer '%s' is not available in GOsa server "
+"configuration. Saving this account will create a new entry on the server '%"
+"s'. Use cancel if you do not want to create a new entry ignoring old "
+"accounts."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:113
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1278
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1289
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:156
 msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:137
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:174
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:649
-#: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:250
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:308
 msgid ""
-"There is currently no asterisk server defined. Possibly you are missing a "
-"server that handles the asterisk management (goFonServer). Your settings "
-"can't be saved to asterisk database."
+"Can't save any changes to asterisk database, there is no mysql extension "
+"available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:258
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:430
+#, php-format
 msgid ""
-"Can't save any changes to asterisk database, there is no mysql extension "
-"available."
+"The MySQL Server '%s' isn't reachable as user '%s'. Abort saving entries to "
+"keep the database consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:438
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:465
+#, php-format
+msgid ""
+"Can't select database %s on %s. Abort saving entries to keep the database "
+"consistent, check GOsa log for mysql error."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:457
+#, php-format
+msgid ""
+"The old MySQL home server '%s' isn't reachable as user '%s'. Abort saving "
+"entries to keep the database consistent, check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:562
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:749
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:959
 msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:640
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:849
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:760
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:969
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:766
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:975
 msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:764
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:973
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:767
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:976
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:780
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:989
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:816
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1128
+msgid ""
+"There must be at least one server with an asterisk database to create a "
+"phone account."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1136
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:911
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1139
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:916
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1144
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:919
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1147
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:929
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1157
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:936
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1164
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:342
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:984
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1228
 #, php-format
 msgid "Saving of user/phone account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1105
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1325
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1138
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1358
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1145
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1365
 #, php-format
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1223
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1442
+#, php-format
+msgid ""
+"The previously selected asterisk home server (%s) is no longer available. "
+"Remove aborted."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1451
 msgid "Phone account settings"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1232
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1456
+msgid "GOfon reports"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1462
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:699
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1233
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1464
 msgid "Macro settings"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1235
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1466
 msgid "Telephone pin"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1236
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1467
 msgid "Voicemail pin"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:114
+#: plugins/gofon/phoneaccount/main.inc:123
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr ""
@@ -13883,23 +14441,21 @@ msgstr ""
 msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
+#: plugins/gofon/macro/class_gofonMacro.inc:542
+#: plugins/gofon/macro/class_divListMacros.inc:52
 msgid "Macro name"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
+#: plugins/gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr ""
-
-#: plugins/gofon/macro/generic.tpl:48
+#: plugins/gofon/macro/generic.tpl:60
 msgid "Visible for user"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:57
+#: plugins/gofon/macro/generic.tpl:70
 msgid "Macro text"
 msgstr ""
 
@@ -13907,139 +14463,153 @@ msgstr ""
 msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
 msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:103
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
-msgid "This 'dn' is no phone macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:187
-msgid ""
-"This macro ist still in use. To delete this Macro ensure that nobody has "
-"selected this Macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:194
-#: plugins/gofon/macro/class_gofonMacro.inc:209
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#: plugins/gofon/macro/class_gofonMacro.inc:235
 #, php-format
-msgid "Removing of goFonMacro/generic account with dn '%s' failed."
+msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:222
-msgid ""
-"There is no mysql extension available in your php setup, can't save any "
-"changes to asterisk db."
+#: plugins/gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "More than one '(' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:292
+#: plugins/gofon/macro/class_gofonMacro.inc:306
 #, php-format
-msgid "Unable to parse macro contents on line: %s"
+msgid "More than one ')' is currently not supported. Line : '%s'."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+msgid "There is no application given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:319
-#: plugins/gofon/macro/class_gofonMacro.inc:327
+#: plugins/gofon/macro/class_gofonMacro.inc:314
 #, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:341
+#: plugins/gofon/macro/class_gofonMacro.inc:343
 #, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+msgid "Insert of new macro failed for server '%s'."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:403
+msgid ""
+"There must be at least one server with an asterisk database to save this "
+"phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:389
+#: plugins/gofon/macro/class_gofonMacro.inc:417
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:394
+#: plugins/gofon/macro/class_gofonMacro.inc:423
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:398
+#: plugins/gofon/macro/class_gofonMacro.inc:427
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:403
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+#: plugins/gofon/macro/class_gofonMacro.inc:436
+msgid ""
+"This macro is still in use. It is necessary to mark this macro as visible "
+"for users."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:409
+#: plugins/gofon/macro/class_gofonMacro.inc:444
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:414
-msgid "Please choose a valid  base."
+#: plugins/gofon/macro/class_gofonMacro.inc:462
+msgid ""
+"This macro is still in use. To delete this Macro ensure that nobody has "
+"selected it."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+msgid ""
+"Could not remove the macro entry from asterisk databases. Please check your "
+"asterisk database configurations."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:481
+#: plugins/gofon/macro/class_gofonMacro.inc:490
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:402
+#, php-format
+msgid "Removing of goFonMacro/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:457
+#: plugins/gofon/macro/class_gofonMacro.inc:524
 #, php-format
 msgid "Saving of goFonMacro/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:533
 msgid "Asterisk macro management"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:477
-msgid "Macro content"
+#: plugins/gofon/macro/class_gofonMacro.inc:538
+msgid "GOfon macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:546
+msgid "Macro content and parameter"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:478
+#: plugins/gofon/macro/class_gofonMacro.inc:547
 msgid "Visibility flag"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
+#: plugins/gofon/macro/parameter.tpl:4
 msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
+#: plugins/gofon/macro/parameter.tpl:8
 msgid "type"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
+#: plugins/gofon/macro/parameter.tpl:19
+msgid "You are not allowed to view the macro parameter settings"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:202
+msgid "This 'dn' is no phone macro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:258
 msgid "String"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:259
 msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:260
 msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:266
 msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:347
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:376
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -14050,38 +14620,32 @@ msgstr ""
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:52
-msgid "macro name"
-msgstr ""
-
 #: plugins/gofon/macro/class_divListMacros.inc:53
 msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:103
 msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
-#: plugins/gofon/macro/class_divListMacros.inc:129
-msgid "Edit macro"
+#: plugins/gofon/macro/class_divListMacros.inc:124
+msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:112
-#: plugins/gofon/macro/class_divListMacros.inc:132
-msgid "Delete macro"
+#: plugins/gofon/macro/class_divListMacros.inc:125
+msgid "visible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:115
-msgid "Macro"
+#: plugins/gofon/macro/class_divListMacros.inc:126
+msgid "invisible"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:116
-msgid "visible"
+#: plugins/gofon/macro/class_divListMacros.inc:147
+msgid "Edit macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:117
-msgid "invisible"
+#: plugins/gofon/macro/class_divListMacros.inc:155
+msgid "Delete macro"
 msgstr ""
 
 #: plugins/gofon/conference/headpage.tpl:6
@@ -14102,136 +14666,162 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:13
+#: plugins/gofon/conference/generic.tpl:15
 msgid "Conference name"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:18
+#: plugins/gofon/conference/generic.tpl:21
 msgid "Name of conference to create"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:24
 #: plugins/gofon/conference/generic.tpl:35
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:66
+#: plugins/gofon/conference/generic.tpl:99
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:104
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
+#: plugins/gofon/conference/generic.tpl:146
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:689
 msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/generic.tpl:154
 #: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:118
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
+#: plugins/gofon/conference/generic.tpl:166
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:690
 msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:126
+#: plugins/gofon/conference/generic.tpl:174
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:143
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
+#: plugins/gofon/conference/generic.tpl:197
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:691
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:149
+#: plugins/gofon/conference/generic.tpl:205
 msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:155
+#: plugins/gofon/conference/generic.tpl:213
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:161
+#: plugins/gofon/conference/generic.tpl:221
 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_phoneConferenceGeneric.inc:182
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:244
 #, php-format
-msgid "Removing of goFonConference/generic with dn '%s' failed."
+msgid ""
+"Could not remove the conference entry from database on home server (%s). "
+"Please check your asterisk database configuration."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:354
+#, php-format
 msgid ""
-"You have specified a conference 'without PIN' ... please leave the PIN "
-"fields empty."
+"The previously selected asterisk home server (%s) is no longer available."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:220
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:359
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:363
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:228
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:367
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:262
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:425
 msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
+"Can not check if there are already some entries with given telephone number "
+"and/or cn in the destination home server."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:437
+msgid ""
+"Can not remove entries with some telephone number and/or cn from destination "
+"home server."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+msgid ""
+"Can not check if entry exists in old database. Please have a look a the gosa "
+"logfiles."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
+msgid ""
+"Can not remove old entries from initial home server. Please have a look a "
+"the gosa logfiles."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:510
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:663
 #, php-format
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:673
+#: plugins/gofon/conference/class_divListConferences.inc:198
+msgid "Conference"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:674
 msgid "Phone conference management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
-msgid "GOfon"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:679
+msgid "GOfon conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:686
 msgid "Conference PIN"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:692
 msgid "Activate menu"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:693
 msgid "Announce user activity"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:694
 msgid "Count user"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:695
 msgid "Conference type"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:697
 msgid "Format"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:698
 msgid "Lifetime"
 msgstr ""
 
@@ -14247,38 +14837,43 @@ msgstr ""
 msgid "Regular expression for matching conference names"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:90
+#: plugins/gofon/conference/class_divListConferences.inc:104
 msgid "Create new conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:90
+#: plugins/gofon/conference/class_divListConferences.inc:104
 msgid "New conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_divListConferences.inc:154
-msgid "Conference"
+#: plugins/gofon/conference/class_divListConferences.inc:192
+#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
+#: include/class_pluglist.inc:245
+msgid "Unknown"
 msgstr ""
 
 #: plugins/gofon/fonreports/contents.tpl:31
+#: plugins/gofon/fonreports/class_fonreport.inc:400
 msgid "Source"
 msgstr ""
 
 #: plugins/gofon/fonreports/contents.tpl:32
+#: plugins/gofon/fonreports/class_fonreport.inc:401
 msgid "Destination"
 msgstr ""
 
 #: plugins/gofon/fonreports/contents.tpl:33
+#: plugins/gofon/fonreports/class_fonreport.inc:402
 msgid "Channel"
 msgstr ""
 
 #: plugins/gofon/fonreports/contents.tpl:36
+#: plugins/gofon/fonreports/class_fonreport.inc:405
 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
+#: plugins/gofon/fonreports/main.inc:16
+#: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
 msgid "Phone reports"
 msgstr ""
 
@@ -14286,19 +14881,27 @@ msgstr ""
 msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:157
-#: plugins/gofon/fonreports/class_fonreport.inc:167
+#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofon/fonreports/class_fonreport.inc:170
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:171
+#: plugins/gofon/fonreports/class_fonreport.inc:174
 msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:189
+#: plugins/gofon/fonreports/class_fonreport.inc:192
 msgid "Query for phone database failed!"
 msgstr ""
 
+#: plugins/gofon/fonreports/class_fonreport.inc:403
+msgid "Application called"
+msgstr ""
+
+#: plugins/gofon/fonreports/class_fonreport.inc:404
+msgid "Disposition"
+msgstr ""
+
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr ""
@@ -14341,7 +14944,7 @@ msgstr ""
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:386
+#: include/php_setup.inc:71
 msgid "Toggle information"
 msgstr ""
 
@@ -14365,194 +14968,194 @@ msgstr ""
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
 msgid "Arguments"
 msgstr ""
 
-#: include/functions.inc:299
+#: include/functions.inc:300
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:316
+#: include/functions.inc:317
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:337
+#: include/functions.inc:338
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:468
+#: include/functions.inc:469
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:478
+#: include/functions.inc:479
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:493
+#: include/functions.inc:494
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:519
+#: include/functions.inc:520
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:549
+#: include/functions.inc:550
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:559
+#: include/functions.inc:560
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
 msgstr ""
 
-#: include/functions.inc:567
+#: include/functions.inc:568
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:660
+#: include/functions.inc:661
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:662
+#: include/functions.inc:663
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:679
+#: include/functions.inc:680
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1120 include/functions.inc:1310
+#: include/functions.inc:1047 include/functions.inc:1203
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1121
+#: include/functions.inc:1048
 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:1129
+#: include/functions.inc:1056
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1138
+#: include/functions.inc:1065
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1142 include/functions_setup.inc:254
+#: include/functions.inc:1069 include/functions_setup.inc:254
 msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1204
+#: include/functions.inc:1131
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1206
+#: include/functions.inc:1133
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1208
+#: include/functions.inc:1135
 #, 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:1492
+#: include/functions.inc:1385
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1520
+#: include/functions.inc:1413
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1687
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1837
+#: include/functions.inc:1730
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:39
+#: include/class_mail-methods-cyrus.inc:40
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:52
+#: include/class_mail-methods-cyrus.inc:58
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:129
+#: include/class_mail-methods-cyrus.inc:156
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:148
+#: include/class_mail-methods-cyrus.inc:175
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:174
+#: include/class_mail-methods-cyrus.inc:201
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:192
+#: include/class_mail-methods-cyrus.inc:219
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:242
+#: include/class_mail-methods-cyrus.inc:269
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:255
+#: include/class_mail-methods-cyrus.inc:282
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:326
+#: include/class_mail-methods-cyrus.inc:353
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:330
+#: include/class_mail-methods-cyrus.inc:357
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
@@ -14564,159 +15167,179 @@ msgid ""
 "for performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:228
+#: include/class_ldap.inc:229
 #, php-format
 msgid ""
 "The ldapserver is answering very slow (%.2f), this may be responsible for "
 "performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:448
+#: include/class_ldap.inc:451
 #, php-format
 msgid "Creating copy of %s"
 msgstr ""
 
-#: include/class_ldap.inc:451
+#: include/class_ldap.inc:454
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:491
+#: include/class_ldap.inc:494
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:554
+#: include/class_ldap.inc:558
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:702
+#: include/class_ldap.inc:708
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:771
+#: include/class_ldap.inc:777
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:773
+#: include/class_ldap.inc:779
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:995
+#: include/class_ldap.inc:1001
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1030
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_ldap.inc:1152
+#: include/class_ldap.inc:1158
 #, php-format
 msgid "Ldap import with dn '%s' failed."
 msgstr ""
 
-#: include/class_tabs.inc:186
+#: include/class_tabs.inc:187
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:301
+#: include/class_tabs.inc:305
 msgid "References"
 msgstr ""
 
-#: include/class_plugin.inc:414
+#: include/class_plugin.inc:421
 #, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:595
+#: include/class_plugin.inc:602
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:629 include/class_password-methods.inc:181
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:663
+#: include/class_plugin.inc:670
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:969
+#: include/class_plugin.inc:978
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:976
+#: include/class_plugin.inc:985
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:990 include/class_plugin.inc:1019
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1006
+#: include/class_plugin.inc:1015
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1067 include/class_plugin.inc:1113
-#: include/class_plugin.inc:1114
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
 #, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1130 include/class_SnapShotDialog.inc:53
-msgid "You are not allowed to delete this snapshot!"
-msgstr ""
-
-#: include/class_plugin.inc:1145
+#: include/class_plugin.inc:1149
 #, 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:1157
+#: include/class_plugin.inc:1161
 #, 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:1189
+#: include/class_plugin.inc:1193
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1245
+#: include/class_plugin.inc:1249
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1309 include/class_plugin.inc:1323
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
 #, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr ""
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+#: include/class_plugin.inc:1530
+msgid "Updated current user dn from '"
+msgstr ""
+
+#: include/class_plugin.inc:1530
+msgid "' to '"
+msgstr ""
+
+#: include/class_plugin.inc:1530
+msgid "'"
+msgstr ""
+
+#: include/class_plugin.inc:1592
+msgid "Changing ACL dn"
+msgstr ""
+
+#: include/class_plugin.inc:1592
+msgid "from"
+msgstr ""
+
+#: include/class_plugin.inc:1594
+msgid "to"
+msgstr ""
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
 #: include/class_pluglist.inc:53
@@ -14729,11 +15352,6 @@ msgid ""
 "contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
-#: include/class_pluglist.inc:245
-msgid "Unknown"
-msgstr ""
-
 #: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -14741,12 +15359,12 @@ msgid ""
 "changes?"
 msgstr ""
 
-#: include/class_password-methods.inc:165
+#: include/class_password-methods.inc:167
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_password-methods.inc:202
+#: include/class_password-methods.inc:204
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
@@ -14807,7 +15425,7 @@ msgstr ""
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:472
+#: include/class_config.inc:499
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -14815,17 +15433,17 @@ msgstr ""
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
+#: include/class_password-methods-kerberos.inc:44
 msgid ""
 "Warning: Can't set kerberos password. Your PHP version has no kerberos "
 "support, password has not been changed."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:52
+#: include/class_password-methods-kerberos.inc:53
 msgid "Kerberos database communication failed!"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:59
+#: include/class_password-methods-kerberos.inc:60
 msgid "Changing password in kerberos database failed!"
 msgstr ""
 
@@ -14971,7 +15589,9 @@ msgstr ""
 msgid "Ignored"
 msgstr ""
 
-#: include/functions_setup.inc:259
+#: include/functions_setup.inc:259 setup/setup_step2.tpl:33
+#: setup/setup_step2.tpl:35 setup/setup_step2.tpl:95 setup/setup_step2.tpl:97
+#: setup/setup_step2.tpl:150 setup/setup_step2.tpl:152
 msgid "Failed"
 msgstr ""
 
@@ -14993,7 +15613,7 @@ msgstr ""
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 
-#: include/functions_setup.inc:283
+#: include/functions_setup.inc:283 setup/class_setupStep2.inc:177
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -15011,11 +15631,11 @@ msgid ""
 "before they really timeout."
 msgstr ""
 
-#: include/functions_setup.inc:290
+#: include/functions_setup.inc:290 setup/class_setupStep2.inc:65
 msgid "Checking for ldap module"
 msgstr ""
 
-#: include/functions_setup.inc:291
+#: include/functions_setup.inc:291 setup/class_setupStep2.inc:66
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr ""
 
@@ -15027,15 +15647,15 @@ msgstr ""
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:298 setup/class_setupStep2.inc:73
 msgid "Checking for gettext support"
 msgstr ""
 
-#: include/functions_setup.inc:299
+#: include/functions_setup.inc:299 setup/class_setupStep2.inc:74
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:302
+#: include/functions_setup.inc:302 setup/class_setupStep2.inc:81
 msgid "Checking for iconv support"
 msgstr ""
 
@@ -15045,7 +15665,7 @@ msgid ""
 "therefore required."
 msgstr ""
 
-#: include/functions_setup.inc:306
+#: include/functions_setup.inc:306 setup/class_setupStep2.inc:89
 msgid "Checking for mhash module"
 msgstr ""
 
@@ -15055,231 +15675,238 @@ msgid ""
 "or md5 encryption, ignore this message. GOsa will run without it."
 msgstr ""
 
-#: include/functions_setup.inc:310
+#: include/functions_setup.inc:310 setup/class_setupStep2.inc:97
 msgid "Checking for imap module"
 msgstr ""
 
-#: include/functions_setup.inc:311
+#: include/functions_setup.inc:311 setup/class_setupStep2.inc:98
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
 msgstr ""
 
-#: include/functions_setup.inc:314
+#: include/functions_setup.inc:314 setup/class_setupStep2.inc:105
 msgid "Checking for getacl in imap"
 msgstr ""
 
-#: include/functions_setup.inc:315
+#: include/functions_setup.inc:315 setup/class_setupStep2.inc:106
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
 "for this feature."
 msgstr ""
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:318 setup/class_setupStep2.inc:113
 msgid "Checking for mysql module"
 msgstr ""
 
-#: include/functions_setup.inc:319
+#: include/functions_setup.inc:319 setup/class_setupStep2.inc:114
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 
-#: include/functions_setup.inc:322
+#: include/functions_setup.inc:322 setup/class_setupStep2.inc:137
 msgid "Checking for cups module"
 msgstr ""
 
-#: include/functions_setup.inc:323
+#: include/functions_setup.inc:323 setup/class_setupStep2.inc:138
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
 msgstr ""
 
-#: include/functions_setup.inc:326
+#: include/functions_setup.inc:326 setup/class_setupStep2.inc:121
 msgid "Checking for kadm5 module"
 msgstr ""
 
-#: include/functions_setup.inc:327
+#: include/functions_setup.inc:327 setup/class_setupStep2.inc:122
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
 msgstr ""
 
-#: include/functions_setup.inc:330
+#: include/functions_setup.inc:330 setup/class_setupStep2.inc:129
 msgid "Checking for snmp Module"
 msgstr ""
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:331 setup/class_setupStep2.inc:130
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:367
+#: include/functions_setup.inc:368
 msgid "PHP detailed function inspection"
 msgstr ""
 
-#: include/functions_setup.inc:371
+#: include/functions_setup.inc:372
 #, php-format
 msgid "Checking for function %s"
 msgstr ""
 
-#: include/functions_setup.inc:372
+#: include/functions_setup.inc:373
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
 msgstr ""
 
-#: include/functions_setup.inc:383
+#: include/functions_setup.inc:384
 msgid "Checking for some additional programms"
 msgstr ""
 
-#: include/functions_setup.inc:392
+#: include/functions_setup.inc:395
+msgid "Checking for GraphicsMagick (>=1.1.2)"
+msgstr ""
+
+#: include/functions_setup.inc:396
+msgid ""
+"GraphicsMagick is used to convert user supplied images to fit the suggested "
+"size and the unified JPEG format."
+msgstr ""
+
+#: include/functions_setup.inc:399
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr ""
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:400
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
 msgstr ""
 
-#: include/functions_setup.inc:396
+#: include/functions_setup.inc:404
 msgid "Checking imagick module for PHP"
 msgstr ""
 
-#: include/functions_setup.inc:397
+#: include/functions_setup.inc:405
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:404
+#: include/functions_setup.inc:412 setup/class_setupStep2.inc:147
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:413 setup/class_setupStep2.inc:148
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
 msgstr ""
 
-#: include/functions_setup.inc:420
+#: include/functions_setup.inc:428
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:421
+#: include/functions_setup.inc:429 setup/class_setupStep2.inc:165
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
 
-#: include/functions_setup.inc:434
+#: include/functions_setup.inc:442
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:435
+#: include/functions_setup.inc:443 setup/class_setupStep2.inc:196
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
 msgstr ""
 
-#: include/functions_setup.inc:438
+#: include/functions_setup.inc:446
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:439
+#: include/functions_setup.inc:447 setup/class_setupStep2.inc:212
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
 msgstr ""
 
-#: include/functions_setup.inc:446
+#: include/functions_setup.inc:454
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:447
+#: include/functions_setup.inc:455 setup/class_setupStep2.inc:220
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
 msgstr ""
 
-#: include/functions_setup.inc:454
+#: include/functions_setup.inc:462
 msgid "php.ini check -> memory_limit"
 msgstr ""
 
-#: include/functions_setup.inc:455
+#: include/functions_setup.inc:463
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 
-#: include/functions_setup.inc:459
+#: include/functions_setup.inc:467
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:468 setup/class_setupStep2.inc:228
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
 msgstr ""
 
-#: include/functions_setup.inc:464
+#: include/functions_setup.inc:472
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr ""
 
-#: include/functions_setup.inc:465
+#: include/functions_setup.inc:473
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:711
-msgid "You've to specify an ldap server before continuing!"
-msgstr ""
-
-#: include/functions_setup.inc:720 include/functions_setup.inc:803
+#: include/functions_setup.inc:720 include/functions_setup.inc:831
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:734 include/functions_setup.inc:808
-#: include/functions_setup.inc:813
+#: include/functions_setup.inc:734
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:823
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all information twice"
-msgstr ""
-
-#: include/functions_setup.inc:879
+#: include/functions_setup.inc:792
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
 msgstr ""
 
-#: include/functions_setup.inc:910
+#: include/functions_setup.inc:836
+msgid "Can't set ldap protocol version 3."
+msgstr ""
+
+#: include/functions_setup.inc:841
+msgid ""
+"Could not bind to the specified LDAP server! Please make sure that it is "
+"reachable for GOsa."
+msgstr ""
+
+#: include/functions_setup.inc:924
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:919
+#: include/functions_setup.inc:933
 #, php-format
 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:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1112
 msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
 msgstr ""
 
 #: include/functions_helpviewer.inc:43
@@ -15313,152 +15940,38 @@ msgstr ""
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:145
-msgid "All categories"
-msgstr ""
-
-#: include/class_acl.inc:153
-msgid "Reset ACLs"
-msgstr ""
-
-#: include/class_acl.inc:154
-msgid "One level"
-msgstr ""
-
-#: include/class_acl.inc:155 include/class_acl.inc:160
-msgid "Current object"
-msgstr ""
-
-#: include/class_acl.inc:156
-msgid "Complete subtree"
-msgstr ""
-
-#: include/class_acl.inc:157
-msgid "Complete subtree (permanent)"
-msgstr ""
-
-#: include/class_acl.inc:161
+#: include/class_acl.inc:158 include/class_acl.inc:161
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:370
-msgid "Edit ACL"
-msgstr ""
-
-#: include/class_acl.inc:371
-msgid "Delete ACL"
-msgstr ""
-
-#: include/class_acl.inc:408
-msgid "No ACL settings for this category"
-msgstr ""
-
-#: include/class_acl.inc:410
-#, php-format
-msgid "Contains ACLs for these objects: %s"
-msgstr ""
-
-#: include/class_acl.inc:415
-msgid "Edit categories ACLs"
-msgstr ""
-
-#: include/class_acl.inc:416
-msgid "Clear categories ACLs"
-msgstr ""
-
-#: include/class_acl.inc:455
-#, php-format
-msgid "Edit ACL for '%s', scope is '%s'"
-msgstr ""
-
-#: include/class_acl.inc:465
-msgid "All objects in current subtree"
-msgstr ""
-
-#: include/class_acl.inc:502 include/class_acl.inc:509
-msgid "Show/Hide Advanced Settings"
-msgstr ""
-
-#: include/class_acl.inc:527
-msgid "Create objects"
-msgstr ""
-
-#: include/class_acl.inc:528
-msgid "Move objects"
-msgstr ""
-
-#: include/class_acl.inc:529
-msgid "Remove objects"
-msgstr ""
-
-#: include/class_acl.inc:531 include/class_acl.inc:537
-msgid "Modifyable by owner"
-msgstr ""
-
-#: include/class_acl.inc:534
-msgid "Move object"
-msgstr ""
-
-#: include/class_acl.inc:535
-msgid "Remove object"
-msgstr ""
-
-#: include/class_acl.inc:663
-#, php-format
-msgid "Unkown ACL type '%s'. Don't know how to handle it."
-msgstr ""
-
-#: include/class_acl.inc:703
-#, php-format
-msgid "Unknown entry '%s'!"
-msgstr ""
-
-#: include/class_acl.inc:764
-#, php-format
-msgid "Contains settings for these objects: %s"
-msgstr ""
-
-#: include/class_acl.inc:772
-msgid "Members:"
-msgstr ""
-
-#: include/class_acl.inc:778
-msgid "ACL is valid for all users"
-msgstr ""
-
-#: include/class_acl.inc:886
-#, php-format
-msgid "Saving ACLs with dn '%s' failed."
-msgstr ""
-
 #: include/class_debconfTemplate.inc:260
 msgid "This package has no debconf options."
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
 msgid "Restore"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:105
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -15474,50 +15987,54 @@ msgid ""
 "zone."
 msgstr ""
 
-#: include/functions_dns.inc:363
+#: include/functions_dns.inc:607
 #, php-format
 msgid ""
-"Found more than one dns zone which contains an entry named '%s'. Aborting "
-"getting dns informations for this device."
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:152
+#: include/class_CopyPasteHandler.inc:153
 #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "You are going to paste the cutted entry '%s'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:216
+#: include/class_CopyPasteHandler.inc:180
+#, php-format
+msgid "You are going to paste the copied entry '%s'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:244
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:218
+#: include/class_CopyPasteHandler.inc:246
 msgid "Can't paste"
 msgstr ""
 
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
 #, php-format
 msgid "Error, following objects should be equal '%s' and '%s'"
 msgstr ""
 
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
 #, php-format
 msgid "Release management failed, can't save '%s'"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:47
+#: include/class_SnapShotDialog.inc:63
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:107
+#: include/class_SnapShotDialog.inc:115
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:109 include/class_SnapShotDialog.inc:129
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:141
+#: include/class_SnapShotDialog.inc:149
 msgid "Please specify a valid description for this snapshot."
 msgstr ""
 
@@ -15550,36 +16067,23 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
-#: html/setup.php:86
-#, php-format
-msgid ""
-"Directory '%s' specified as smarty compile directory is not accessible, "
-"please check existence and rights of this directory!"
-msgstr ""
-
-#: html/main.php:170
+#: html/main.php:172
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:212
+#: html/main.php:214
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:347
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr ""
-
-#: html/main.php:362
+#: html/main.php:353
 msgid "Your password is about to expire, please change your password"
 msgstr ""
 
-#: html/main.php:386
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
+#: html/main.php:361
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
 #: html/getkiosk.php:25
@@ -15592,11 +16096,11 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:341
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:341
 msgid "Enter SSL session"
 msgstr ""
 
@@ -15610,132 +16114,130 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:223
+#: html/index.php:227
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:232
+#: html/index.php:235
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:260
-msgid "Please specify a valid username!"
+#: html/index.php:254 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
 msgstr ""
 
 #: html/index.php:262
+msgid "Please specify a valid username!"
+msgstr ""
+
+#: html/index.php:264
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:271
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:293
+#: html/index.php:295
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:345
+#: html/index.php:347
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/getxls.php:65
+#: html/getxls.php:86
 msgid "Birthday"
 msgstr ""
 
-#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
-#: html/getxls.php:236
+#: html/getxls.php:86 html/getxls.php:227 html/getxls.php:281
+#: html/getxls.php:297
 msgid "Surname"
 msgstr ""
 
-#: html/getxls.php:74
+#: html/getxls.php:94
 #, php-format
 msgid "User list of %s on %s"
 msgstr ""
 
-#: html/getxls.php:94 html/getxls.php:227 ihtml/themes/default/acl.tpl:41
+#: html/getxls.php:121 html/getxls.php:284 ihtml/themes/default/acl.tpl:41
 msgid "Members"
 msgstr ""
 
-#: html/getxls.php:104 html/getxls.php:295
+#: html/getxls.php:131 html/getxls.php:360
 #, php-format
 msgid "Groups of %s on %s"
 msgstr ""
 
-#: html/getxls.php:124 html/getxls.php:246
-msgid "Computers"
-msgstr ""
-
-#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
-#: html/getxls.php:356
-msgid "Common name"
+#: html/getxls.php:155 html/getxls.php:188 html/getxls.php:190
+#: html/getxls.php:197 html/getxls.php:233 html/getxls.php:310
+#: html/getxls.php:381
+msgid "Servers"
 msgstr ""
 
-#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
-#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
+#: html/getxls.php:159 html/getxls.php:311
+msgid "Computers"
 msgstr ""
 
-#: html/getxls.php:156 html/getxls.php:314
+#: html/getxls.php:195 html/getxls.php:379
 #, php-format
 msgid "Servers of %s on %s"
 msgstr ""
 
-#: html/getxls.php:174
+#: html/getxls.php:225
 msgid "Mobile phone"
 msgstr ""
 
-#: html/getxls.php:174
+#: html/getxls.php:228
 msgid "Function"
 msgstr ""
 
-#: html/getxls.php:177 html/getxls.php:247
+#: html/getxls.php:231 html/getxls.php:312
 msgid "Adressbook"
 msgstr ""
 
-#: html/getxls.php:184 html/getxls.php:349
+#: html/getxls.php:238 html/getxls.php:414
 #, php-format
 msgid "Adressbook of %s on %s"
 msgstr ""
 
-#: html/getxls.php:190
+#: html/getxls.php:244
 msgid "Common Name"
 msgstr ""
 
-#: html/getxls.php:224
+#: html/getxls.php:281
 msgid "Day of birth"
 msgstr ""
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 msgid "Email address"
 msgstr ""
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 msgid "Organizational unit"
 msgstr ""
 
-#: html/getxls.php:236
+#: html/getxls.php:300
 msgid "Postal Code"
 msgstr ""
 
-#: html/getxls.php:236
-msgid "Title"
-msgstr ""
-
-#: html/getxls.php:239
+#: html/getxls.php:304
 msgid "Full"
 msgstr ""
 
-#: html/getxls.php:276
+#: html/getxls.php:341
 #, php-format
 msgid "User List of %s on %s"
 msgstr ""
 
-#: html/getxls.php:330
+#: html/getxls.php:395
 #, php-format
 msgid "Computers of %s on %s"
 msgstr ""
@@ -15782,7 +16284,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
 msgid "Please use your username and password to log in"
 msgstr ""
 
@@ -15912,11 +16414,11 @@ msgid ""
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 setup/setup_step4.tpl:52
 msgid "Admin DN"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34 setup/setup_step5.tpl:218
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -15927,23 +16429,23 @@ msgstr ""
 msgid "Base "
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43 setup/setup_step5.tpl:43
 msgid "People storage ou"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 setup/setup_step5.tpl:30
 msgid "People dn attribute"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 setup/setup_step5.tpl:55
 msgid "Group storage ou"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59 setup/setup_step5.tpl:66
 msgid "ID base for users/groups"
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67 setup/setup_step5.tpl:216
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -15961,7 +16463,7 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88 setup/setup_step5.tpl:167
 msgid "Mail method"
 msgstr ""
 
@@ -15971,7 +16473,7 @@ msgid ""
 "versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
 
-#: ihtml/themes/default/setup_step4.tpl:104
+#: ihtml/themes/default/setup_step4.tpl:104 setup/setup_step5.tpl:77
 msgid "Display PHP errors"
 msgstr ""
 
@@ -16067,22 +16569,6 @@ msgid ""
 "execute these commands to achieve this requirement:"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:2
-msgid "Assigned ACLs for current entry"
-msgstr ""
-
-#: ihtml/themes/default/acl.tpl:4
-msgid "New ACL"
-msgstr ""
-
-#: ihtml/themes/default/acl.tpl:8
-msgid "ACL type"
-msgstr ""
-
-#: ihtml/themes/default/acl.tpl:8
-msgid "Select an acl type"
-msgstr ""
-
 #: ihtml/themes/default/acl.tpl:15
 msgid "Use members from"
 msgstr ""
@@ -16091,26 +16577,36 @@ msgstr ""
 msgid "Available members"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:55
-msgid "List of available ACL categories"
-msgstr ""
-
 #: ihtml/themes/default/acl.tpl:63
 msgid "ACLs for this object"
 msgstr ""
 
+#: ihtml/themes/default/acl.tpl:69
+msgid "Available roles"
+msgstr ""
+
 #: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
+msgid "Copy & paste wizard"
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
 msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. GOsa shows the relevant attributes. Please "
 "maintain the values below to fullfill the policies."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:21
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
 msgid "Operation complete"
 msgstr ""
 
@@ -16151,29 +16647,604 @@ msgid ""
 "replace the existing object after pressing the restore button."
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
 msgid "There is no snapshot available that could be restored"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:49
 msgid "Creating object snapshots"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:47
+#: ihtml/themes/default/snapshotdialog.tpl:52
 msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:62
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Timestamp"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:71
+#: ihtml/themes/default/snapshotdialog.tpl:79
 msgid "Reason for generating this snapshot"
 msgstr ""
+
+#: setup/class_setup.inc:160 setup/class_setup.inc:162
+msgid "Last step"
+msgstr ""
+
+#: setup/class_setup.inc:165
+msgid "Next step"
+msgstr ""
+
+#: setup/class_setupStep6.inc:51
+msgid "GOsa settings 2/2"
+msgstr ""
+
+#: setup/class_setupStep6.inc:52
+msgid "GOsa generic settings, page 2/2"
+msgstr ""
+
+#: setup/class_setupStep6.inc:53 setup/class_setupStep5.inc:56
+msgid "This dialog allows you to setup GOsa behaviour"
+msgstr ""
+
+#: setup/setup_step6.tpl:31 setup/setup_step6.tpl:51 setup/setup_step6.tpl:65
+#: setup/setup_step6.tpl:89 setup/setup_step6.tpl:109
+#: setup/setup_step6.tpl:124 setup/setup_step6.tpl:158
+#: setup/setup_step6.tpl:172 setup/setup_step6.tpl:232
+#: setup/setup_step4.tpl:112 setup/setup_step5.tpl:135
+#: setup/setup_step5.tpl:155 setup/setup_step5.tpl:194
+#: setup/setup_step5.tpl:209
+msgid "Infos in FAQ"
+msgstr ""
+
+#: setup/setup_step6.tpl:32 setup/setup_step6.tpl:52 setup/setup_step6.tpl:66
+#: setup/setup_step6.tpl:90 setup/setup_step6.tpl:110
+#: setup/setup_step6.tpl:125 setup/setup_step6.tpl:159
+#: setup/setup_step6.tpl:173 setup/setup_step6.tpl:233
+#: setup/setup_step4.tpl:113 setup/setup_step5.tpl:136
+#: setup/setup_step5.tpl:156 setup/setup_step5.tpl:195
+#: setup/setup_step5.tpl:210
+msgid "Please read the FAQ for more informations"
+msgstr ""
+
+#: setup/setup_step6.tpl:38
+msgid "RID base"
+msgstr ""
+
+#: setup/setup_step6.tpl:57
+msgid "Samba SID mapping"
+msgstr ""
+
+#: setup/setup_step6.tpl:71
+msgid "Additional GOsa settings"
+msgstr ""
+
+#: setup/setup_step6.tpl:76
+msgid "Windows workstation ou"
+msgstr ""
+
+#: setup/setup_step6.tpl:96
+msgid "GID / UID min id"
+msgstr ""
+
+#: setup/setup_step6.tpl:116
+msgid "Strict units"
+msgstr ""
+
+#: setup/setup_step6.tpl:131
+msgid "Government mode"
+msgstr ""
+
+#: setup/setup_step6.tpl:145
+msgid "Automatic uids"
+msgstr ""
+
+#: setup/setup_step6.tpl:164
+msgid "Use account expiration"
+msgstr ""
+
+#: setup/setup_step6.tpl:178
+msgid "Enable snapshot functionality"
+msgstr ""
+
+#: setup/setup_step6.tpl:186 setup/setup_step6.tpl:208
+msgid "Enable"
+msgstr ""
+
+#: setup/class_setupStep7.inc:31 setup/class_setupStep7.inc:32
+msgid "Ldap schema check"
+msgstr ""
+
+#: setup/class_setupStep7.inc:33
+msgid "This dialog checks your ldap schema setup"
+msgstr ""
+
+#: setup/class_setupStep7.inc:69
+msgid "GOsa object is used to store acls."
+msgstr ""
+
+#: setup/class_setupStep7.inc:77
+msgid "Used to store account specific informations."
+msgstr ""
+
+#: setup/class_setupStep7.inc:85 setup/class_setupStep7.inc:93
+msgid ""
+"Used to lock currently edited entries to avoid multiple changes at the same "
+"time."
+msgstr ""
+
+#: setup/setup_step7.tpl:4
+msgid "Schema check"
+msgstr ""
+
+#: setup/setup_frame.tpl:8
+msgid "GOsa - GOnicus System Administrator Setup"
+msgstr ""
+
+#: setup/setup_frame.tpl:14
+msgid "Setup steps"
+msgstr ""
+
+#: setup/setup_step1.tpl:3
+msgid "Please select the language that should be used in GOsa setup."
+msgstr ""
+
+#: setup/setup_step1.tpl:10
+msgid "Please your prefered language here"
+msgstr ""
+
+#: setup/setup_step1.tpl:15
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStep1.inc:36
+msgid "Language selection"
+msgstr ""
+
+#: setup/class_setupStep1.inc:37
+msgid "Please choose a language"
+msgstr ""
+
+#: setup/class_setupStep1.inc:38
+msgid "This step is allows you to define your prefered language."
+msgstr ""
+
+#: setup/setup_step2.tpl:10
+msgid "PHP module and extension checks"
+msgstr ""
+
+#: setup/setup_step2.tpl:30 setup/setup_step2.tpl:91 setup/setup_step2.tpl:146
+msgid "Successful"
+msgstr ""
+
+#: setup/setup_step2.tpl:43 setup/setup_step2.tpl:106
+#: setup/setup_step2.tpl:161
+msgid "GOsa will NOT run without fixing this."
+msgstr ""
+
+#: setup/setup_step2.tpl:46 setup/setup_step2.tpl:109
+#: setup/setup_step2.tpl:164
+msgid "GOsa will run without fixing this."
+msgstr ""
+
+#: setup/setup_step2.tpl:70
+msgid "PHP setup configuration"
+msgstr ""
+
+#: setup/setup_step2.tpl:125
+msgid "Configuration file writeable"
+msgstr ""
+
+#: setup/class_setupStep2.inc:31
+msgid "Installation check"
+msgstr ""
+
+#: setup/class_setupStep2.inc:32
+msgid "Basic installation checks"
+msgstr ""
+
+#: setup/class_setupStep2.inc:33
+msgid "Some basic checks for PHP version, ldap extension..."
+msgstr ""
+
+#: setup/class_setupStep2.inc:57
+msgid "Checking PHP version"
+msgstr ""
+
+#: setup/class_setupStep2.inc:58
+#, php-format
+msgid "PHP must be of version %s or %s or above for some functions."
+msgstr ""
+
+#: setup/class_setupStep2.inc:59
+msgid ""
+"GOsa requires functions that may not be available in older PHP versions, "
+"just update to a supported PHP version."
+msgstr ""
+
+#: setup/class_setupStep2.inc:67
+msgid ""
+"The ldap module (PHP4-ldap/PHP5-ldap) is required to communicate with your "
+"ldap server."
+msgstr ""
+
+#: setup/class_setupStep2.inc:75
+msgid "This should be activated while compiling your PHP. (--with-gettext)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:82
+msgid ""
+"This module is used by GOsa to convert samba munged dial informations and is "
+"therefore required. "
+msgstr ""
+
+#: setup/class_setupStep2.inc:83
+msgid "his should be activated while compiling your PHP. (--with-iconv)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:90
+msgid ""
+"To use SSHA encryption, you'll need this module. GOsa will run without it."
+msgstr ""
+
+#: setup/class_setupStep2.inc:91
+msgid ""
+"The mhash module for PHP 4/5 is not available, please install it. (php4-"
+"mhash/php5-mhash)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:99
+msgid ""
+"This module is used to communicate with your mail server. Please install "
+"(PHP4-imap PHP5-imap)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:115
+msgid ""
+"This module is required to communicate with database servers, for example "
+"used in phone and fax addons. Please install (PHP4-mysql PHP5-mysql)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:123
+msgid ""
+"This module is required to manage user in kerberos, it is downloadable via "
+"PEAR network"
+msgstr ""
+
+#: setup/class_setupStep2.inc:131
+msgid "This module is required for client monitoring. (PHP4-snmp/PHP5-snmp)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:149
+msgid ""
+"The fping utility is only used in thin client based terminal environment."
+msgstr ""
+
+#: setup/class_setupStep2.inc:164
+msgid "Password hashes"
+msgstr ""
+
+#: setup/class_setupStep2.inc:166
+msgid ""
+"In order to use samba 2/3 you've to install some additional packages to "
+"generate password hashes. (e.g. libmhash2)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:176
+msgid "register_globals"
+msgstr ""
+
+#: setup/class_setupStep2.inc:176 setup/class_setupStep2.inc:195
+msgid "&nbsp;"
+msgstr ""
+
+#: setup/class_setupStep2.inc:176 setup/class_setupStep2.inc:195
+msgid "<b>"
+msgstr ""
+
+#: setup/class_setupStep2.inc:176 setup/class_setupStep2.inc:195
+#: setup/class_setupStep2.inc:211 setup/class_setupStep2.inc:227
+msgid "Off"
+msgstr ""
+
+#: setup/class_setupStep2.inc:176 setup/class_setupStep2.inc:195
+msgid "</b>"
+msgstr ""
+
+#: setup/class_setupStep2.inc:178
+msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep2.inc:186
+msgid "PHP uses this value for the garbage collector to delete old sessions."
+msgstr ""
+
+#: setup/class_setupStep2.inc:187
+msgid ""
+"Setting this value to one day will prevent loosing session and cookie before "
+"they really timeout."
+msgstr ""
+
+#: setup/class_setupStep2.inc:188
+msgid ""
+"Serach for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
+"higher."
+msgstr ""
+
+#: setup/class_setupStep2.inc:195
+msgid "session.auto_start"
+msgstr ""
+
+#: setup/class_setupStep2.inc:197
+msgid "Serach for 'session.auto_start' in your php.ini and set it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep2.inc:203
+msgid "memory_limit"
+msgstr ""
+
+#: setup/class_setupStep2.inc:204
+msgid ""
+"GOsa needs at least 32MB of memory, less will cause unpredictable errors! "
+"Increase it for larger setups."
+msgstr ""
+
+#: setup/class_setupStep2.inc:205
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
+msgstr ""
+
+#: setup/class_setupStep2.inc:211
+msgid "implicit_flush"
+msgstr ""
+
+#: setup/class_setupStep2.inc:213
+msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep2.inc:219
+msgid "max_execution_time"
+msgstr ""
+
+#: setup/class_setupStep2.inc:221
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+msgstr ""
+
+#: setup/class_setupStep2.inc:227
+msgid "expose_php"
+msgstr ""
+
+#: setup/class_setupStep2.inc:229
+msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep2.inc:235
+msgid "magic_quotes_gpc"
+msgstr ""
+
+#: setup/class_setupStep2.inc:235
+msgid "On"
+msgstr ""
+
+#: setup/class_setupStep2.inc:236
+msgid ""
+"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
+"escape all quotes   in strings in this case."
+msgstr ""
+
+#: setup/class_setupStep2.inc:237
+msgid "Search for 'magic_quotes_gpc' in yout php.ini and set it to 'On'."
+msgstr ""
+
+#: setup/class_setupStep2.inc:247
+msgid "Configuration file writeable."
+msgstr ""
+
+#: setup/class_setupStep2.inc:248
+msgid "The Configuration file can't be written"
+msgstr ""
+
+#: setup/class_setupStep2.inc:249
+msgid ""
+"The GOsa reads its configuration from a file located in (/etc/gosa/gosa."
+"conf). The setup can write the configuration directly in this file, if it is "
+"writeable."
+msgstr ""
+
+#: setup/class_setupStep2.inc:259
+msgid "No old configuration file."
+msgstr ""
+
+#: setup/class_setupStep2.inc:261
+msgid ""
+"If there is already a configuration file, this file will be overwritten when "
+"GOsa setup finishes. Please move your old config file away."
+msgstr ""
+
+#: setup/class_setupStep3.inc:30
+msgid "License"
+msgstr ""
+
+#: setup/class_setupStep3.inc:31 setup/class_setupStep3.inc:32
+msgid "GNU / GPL-License"
+msgstr ""
+
+#: setup/class_setupStep4.inc:42
+msgid "Ldap settings"
+msgstr ""
+
+#: setup/class_setupStep4.inc:43
+msgid "Ldap connection setup"
+msgstr ""
+
+#: setup/class_setupStep4.inc:44
+msgid ""
+"This dialog allows the basic configuration of GOsa's behaviour and "
+"properties in your main configuration."
+msgstr ""
+
+#: setup/class_setupStep4.inc:87
+#, php-format
+msgid "Anonymous bind failed on server '%s'."
+msgstr ""
+
+#: setup/class_setupStep4.inc:89
+#, php-format
+msgid "Bind as user '%s' failed on server '%s'."
+msgstr ""
+
+#: setup/class_setupStep4.inc:94
+#, php-format
+msgid ""
+"Anonymous bind successful on server '%s'. Please specify user and password."
+msgstr ""
+
+#: setup/class_setupStep4.inc:97
+#, php-format
+msgid "Bind as user '%s' successful on server '%s'."
+msgstr ""
+
+#: setup/setup_step4.tpl:1
+msgid "ldap connection"
+msgstr ""
+
+#: setup/setup_step4.tpl:4
+msgid ""
+"Please enter the server URI to allow the GOsa setup to connect your LDAP "
+"server (Example: ldap://your.server:389)."
+msgstr ""
+
+#: setup/setup_step4.tpl:6
+msgid ""
+"Use the 'Test' button to try a connect. The status will be shown on the "
+"bottom of the page."
+msgstr ""
+
+#: setup/setup_step4.tpl:13
+msgid "Location description"
+msgstr ""
+
+#: setup/setup_step4.tpl:24
+msgid "Connection url"
+msgstr ""
+
+#: setup/setup_step4.tpl:30
+msgid "Test"
+msgstr ""
+
+#: setup/setup_step4.tpl:61
+msgid "Select user"
+msgstr ""
+
+#: setup/setup_step4.tpl:75
+msgid "Use selected user"
+msgstr ""
+
+#: setup/setup_step4.tpl:99
+msgid "Try connect"
+msgstr ""
+
+#: setup/setup_step4.tpl:104
+msgid "Use tls connection"
+msgstr ""
+
+#: setup/class_setupStep5.inc:54
+msgid "GOsa settings 1/2"
+msgstr ""
+
+#: setup/class_setupStep5.inc:55
+msgid "GOsa generic settings, page 1/2"
+msgstr ""
+
+#: setup/class_setupStep5.inc:128
+msgid "Uid base must be numeric"
+msgstr ""
+
+#: setup/class_setupStep5.inc:132
+msgid "The given password minimum length is not numeric."
+msgstr ""
+
+#: setup/class_setupStep5.inc:135
+msgid "The given password differ value is not numeric."
+msgstr ""
+
+#: setup/setup_step5.tpl:12
+msgid "GOsa settings"
+msgstr ""
+
+#: setup/setup_step5.tpl:17
+msgid "GOsa theme"
+msgstr ""
+
+#: setup/setup_step5.tpl:89
+msgid "Password settings"
+msgstr ""
+
+#: setup/setup_step5.tpl:94
+msgid "Password encryption algorithm"
+msgstr ""
+
+#: setup/setup_step5.tpl:107
+msgid "Password restrictions"
+msgstr ""
+
+#: setup/setup_step5.tpl:114 setup/setup_step5.tpl:118
+msgid "Password minimum length"
+msgstr ""
+
+#: setup/setup_step5.tpl:125 setup/setup_step5.tpl:129
+msgid "Different characters from old password"
+msgstr ""
+
+#: setup/setup_step5.tpl:142
+msgid "External script"
+msgstr ""
+
+#: setup/setup_step5.tpl:181
+msgid "Vacation templates"
+msgstr ""
+
+#: setup/setup_step5.tpl:201
+msgid "Use cyrus account style"
+msgstr ""
+
+#: setup/setup_step5.tpl:217
+msgid ""
+"GOsa always acts as admin and manages access rights internally. This is a "
+"workaround till OpenLDAP's in directory ACI's are    fully implemented. For "
+"this to work, we need the admin DN and the corresponding password."
+msgstr ""
+
+#: setup/setup_step5.tpl:219
+msgid ""
+"GOsa has modular support for several mail methods. These methods provide "
+"interfaces to users mailboxes and general handling    for quotas. You can "
+"choose the dummy plugin to leave all your mail settings untouched."
+msgstr ""