Some changes

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 139e6c6190ca52e5dfb7efcd76ee9d7e582eba55..601da162b9031e6ee10bffe139f9edb34265deb3 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -3,14 +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:1360 include/class_plugin.inc:115
+#: 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-12-29 10:02+0100\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"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1019
 #: plugins/personal/password/class_password.inc:16
-#: plugins/personal/posix/class_posixAccount.inc:1313
-#: plugins/personal/samba/class_sambaAccount.inc:1046
-#: plugins/personal/generic/class_user.inc:1372
+#: 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
@@ -44,7 +44,7 @@ msgid "Administration"
 msgstr ""
 
 #: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:678
 msgid "Addons"
 msgstr ""
 
@@ -56,19 +56,19 @@ msgstr ""
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1367
+#: 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:878
 #: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/departments/class_departmentGeneric.inc:575
+#: plugins/admin/departments/class_departmentGeneric.inc:578
 #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:526
+#: 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:858
+#: 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
@@ -77,7 +77,7 @@ msgstr ""
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:692
+#: 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
@@ -90,7 +90,7 @@ msgstr ""
 #: plugins/admin/mimetypes/generic.tpl:4
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
 #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:486
+#: plugins/gofon/macro/class_gofonMacro.inc:532
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr ""
@@ -109,12 +109,12 @@ msgstr ""
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1073
+#: 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:75
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
+#: 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
@@ -123,7 +123,7 @@ msgid "Mail"
 msgstr ""
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: 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
@@ -137,7 +137,11 @@ msgstr ""
 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 ""
@@ -151,7 +155,7 @@ msgstr ""
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:183
 #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:594
+#: plugins/admin/departments/class_departmentGeneric.inc:597
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
 #: html/getxls.php:297
 msgid "Fax"
@@ -167,12 +171,12 @@ msgstr ""
 #: 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:1003
+#: plugins/admin/systems/class_systemManagement.inc:1034
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
-#: 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:1231
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1450
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr ""
@@ -192,34 +196,34 @@ msgstr ""
 #: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:254
-#: plugins/admin/ogroups/phonequeue.tpl:43
-#: plugins/gofon/conference/generic.tpl:121
+#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/gofon/conference/generic.tpl:130
 msgid "Options"
 msgstr ""
 
 #: contrib/gosa.conf:114
 #: plugins/admin/applications/class_applicationParameters.inc:232
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:666
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:868
 msgid "Parameter"
 msgstr ""
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
-#: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1154
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
+#: 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:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/ogroups/tabs_ogroups.inc:105
 msgid "Devices"
 msgstr ""
 
 #: contrib/gosa.conf:121 contrib/gosa.conf:137
 #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:1012
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: 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 ""
@@ -244,7 +248,7 @@ msgid "Information"
 msgstr ""
 
 #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:385
+#: 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
@@ -254,7 +258,7 @@ msgstr ""
 #: 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:94
+#: 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
@@ -291,7 +295,7 @@ msgstr ""
 #: 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/addons/notifications/contents.tpl:54
 #: plugins/admin/applications/generic.tpl:135
 msgid "Import"
 msgstr ""
@@ -306,7 +310,7 @@ msgstr ""
 
 #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:130
-#: plugins/admin/fai/class_faiScript.inc:529
+#: plugins/admin/fai/class_faiScript.inc:530
 #: plugins/admin/fai/faiScriptEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:56
 msgid "Script"
@@ -329,12 +333,12 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:109
 #: plugins/admin/acl/class_divListACL.inc:49
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:235 plugins/admin/fai/class_faiPackage.inc:538
+#: contrib/gosa.conf:235 plugins/admin/fai/class_faiPackage.inc:533
 msgid "Packages"
 msgstr ""
 
@@ -342,35 +346,36 @@ msgstr ""
 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 ""
 
@@ -450,7 +455,7 @@ 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:255
@@ -467,7 +472,7 @@ msgstr ""
 #: 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:598
+#: 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
@@ -490,8 +495,8 @@ msgstr ""
 #: 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:477
-#: plugins/admin/systems/class_termDNS.inc:497
+#: 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
@@ -506,7 +511,7 @@ msgstr ""
 #: plugins/admin/systems/goSpamServer.tpl:113
 #: plugins/admin/ogroups/termgroup.tpl:28 plugins/admin/ogroups/generic.tpl:51
 #: plugins/admin/ogroups/ogroup_objects.tpl:54
-#: plugins/admin/ogroups/phonequeue.tpl:33
+#: 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
@@ -527,6 +532,7 @@ msgstr ""
 #: plugins/personal/posix/trust_machines.tpl:41
 #: 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:158
@@ -557,10 +563,10 @@ msgstr ""
 #: 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:318
+#: 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:654
+#: plugins/admin/systems/class_systemManagement.inc:684
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
 #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
@@ -603,9 +609,10 @@ msgstr ""
 #: 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:302
-#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/acl/class_aclManagement.inc:289
+#: 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
@@ -617,8 +624,7 @@ msgstr ""
 #: 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:345
 #: plugins/admin/mimetypes/remove.tpl:15
@@ -627,10 +633,10 @@ msgstr ""
 #: plugins/gofon/macro/remove.tpl:15
 #: 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:20
+#: 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
+#: ihtml/themes/default/snapshotdialog.tpl:89 setup/setup_step4.tpl:59
 msgid "Cancel"
 msgstr ""
 
@@ -642,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:353
-#: plugins/admin/systems/class_systemManagement.inc:1004
+#: 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:350
-#: 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 ""
 
@@ -661,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:516
+#: plugins/admin/systems/class_printGeneric.inc:517
 msgid "not defined"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1019
+#: plugins/personal/mail/class_mailAccount.inc:1026
 #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1084
+#: plugins/admin/groups/class_groupMail.inc:1099
 msgid "Quota size"
 msgstr ""
 
@@ -690,7 +697,7 @@ msgstr ""
 #: 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:187
 #: plugins/personal/environment/environment.tpl:225
@@ -723,13 +730,13 @@ msgstr ""
 #: 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:491
+#: 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: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/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
@@ -793,7 +800,7 @@ msgid "MB"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1022
+#: plugins/personal/mail/class_mailAccount.inc:1029
 msgid "Vacation message"
 msgstr ""
 
@@ -822,7 +829,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1037
+#: plugins/personal/mail/class_mailAccount.inc:1044
 msgid "Use custom sieve script"
 msgstr ""
 
@@ -840,9 +847,9 @@ msgstr ""
 #: 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:648
-#: plugins/admin/ogroups/class_ogroupManagement.inc:296
-#: plugins/admin/acl/class_aclManagement.inc:280
+#: 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
@@ -891,8 +898,8 @@ msgid "User mail settings"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:1007
-#: 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 ""
 
@@ -933,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
@@ -956,7 +964,7 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:262
 #: plugins/personal/mail/class_mailAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:338
+#: plugins/admin/groups/class_groupMail.inc:339
 #: plugins/admin/ogroups/class_mailogroup.inc:44
 msgid "Remove mail account"
 msgstr ""
@@ -968,20 +976,20 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:339
+#: 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:341
+#: 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:342
+#: plugins/admin/groups/class_groupMail.inc:343
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -993,153 +1001,149 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:327
-#: plugins/admin/groups/class_groupMail.inc:418
+#: 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:444
+#: 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:449
+#: 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:596
+#: 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:724
+#: 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:776
+#: 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:781
-#: plugins/admin/groups/class_groupMail.inc:887
+#: 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:785
-#: plugins/personal/mail/class_mailAccount.inc:789
+#: 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:795
-#: plugins/admin/groups/class_groupMail.inc:896
+#: 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:801
-#: plugins/admin/groups/class_groupMail.inc:902
+#: 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:810
-#: plugins/admin/groups/class_groupMail.inc:911
+#: 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:820
-#: plugins/admin/groups/class_groupMail.inc:919
+#: 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:824
+#: 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:864
-#: plugins/personal/mail/class_mailAccount.inc:876
+#: 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:908
-#: plugins/personal/mail/class_mailAccount.inc:919
+#: 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:984
+#: plugins/personal/mail/class_mailAccount.inc:992
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: 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:1012
-msgid "Mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:1017
+#: plugins/personal/mail/class_mailAccount.inc:1024
 #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
 #: plugins/addons/addressbook/class_addressbook.inc:799
-#: plugins/admin/groups/class_groupMail.inc:1081
-#: plugins/admin/systems/class_servDNS.inc:396
+#: 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:175 html/getxls.php:225
 msgid "Mail address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1018
-#: plugins/admin/groups/class_groupMail.inc:1085
+#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/admin/groups/class_groupMail.inc:1100
 msgid "Mail server"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1028
 msgid "Add vacation information"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1031
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1032
 msgid "Spam level"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1026
+#: plugins/personal/mail/class_mailAccount.inc:1033
 msgid "Spam mail box"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1035
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1029
+#: plugins/personal/mail/class_mailAccount.inc:1036
 msgid "Mail max size"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1031
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1038
+#: plugins/personal/mail/class_mailAccount.inc:1043
 msgid "Forwarding address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1039
 msgid "Local delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1040
 msgid "No delivery to own mailbox "
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1034
+#: plugins/personal/mail/class_mailAccount.inc:1041
 msgid "Mail alternative addresses"
 msgstr ""
 
@@ -1151,7 +1155,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/password/password.tpl:8
-#: plugins/personal/password/main.inc:74
+#: plugins/personal/password/main.inc:73
 msgid "You have no permissions to change your password."
 msgstr ""
 
@@ -1204,7 +1208,7 @@ msgstr ""
 #: plugins/addons/mailqueue/header.tpl:5
 #: plugins/admin/departments/dep_iframe.tpl:18
 #: plugins/admin/systems/class_systemManagement.inc:145
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
+#: 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
@@ -1214,27 +1218,27 @@ msgid "Back"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/personal/password/class_password.inc:17
 #: 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:308
+#: plugins/admin/systems/class_divListSystem.inc:316
 #: plugins/admin/systems/goImapServer.tpl:34
-#: plugins/admin/systems/class_goFonServer.inc:107
+#: 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
+#: 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:1378
+#: plugins/personal/generic/class_user.inc:1386
 msgid "User password"
 msgstr ""
 
@@ -1246,55 +1250,55 @@ msgstr ""
 msgid "You are not allowed to change your password at this time"
 msgstr ""
 
-#: plugins/personal/password/main.inc:45
+#: plugins/personal/password/main.inc:44
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/main.inc:48
+#: plugins/personal/password/main.inc:47
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/password/main.inc:53 plugins/personal/generic/main.inc:79
+#: 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:56 plugins/personal/generic/main.inc:84
+#: 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 ""
 
-#: plugins/personal/password/main.inc:64
+#: plugins/personal/password/main.inc:63
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/password/main.inc:69
+#: plugins/personal/password/main.inc:68
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/password/main.inc:94
+#: plugins/personal/password/main.inc:93
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/password/main.inc:123
+#: 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:1320
+#: 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:645
+#: plugins/personal/samba/class_sambaAccount.inc:671
 msgid "Home directory"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1321
+#: plugins/personal/posix/class_posixAccount.inc:1333
 msgid "Shell"
 msgstr ""
 
@@ -1303,12 +1307,12 @@ msgid "Primary group"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
+#: 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 ""
 
@@ -1364,7 +1368,7 @@ 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:56
@@ -1411,7 +1415,7 @@ 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 ""
 
@@ -1455,9 +1459,9 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:201
 #: plugins/admin/systems/class_terminalService.inc:196
-#: plugins/admin/systems/class_workstationStartup.inc:825
+#: plugins/admin/systems/class_workstationStartup.inc:830
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:249
 msgid "automatic"
 msgstr ""
 
@@ -1513,117 +1517,117 @@ msgid "Warn user %s days before password expiery"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/samba/class_sambaAccount.inc:425
-#: plugins/personal/generic/class_user.inc:245
+#: 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:486
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/samba/class_sambaAccount.inc:425
-#: plugins/personal/generic/class_user.inc:245
+#: 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:486
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/samba/class_sambaAccount.inc:425
-#: plugins/personal/generic/class_user.inc:245
+#: 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:486
-#: plugins/personal/samba/class_sambaAccount.inc:371
-#: plugins/personal/samba/class_sambaAccount.inc:389
-#: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/samba/class_sambaAccount.inc:425
-#: plugins/personal/generic/class_user.inc:245
+#: 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:487
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/samba/class_sambaAccount.inc:426
-#: plugins/personal/generic/class_user.inc:246
+#: 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:487
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/samba/class_sambaAccount.inc:426
-#: plugins/personal/generic/class_user.inc:246
+#: 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:487
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/samba/class_sambaAccount.inc:426
-#: plugins/personal/generic/class_user.inc:246
+#: 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:487
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/samba/class_sambaAccount.inc:426
-#: plugins/personal/generic/class_user.inc:246
+#: 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:487
-#: plugins/personal/samba/class_sambaAccount.inc:372
-#: plugins/personal/samba/class_sambaAccount.inc:390
-#: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/samba/class_sambaAccount.inc:426
-#: plugins/personal/generic/class_user.inc:246
+#: 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:488
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
-#: plugins/personal/samba/class_sambaAccount.inc:427
-#: plugins/personal/generic/class_user.inc:247
+#: 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:488
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
-#: plugins/personal/samba/class_sambaAccount.inc:427
-#: plugins/personal/generic/class_user.inc:247
+#: 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:488
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
-#: plugins/personal/samba/class_sambaAccount.inc:427
-#: plugins/personal/generic/class_user.inc:247
+#: 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:567
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 #: plugins/admin/systems/class_terminalGeneric.inc:104
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 setup/setup_step5.tpl:171
 msgid "disabled"
 msgstr ""
 
@@ -1711,55 +1715,51 @@ msgstr ""
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1140
+#: 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:1309
+#: plugins/personal/posix/class_posixAccount.inc:1322
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1314
-msgid "Posix Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1322
+#: 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:1323
+#: plugins/personal/posix/class_posixAccount.inc:1335
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1325
+#: plugins/personal/posix/class_posixAccount.inc:1337
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1326
+#: plugins/personal/posix/class_posixAccount.inc:1338
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1339
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1340
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1329
+#: plugins/personal/posix/class_posixAccount.inc:1341
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1342
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1331
+#: plugins/personal/posix/class_posixAccount.inc:1343
 msgid "System trust model"
 msgstr ""
 
@@ -1777,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:646
+#: plugins/personal/samba/class_sambaAccount.inc:672
 msgid "Profile path"
 msgstr ""
 
@@ -1790,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:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1081
 msgid "Login from windows client requires no password"
 msgstr ""
 
@@ -1799,7 +1799,7 @@ msgid "Temporary disable samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1096
 msgid "Domain"
 msgstr ""
 
@@ -1808,12 +1808,12 @@ msgid "Terminal Server"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: 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:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1078
 msgid "Inherit client config"
 msgstr ""
 
@@ -1830,17 +1830,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:169
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/class_sambaAccount.inc:679
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:183
-#: plugins/personal/samba/class_sambaAccount.inc:654
+#: plugins/personal/samba/class_sambaAccount.inc:680
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:197
-#: plugins/personal/samba/class_sambaAccount.inc:655
+#: plugins/personal/samba/class_sambaAccount.inc:681
 msgid "IDLE"
 msgstr ""
 
@@ -1878,17 +1878,17 @@ msgid "Reconnect if disconnected"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1057
+#: plugins/personal/samba/class_sambaAccount.inc:1082
 msgid "Lock samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1088
 msgid "Limit Logon Time"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1064
+#: plugins/personal/samba/class_sambaAccount.inc:1089
 msgid "Limit Logoff Time"
 msgstr ""
 
@@ -1896,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:124
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/class_sambaAccount.inc:1068 setup/setup_step6.tpl:12
 msgid "Samba settings"
 msgstr ""
 
@@ -1944,172 +1952,241 @@ msgid ""
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:470
+#: plugins/personal/samba/class_sambaAccount.inc:496
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:474
+#: plugins/personal/samba/class_sambaAccount.inc:500
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:475
+#: plugins/personal/samba/class_sambaAccount.inc:501
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:477
+#: plugins/personal/samba/class_sambaAccount.inc:503
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:478
+#: plugins/personal/samba/class_sambaAccount.inc:504
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:629
+#: 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:648
+#: 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:658
+#: 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:664
+#: 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:849
+#: 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:873
+#: 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:977
+#: 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:1047
-msgid "Samba account"
-msgstr ""
-
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1080
 msgid "Allow user to change password"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1085
 msgid "Account expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1061
+#: plugins/personal/samba/class_sambaAccount.inc:1086
 msgid "Password expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: 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:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1093
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1094
 msgid "Generic script path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1095
 msgid "Generic profile path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1071
+#: 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:335
+#: 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:432
+#: plugins/personal/generic/class_user.inc:438
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: 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:486
+#: 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:489
+#: plugins/personal/generic/class_user.inc:495
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:496
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:495
+#: plugins/personal/generic/class_user.inc:501
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:582
+#: 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:614
+#: 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:628
+#: 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:684
+#: plugins/personal/generic/class_user.inc:690
 #, php-format
 msgid "You are not allowed to move this object to '%s'."
 msgstr ""
@@ -2123,153 +2200,155 @@ msgstr ""
 msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1057
+#: 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:1066
+#: 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:1072
+#: 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:1075
+#: plugins/personal/generic/class_user.inc:1085
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1082
+#: 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:1089
+#: 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:1092
+#: plugins/personal/generic/class_user.inc:1100
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1095
-#: plugins/personal/generic/class_user.inc:1120
+#: 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:1098
-#: plugins/personal/generic/class_user.inc:1117
+#: 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:1103
+#: 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:1106
+#: 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:1109
+#: 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:1112
+#: 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:1221
+#: plugins/personal/generic/class_user.inc:1229
 msgid "Could not open specified certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1352
+#: plugins/personal/generic/class_user.inc:1360
 #: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1361
 #: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1362
 #: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1363
 #: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1364
 #: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1365
 #: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1366
 #: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1367
 #: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1369
 #: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1370
 #: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1363
+#: 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:1364
+#: plugins/personal/generic/class_user.inc:1372
 #: plugins/personal/generic/generic.tpl:459
 #: 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:1368
+#: plugins/personal/generic/class_user.inc:1376
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1373
+#: 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:91
@@ -2279,7 +2358,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1377
+#: plugins/personal/generic/class_user.inc:1385
 #: plugins/personal/generic/generic.tpl:143
 #: plugins/gofax/blocklists/generic.tpl:17
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:598
@@ -2293,91 +2372,94 @@ msgstr ""
 #: 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:586
+#: 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:553
-#: plugins/admin/systems/class_servGeneric.inc:359
-#: plugins/admin/systems/class_workstationGeneric.inc:537
+#: 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:17
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: 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:187
+#: 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:702
+#: plugins/admin/ogroups/class_ogroup.inc:705
 #: plugins/admin/ogroups/class_divListOGroup.inc:149
-#: plugins/admin/acl/class_divListACL.inc:98
+#: 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:683
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
 #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: 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:562
+#: 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:1379
+#: 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:1380
+#: 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:1381
+#: plugins/personal/generic/class_user.inc:1389
 #: plugins/addons/addressbook/class_addressbook.inc:798
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/class_user.inc:1390
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/addons/addressbook/address_edit.tpl:60
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1391
 #: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1384
+#: 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:1385
+#: 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:1386
+#: plugins/personal/generic/class_user.inc:1394
 #: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
+#: 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:1388
+#: 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:155
@@ -2385,99 +2467,99 @@ msgstr ""
 #: 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:349
+#: 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:1389
+#: plugins/personal/generic/class_user.inc:1397
 #: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1398
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1399
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1400
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1401
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1402
 #: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1395
+#: 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:587
+#: plugins/admin/departments/class_departmentGeneric.inc:590
 #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:536
-#: plugins/admin/systems/class_printGeneric.inc:870
+#: 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:1396
+#: 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:591
+#: plugins/admin/departments/class_departmentGeneric.inc:594
 #: html/getxls.php:228 html/getxls.php:301
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1405
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1406
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1407
 #: plugins/addons/addressbook/class_addressbook.inc:794
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1400
+#: plugins/personal/generic/class_user.inc:1408
 #: plugins/addons/addressbook/class_addressbook.inc:796
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
+#: plugins/personal/generic/class_user.inc:1409
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
+#: plugins/personal/generic/class_user.inc:1410
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
+#: 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:1405
+#: plugins/personal/generic/class_user.inc:1413
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 #: plugins/addons/addressbook/class_addressbook.inc:795
 msgid "Fax number"
@@ -2553,8 +2635,8 @@ msgstr ""
 #: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
-#: plugins/gofon/conference/generic.tpl:56
+#: 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 ""
@@ -2566,7 +2648,7 @@ msgstr ""
 #: 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:592
+#: plugins/admin/departments/class_departmentGeneric.inc:595
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
 msgid "Address"
 msgstr ""
@@ -2651,7 +2733,7 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:91
 #: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:316
+#: 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
@@ -2704,7 +2786,7 @@ msgstr ""
 #: 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:604
+#: 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
@@ -2717,8 +2799,8 @@ msgstr ""
 #: plugins/admin/systems/goMailServer.tpl:104
 #: plugins/admin/systems/goSpamServer.tpl:48
 #: plugins/admin/fai/faiPackage.tpl:81
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:296
 msgid "Remove"
 msgstr ""
 
@@ -2747,7 +2829,6 @@ msgid "Set new password"
 msgstr ""
 
 #: plugins/personal/connectivity/pureftpd.tpl:4
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
 msgid "FTP account"
 msgstr ""
 
@@ -2803,7 +2884,6 @@ msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:23
 #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_proxyAccount.inc:297
 msgid "Proxy account"
 msgstr ""
 
@@ -2816,7 +2896,7 @@ msgid "Limit proxy access to working time"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:304
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
@@ -2852,24 +2932,19 @@ msgstr ""
 #: 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:185
+#: 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/class_phpgwAccount.inc:148
-msgid "PHPgroupware"
-msgstr ""
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:3
 #: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/personal/connectivity/class_kolabAccount.inc:452
 msgid "Kolab account"
 msgstr ""
 
@@ -2880,7 +2955,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
 msgid "Delegations"
 msgstr ""
 
@@ -2912,7 +2987,7 @@ msgid "days"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:461
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
 msgid "Invitation policy"
 msgstr ""
 
@@ -2989,15 +3064,15 @@ msgstr ""
 msgid "Kolab account settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:456
 msgid "Free busy future"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
 msgid "Mail size restriction"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
 msgid "Free busy information"
 msgstr ""
 
@@ -3017,7 +3092,6 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:142
-#: plugins/personal/connectivity/class_webdavAccount.inc:147
 #: plugins/personal/connectivity/webdav.tpl:3
 msgid "WebDAV account"
 msgstr ""
@@ -3069,27 +3143,27 @@ msgstr ""
 msgid "Pure ftp account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
 msgid "Quota files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
 msgid "Upload ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
 msgid "Quota MBytes"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
 msgid "Download ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
 msgid "Upload bandwith"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
 msgid "Download bandwith"
 msgstr ""
 
@@ -3131,6 +3205,12 @@ msgstr ""
 msgid "Open-Xchange"
 msgstr ""
 
+#: 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!"
@@ -3182,24 +3262,19 @@ msgstr ""
 msgid "Open xchange account settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
-msgid "OpenExchange account"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
 msgid "OXAppointmentDays"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
 msgid "OXTaskDays"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
 msgid "OXTimeZone"
 msgstr ""
 
 #: plugins/personal/connectivity/intranet.tpl:3
-#: plugins/personal/connectivity/class_intranetAccount.inc:181
 msgid "Intranet account"
 msgstr ""
 
@@ -3259,17 +3334,16 @@ msgstr ""
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:301
 msgid "Filter unwanted content"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
 msgid "Limit proxy access"
 msgstr ""
 
 #: plugins/personal/connectivity/pptp.tpl:3
 #: plugins/personal/connectivity/class_pptpAccount.inc:159
-#: plugins/personal/connectivity/class_pptpAccount.inc:164
 msgid "PPTP account"
 msgstr ""
 
@@ -3288,7 +3362,7 @@ msgstr ""
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:185
+#: plugins/personal/connectivity/class_intranetAccount.inc:184
 msgid "Intranet account settings"
 msgstr ""
 
@@ -3313,22 +3387,21 @@ msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:1
 #: plugins/personal/connectivity/class_opengwAccount.inc:309
-#: plugins/personal/connectivity/class_opengwAccount.inc:315
 msgid "Opengroupware"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:319
 msgid "Location team"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
 msgid "Template user"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: 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
@@ -3336,7 +3409,7 @@ msgid "Locked"
 msgstr ""
 
 #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:323
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
 msgid "Teams"
 msgstr ""
 
@@ -3366,10 +3439,6 @@ msgstr ""
 msgid "PHP Schedule it settings"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
-msgid "PHP schedule it"
-msgstr ""
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr ""
@@ -3427,7 +3496,7 @@ msgid "Profil quota"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1283
 msgid "Cache profile localy"
 msgstr ""
 
@@ -3436,7 +3505,7 @@ msgid "Kiosk profile settings"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1289
 msgid "Kiosk profile"
 msgstr ""
 
@@ -3445,21 +3514,21 @@ msgid "Manage"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1282
 msgid "Resolution changeable during session"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1288
 #: plugins/admin/systems/workstationService.tpl:122
 #: plugins/admin/systems/terminalService.tpl:108
 msgid "Resolution"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1296
-#: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: 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
@@ -3489,7 +3558,7 @@ msgid "Logon script management"
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1295
+#: plugins/personal/environment/class_environment.inc:1293
 msgid "Hotplug devices"
 msgstr ""
 
@@ -3531,23 +3600,23 @@ 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 ""
 
@@ -3654,8 +3723,8 @@ msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:591
 #: plugins/personal/environment/class_environment.inc:604
-#: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:645
+#: plugins/admin/systems/class_terminalStartup.inc:204
+#: plugins/admin/systems/class_workstationStartup.inc:650
 msgid "You must specify a valid mount point."
 msgstr ""
 
@@ -3718,29 +3787,27 @@ msgid "Administrator"
 msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1291
 msgid "Default printer"
 msgstr ""
 
 #: plugins/personal/environment/class_environment.inc:1270
-#: plugins/personal/environment/class_environment.inc:1275
-#: plugins/personal/environment/class_environment.inc:1277
 msgid "Environment settings"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1280
+#: plugins/personal/environment/class_environment.inc:1278
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1285
 msgid "Profile quota"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1286
 msgid "Profile server"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1294
+#: plugins/personal/environment/class_environment.inc:1292
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3793,31 +3860,32 @@ msgstr ""
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/applications/class_applicationGeneric.inc:534
 #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:584
-#: plugins/admin/systems/class_winGeneric.inc:281
+#: 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:357
+#: plugins/admin/systems/class_servGeneric.inc:372
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: 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:703
+#: 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:538
-#: plugins/admin/fai/class_faiTemplate.inc:508
+#: 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:537
+#: plugins/admin/fai/class_faiPackage.inc:532
 #: plugins/admin/fai/class_faiProfile.inc:452
-#: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
+#: 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
@@ -3834,9 +3902,9 @@ msgstr ""
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
 #: plugins/admin/mimetypes/paste_generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:498
-#: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: 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"
@@ -3859,36 +3927,6 @@ msgstr ""
 msgid "Script can be replaced by user"
 msgstr ""
 
-#: 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:651
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:299
-#: 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:19
-#: 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:69 ihtml/themes/default/acl.tpl:83
-msgid "Apply"
-msgstr ""
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:69
 #: plugins/personal/environment/class_kioskManagementDialog.inc:88
 #, php-format
@@ -3978,37 +4016,37 @@ msgid "Nagios Account"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
 msgid "Alias"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:277
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
 msgid "Host notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:281
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
 msgid "Service notification period"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
 msgid "Service notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
 msgid "Host notification options"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:278
 msgid "Service notification commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:274
 msgid "Host notification commands"
 msgstr ""
 
@@ -4095,35 +4133,31 @@ msgstr ""
 msgid "Nagios account settings"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:265
-msgid "Nagios account"
-msgstr ""
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:282
 msgid "View all hosts"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:284
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
 msgid "View all services"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:285
 msgid "Trigger system commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
 msgid "Trigger all host commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:288
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
 msgid "Trigger all service commands"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:289
 msgid "View configuration information"
 msgstr ""
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:291
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
 msgid "View system informations"
 msgstr ""
 
@@ -4132,7 +4166,7 @@ msgid "Nagios settings"
 msgstr ""
 
 #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:366
+#: plugins/personal/netatalk/class_netatalk.inc:365
 msgid "Share"
 msgstr ""
 
@@ -4189,11 +4223,7 @@ msgstr ""
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/netatalk/class_netatalk.inc:360
-msgid "Netatalk account"
-msgstr ""
-
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:364
 msgid "User home path"
 msgstr ""
 
@@ -4209,7 +4239,7 @@ msgstr ""
 #: 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/gofon/macro/generic.tpl:30
+#: plugins/admin/acl/acl_role.tpl:31 plugins/gofon/macro/generic.tpl:30
 msgid "Choose subtree to place group in"
 msgstr ""
 
@@ -4226,7 +4256,7 @@ msgstr ""
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: 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"
@@ -4259,7 +4289,7 @@ msgstr ""
 #: 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:337 html/index.php:343
+#: 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"
@@ -4346,9 +4376,9 @@ msgstr ""
 #: 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:554
-#: plugins/admin/systems/class_servGeneric.inc:356
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: 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:439
@@ -4372,17 +4402,17 @@ msgstr ""
 #: 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:701
-#: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:537
-#: plugins/admin/fai/class_faiTemplate.inc:507
+#: 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:536
+#: plugins/admin/fai/class_faiPackage.inc:531
 #: plugins/admin/fai/class_faiProfile.inc:451
-#: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
+#: 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
@@ -4398,7 +4428,7 @@ msgstr ""
 #: 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:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:683
 #: html/getxls.php:223 html/getxls.php:290
 msgid "Name"
 msgstr ""
@@ -4435,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
@@ -4467,7 +4497,7 @@ 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:56
@@ -4496,9 +4526,9 @@ msgstr ""
 #: 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:189
+#: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:151
-#: plugins/admin/acl/class_divListACL.inc:100
+#: 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
@@ -4515,9 +4545,9 @@ msgstr ""
 #: 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:189
+#: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:151
-#: plugins/admin/acl/class_divListACL.inc:100
+#: 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
@@ -4536,15 +4566,18 @@ msgstr ""
 #: 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:256
+#: plugins/admin/systems/class_divListSystem.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:196
-#: plugins/admin/acl/class_divListACL.inc:127
-#: plugins/admin/fai/class_faiScript.inc:293
-#: plugins/admin/fai/class_faiScript.inc:295
-#: plugins/admin/fai/class_faiTemplate.inc:270
-#: plugins/admin/fai/class_faiTemplate.inc:272
-#: plugins/admin/fai/class_faiHook.inc:294
-#: plugins/admin/fai/class_faiHook.inc:296
+#: 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
@@ -4566,12 +4599,15 @@ msgstr ""
 #: 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:265
+#: plugins/admin/systems/class_divListSystem.inc:273
 #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/acl/class_divListACL.inc:131
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:274
-#: plugins/admin/fai/class_faiHook.inc:298
+#: 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
@@ -4592,9 +4628,9 @@ msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:21
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
-#: plugins/admin/ogroups/phonequeue.tpl:47
-#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
-#: html/getxls.php:281
+#: 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 ""
 
@@ -4828,14 +4864,16 @@ msgstr ""
 #: 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:846
-#: plugins/admin/ogroups/class_ogroupManagement.inc:346
-#: plugins/admin/fai/faiTemplateEntry.tpl:110
+#: 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 ""
 
@@ -5126,7 +5164,7 @@ msgstr ""
 
 #: plugins/addons/addressbook/address_edit.tpl:191
 #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:585
+#: plugins/admin/departments/class_departmentGeneric.inc:588
 msgid "Country"
 msgstr ""
 
@@ -5826,7 +5864,8 @@ msgstr ""
 #: 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:20
+#: 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
@@ -5893,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: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: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:192
-#: plugins/admin/systems/class_terminalGeneric.inc:204
-#: plugins/admin/systems/class_terminalGeneric.inc:216
-#: plugins/admin/systems/class_servGeneric.inc:92
-#: 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: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 ""
@@ -5958,30 +5958,29 @@ 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:469
-#: plugins/admin/departments/class_departmentGeneric.inc:561
+#: plugins/admin/departments/class_departmentGeneric.inc:564
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: 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
-#: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
@@ -5990,6 +5989,58 @@ msgstr ""
 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 ""
@@ -6182,7 +6233,7 @@ msgstr ""
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:898 setup/setup_step6.tpl:18
 msgid "Samba SID"
 msgstr ""
 
@@ -6206,8 +6257,10 @@ msgstr ""
 msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
-#: include/class_acl.inc:688
+#: 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 ""
 
@@ -6223,69 +6276,81 @@ msgstr ""
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
-#: include/class_acl.inc:690
+#: 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:330
-msgid "This 'dn' has no valid mail extensions."
+#: 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:352
-msgid "Remove shared folder from mail server database"
+#: plugins/admin/groups/class_groupMail.inc:331
+msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:353
-msgid "Remove the shared folder and all its contents from mail server."
+msgid ""
+"Remove shared folder from mail server database when entry gets removed in "
+"LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:412
-msgid "You're trying to add an invalid email address "
+#: 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:414
 msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:679
+#: 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:861
+#: 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:890
+#: 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:923
+#: 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:927
+#: plugins/admin/groups/class_groupMail.inc:942
 msgid "Please select a valid mail server."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1074
+#: plugins/admin/groups/class_groupMail.inc:1089
 msgid "Group mail"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1082
+#: plugins/admin/groups/class_groupMail.inc:1097
 msgid "Alternate addresses"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1083
+#: plugins/admin/groups/class_groupMail.inc:1098
 msgid "Forwarding addresses"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:1086
+#: plugins/admin/groups/class_groupMail.inc:1101
 #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:873
+#: plugins/admin/systems/class_printGeneric.inc:887
 msgid "Permissions"
 msgstr ""
 
@@ -6307,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 ""
@@ -6350,9 +6415,9 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:426
-#: plugins/admin/acl/class_aclManagement.inc:424
-#: plugins/admin/acl/class_aclManagement.inc:425
-#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
+#: 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 ""
 
@@ -6454,7 +6519,7 @@ msgstr ""
 #: 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:348
+#: 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
@@ -6467,9 +6532,7 @@ msgstr ""
 #: 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:542
-#: plugins/admin/fai/faiPackageNew.tpl:21
-#: plugins/admin/fai/faiPackageNew.tpl:24
+#: plugins/admin/fai/class_faiPackage.inc:537
 msgid "Release"
 msgstr ""
 
@@ -6557,6 +6620,7 @@ msgstr ""
 #: 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 ""
@@ -6565,6 +6629,7 @@ msgstr ""
 #: 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 ""
@@ -6573,6 +6638,7 @@ msgstr ""
 #: 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 ""
@@ -6581,6 +6647,7 @@ msgstr ""
 #: 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 ""
@@ -6639,13 +6706,6 @@ msgstr ""
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: 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:288
-msgid "none"
-msgstr ""
-
 #: plugins/admin/users/class_userManagement.inc:468
 msgid "Please select a valid template."
 msgstr ""
@@ -6666,8 +6726,8 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:997
-#: plugins/admin/fai/class_faiTemplate.inc:499
+#: plugins/admin/systems/class_systemManagement.inc:1028
+#: plugins/admin/fai/class_faiTemplate.inc:500
 msgid "Template"
 msgstr ""
 
@@ -6824,7 +6884,7 @@ msgstr ""
 
 #: plugins/admin/applications/generic.tpl:15
 #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:545 html/getxls.php:222
 #: html/getxls.php:297
 msgid "Display name"
 msgstr ""
@@ -6907,10 +6967,10 @@ msgid "Upload"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:140
-#: plugins/admin/fai/class_faiScript.inc:307
-#: plugins/admin/fai/class_faiTemplate.inc:284
+#: 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:308
+#: plugins/admin/fai/class_faiHook.inc:309
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr ""
@@ -7099,12 +7159,12 @@ msgid "Current release"
 msgstr ""
 
 #: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/fai/faiNewBranch.tpl:35
 msgid "Processing the requested operation"
 msgstr ""
 
 #: plugins/admin/departments/dep_iframe.tpl:7
-#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/fai/faiNewBranch.tpl:42
 msgid ""
 "Your browser doesn't support iframes, please use this link to perform the "
 "requested operation."
@@ -7119,12 +7179,12 @@ msgid "Name of subtree to create"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:19
-#: plugins/gofon/conference/generic.tpl:84
+#: plugins/gofon/conference/generic.tpl:93
 msgid "Descriptive text for department"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:590
+#: plugins/admin/departments/class_departmentGeneric.inc:593
 msgid "Category"
 msgstr ""
 
@@ -7133,7 +7193,7 @@ msgid "Category for this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:168
+#: plugins/gofon/conference/generic.tpl:177
 msgid "Choose subtree to place department in"
 msgstr ""
 
@@ -7158,7 +7218,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:117
-#: plugins/admin/departments/class_departmentGeneric.inc:593
+#: plugins/admin/departments/class_departmentGeneric.inc:596
 msgid "Administrative settings"
 msgstr ""
 
@@ -7235,27 +7295,31 @@ msgid "Moving '%s' to '%s'"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:542
-#: include/class_ldap.inc:458 include/class_acl.inc:555
-#: include/class_acl.inc:562 include/class_acl.inc:569
-#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: 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:545
+#: plugins/admin/departments/class_departmentGeneric.inc:547
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:576
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: 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:588
+#: plugins/admin/departments/class_departmentGeneric.inc:591
 #: plugins/admin/systems/workstationService.tpl:89
 #: plugins/admin/systems/terminalService.tpl:79
 #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7264,7 +7328,7 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:589
+#: plugins/admin/departments/class_departmentGeneric.inc:592
 #: plugins/admin/departments/class_divListDepartment.inc:41
 msgid "Department name"
 msgstr ""
@@ -7281,7 +7345,7 @@ msgstr ""
 msgid "You have no permission to remove this department."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:352
+#: plugins/admin/departments/class_departmentManagement.inc:353
 msgid ".."
 msgstr ""
 
@@ -7346,10 +7410,9 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:398
+#: 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 ""
 
@@ -7359,8 +7422,8 @@ msgstr ""
 
 #: plugins/admin/systems/network.tpl:77
 #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:401
-#: plugins/admin/systems/class_termDNS.inc:547
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/class_termDNS.inc:571
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -7376,9 +7439,9 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
 #: plugins/admin/systems/class_terminalService.inc:261
-#: plugins/admin/systems/class_terminalStartup.inc:161
+#: plugins/admin/systems/class_terminalStartup.inc:162
 #: plugins/admin/systems/class_terminalGeneric.inc:256
-#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_workstationStartup.inc:503
 msgid "This 'dn' has no terminal features."
 msgstr ""
 
@@ -7421,7 +7484,7 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
 #: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:548
+#: 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
@@ -7436,7 +7499,7 @@ msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:47
 #: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/systems/class_workstationGeneric.inc:537
 #: plugins/admin/ogroups/termgroup.tpl:58
 #: plugins/admin/ogroups/class_termgroup.inc:391
 msgid "Syslog server"
@@ -7449,7 +7512,7 @@ msgid "Choose server to use for logging"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:549
+#: plugins/admin/systems/class_terminalGeneric.inc:550
 msgid "Root server"
 msgstr ""
 
@@ -7458,7 +7521,7 @@ msgid "Select NFS root filesystem to use"
 msgstr ""
 
 #: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:550
+#: plugins/admin/systems/class_terminalGeneric.inc:551
 msgid "Swap server"
 msgstr ""
 
@@ -7598,51 +7661,51 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:87
+#: 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:145
+#: 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:195
+#: 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:205
-#: plugins/admin/systems/class_terminalGeneric.inc:434
-#: plugins/admin/systems/class_servGeneric.inc:274
+#: 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:673
+#: 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:260
+#: 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:271
+#: plugins/admin/systems/class_winGeneric.inc:272
 msgid "Win generic"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:272
+#: plugins/admin/systems/class_winGeneric.inc:273
 msgid "Windows workstation generic"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:277
+#: plugins/admin/systems/class_winGeneric.inc:278
 msgid "Win workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:280
+#: plugins/admin/systems/class_winGeneric.inc:281
 #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:535
+#: plugins/admin/systems/class_workstationGeneric.inc:533
 msgid "Workstation name"
 msgstr ""
 
@@ -7675,15 +7738,15 @@ msgstr ""
 #: 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_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:824
+#: 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
@@ -7790,7 +7853,7 @@ msgid "Monitor"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalService.inc:476
-#: plugins/admin/ogroups/class_phonequeue.inc:748
+#: plugins/admin/ogroups/class_phonequeue.inc:937
 msgid "Method"
 msgstr ""
 
@@ -7894,7 +7957,7 @@ msgstr ""
 msgid "Telephone hardware"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_terminalStartup.inc:94
 #: plugins/admin/systems/class_workstationStartup.inc:337
 #, php-format
 msgid ""
@@ -7902,34 +7965,34 @@ msgid ""
 "exist."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:397
+#: 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:443
+#: plugins/admin/systems/class_terminalStartup.inc:447
 msgid "Terminal startup"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1163
+#: plugins/admin/systems/class_terminalStartup.inc:455
+#: plugins/admin/systems/class_workstationStartup.inc:1168
 msgid "Ldap server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1167
+#: plugins/admin/systems/class_terminalStartup.inc:457
+#: plugins/admin/systems/class_workstationStartup.inc:1172
 msgid "Kernel modules"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1164
+#: 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:455
-#: plugins/admin/systems/class_workstationStartup.inc:1165
+#: plugins/admin/systems/class_terminalStartup.inc:459
+#: plugins/admin/systems/class_workstationStartup.inc:1170
 msgid "Kernel parameter"
 msgstr ""
 
@@ -8024,7 +8087,7 @@ msgid "Supported interfaces"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:402
 msgid "Serial"
 msgstr ""
 
@@ -8090,14 +8153,14 @@ msgid "No HALTCMD definition found in your gosa.conf"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:294
-#: plugins/admin/systems/class_servGeneric.inc:185
+#: 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:295
-#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_servGeneric.inc:200
 #: plugins/admin/systems/class_workstationGeneric.inc:284
 #: plugins/admin/ogroups/class_termgroup.inc:295
 msgid "Reboot"
@@ -8105,8 +8168,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:296
 #: plugins/admin/systems/class_terminalGeneric.inc:300
-#: plugins/admin/systems/class_servGeneric.inc:190
-#: plugins/admin/systems/class_servGeneric.inc:196
+#: 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
@@ -8115,8 +8178,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:297
 #: plugins/admin/systems/class_terminalGeneric.inc:301
-#: plugins/admin/systems/class_servGeneric.inc:191
-#: plugins/admin/systems/class_servGeneric.inc:197
+#: 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
@@ -8124,7 +8187,7 @@ msgid "System analysis"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:299
-#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_servGeneric.inc:208
 #: plugins/admin/systems/class_workstationGeneric.inc:292
 msgid "Wake up"
 msgstr ""
@@ -8134,50 +8197,50 @@ msgstr ""
 msgid "Removing of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:415
+#: plugins/admin/systems/class_terminalGeneric.inc:416
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: 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:528
+#: 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:539
-#: plugins/admin/systems/class_terminalGeneric.inc:545
-#: plugins/admin/systems/class_systemManagement.inc:998
+#: 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/ogroups/class_ogroupManagement.inc:353
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:540
+#: plugins/admin/systems/class_terminalGeneric.inc:541
 msgid "Terminal generic"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:551
+#: plugins/admin/systems/class_terminalGeneric.inc:552
 msgid "Syslog server enabled"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:552
+#: plugins/admin/systems/class_terminalGeneric.inc:553
 msgid "Ntp server settings"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:555
-#: plugins/admin/systems/class_workstationGeneric.inc:541
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_workstationGeneric.inc:539
 msgid "Root password"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:556
-#: plugins/admin/systems/class_servGeneric.inc:360
-#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: 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 ""
@@ -8188,69 +8251,69 @@ msgstr ""
 msgid "Activated"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:79
+#: plugins/admin/systems/class_servGeneric.inc:94
 msgid "This 'dn' has no server features."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:87
+#: 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:125
+#: 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:186
+#: 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:187
-#: plugins/admin/systems/class_servGeneric.inc:195
+#: 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:188
-#: plugins/admin/systems/class_servGeneric.inc:194
+#: 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:189
+#: 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:218
+#: 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:263
+#: plugins/admin/systems/class_servGeneric.inc:278
 msgid "The required field 'Server name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:332
+#: 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:348
+#: plugins/admin/systems/class_servGeneric.inc:363
 msgid "Server generic"
 msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:358
-#: plugins/admin/systems/class_workstationGeneric.inc:538
+#: plugins/admin/systems/class_servGeneric.inc:373
+#: plugins/admin/systems/class_workstationGeneric.inc:536
 msgid "Goto mode"
 msgstr ""
 
@@ -8294,24 +8357,24 @@ msgid "The required field 'Workstation name' is not set."
 msgstr ""
 
 #: plugins/admin/systems/class_workstationGeneric.inc:491
-#: plugins/admin/systems/class_workstationGeneric.inc:517
+#: 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:527
+#: plugins/admin/systems/class_workstationGeneric.inc:525
 msgid "Workstation generic"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:532
-#: plugins/admin/systems/class_systemManagement.inc:999
+#: 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:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/systems/class_workstationGeneric.inc:538
 #: plugins/admin/ogroups/class_termgroup.inc:393
 msgid "Ntp server"
 msgstr ""
@@ -8329,105 +8392,121 @@ msgstr ""
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:257
+#: 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:308
+#: plugins/admin/systems/class_systemManagement.inc:314
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:336
-#: plugins/admin/systems/class_systemManagement.inc:402
+#: 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:348
+#: plugins/admin/systems/class_systemManagement.inc:354
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:405
+#: plugins/admin/systems/class_systemManagement.inc:411
 msgid "Can't detect object to change password."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:467
+#: 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:473
-#: plugins/admin/systems/class_systemManagement.inc:533
+#: 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:837
+#: 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:839
+#: plugins/admin/systems/class_systemManagement.inc:870
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:841
+#: plugins/admin/systems/class_systemManagement.inc:872
 msgid "New Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:860
+#: plugins/admin/systems/class_systemManagement.inc:891
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:876
+#: plugins/admin/systems/class_systemManagement.inc:907
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:996
+#: plugins/admin/systems/class_systemManagement.inc:1027
 msgid "New System from incoming"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1000
+#: plugins/admin/systems/class_systemManagement.inc:1031
 msgid "Workstation is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1001
+#: plugins/admin/systems/class_systemManagement.inc:1032
 msgid "Workstation is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1002
+#: plugins/admin/systems/class_systemManagement.inc:1033
 msgid "Workstation installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1005
+#: plugins/admin/systems/class_systemManagement.inc:1036
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1006
+#: plugins/admin/systems/class_systemManagement.inc:1037
 msgid "Server is waiting for action"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1007
+#: plugins/admin/systems/class_systemManagement.inc:1038
 msgid "Server installation failed"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1008
+#: plugins/admin/systems/class_systemManagement.inc:1039
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1009
+#: plugins/admin/systems/class_systemManagement.inc:1040
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1010
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_systemManagement.inc:1041
+#: plugins/admin/systems/class_divListSystem.inc:149
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:1011
-#: plugins/admin/systems/class_divListSystem.inc:154
+#: 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 ""
@@ -8532,9 +8611,9 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:355
-#: plugins/admin/systems/class_servDNS.inc:384
-#: plugins/admin/systems/class_servDNS.inc:385
+#: 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 ""
 
@@ -8561,7 +8640,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/admin/systems/class_servDNS.inc:399
 msgid "Reverse zone"
 msgstr ""
 
@@ -8577,50 +8656,50 @@ msgid ""
 "entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:292
+#: 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:301
+#: 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:322
+#: 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:346
+#: 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:393
-#: plugins/admin/systems/class_termDNS.inc:546
+#: 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:395
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Primary dns server"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:399
+#: 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:400
+#: plugins/admin/systems/class_servDNS.inc:405
 #: plugins/admin/systems/servdnseditzone.tpl:79
 msgid "Expire"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/class_servDNS.inc:407
 #: plugins/admin/systems/servdnseditzone.tpl:24
 msgid "Zone records"
 msgstr ""
@@ -8872,81 +8951,81 @@ msgid ""
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:511
+#: 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:519
+#: plugins/admin/systems/class_printGeneric.inc:520
 msgid "can't get ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:532
+#: 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:534
+#: 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:589
+#: 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:818
+#: 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:841
-#: plugins/admin/systems/class_printGeneric.inc:843
-#: plugins/admin/ogroups/class_ogroupManagement.inc:347
+#: 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:859
+#: plugins/admin/systems/class_printGeneric.inc:873
 msgid "Print generic"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:871
+#: plugins/admin/systems/class_printGeneric.inc:885
 msgid "LabeledURL"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:872
+#: plugins/admin/systems/class_printGeneric.inc:886
 msgid "Printer PPD"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:889
+#: 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:906
+#: 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:911
+#: 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:946
+#: 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:957
+#: plugins/admin/systems/class_printGeneric.inc:971
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -9163,7 +9242,7 @@ msgid "Phone generic"
 msgstr ""
 
 #: plugins/admin/systems/class_phoneGeneric.inc:436
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1465
 msgid "Phone hardware"
 msgstr ""
 
@@ -9253,34 +9332,34 @@ msgstr ""
 msgid "Option contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:429
+#: 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:474
+#: 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:537
+#: 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:754
+#: plugins/admin/systems/class_workstationStartup.inc:759
 msgid "Not available in current setup"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:897
+#: 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:913
+#: plugins/admin/systems/class_workstationStartup.inc:918
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9288,18 +9367,18 @@ msgid ""
 "reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1085
+#: 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:1135
+#: 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:1137
+#: plugins/admin/systems/class_workstationStartup.inc:1142
 #: plugins/admin/systems/class_servRepositorySetup.inc:203
 #, php-format
 msgid ""
@@ -9307,25 +9386,25 @@ msgid ""
 "empty string."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1155
+#: plugins/admin/systems/class_workstationStartup.inc:1160
 msgid "System startup"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1170
+#: 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:1171
+#: plugins/admin/systems/class_workstationStartup.inc:1176
 msgid "Debian mirror"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1172
+#: plugins/admin/systems/class_workstationStartup.inc:1177
 msgid "Debian release"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1174
+#: plugins/admin/systems/class_workstationStartup.inc:1179
 msgid "FAI status flag"
 msgstr ""
 
@@ -9485,19 +9564,19 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:45
-#: plugins/admin/fai/class_faiPackage.inc:539
+#: 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:289
+#: 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:287
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
 msgid "False"
 msgstr ""
 
@@ -9908,7 +9987,7 @@ msgstr ""
 #: 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:102
+#: 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
@@ -9919,11 +9998,11 @@ msgstr ""
 #: 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:103
+#: 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:1109
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1320
 msgid "Stop"
 msgstr ""
 
@@ -9931,7 +10010,7 @@ msgstr ""
 #: 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:104
+#: 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
@@ -9973,7 +10052,7 @@ msgid "The attribute database is empty or contains invalid characters."
 msgstr ""
 
 #: plugins/admin/systems/class_goGlpiServer.inc:96
-#: plugins/admin/systems/class_goFonServer.inc:106
+#: plugins/admin/systems/class_goFonServer.inc:137
 #: plugins/admin/systems/class_goLogDBServer.inc:95
 #: plugins/admin/systems/class_goKrbServer.inc:97
 msgid "Admin"
@@ -10229,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 ""
 
@@ -10239,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 ""
 
@@ -10334,7 +10415,7 @@ msgid "Add/Edit network interface"
 msgstr ""
 
 #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:537
+#: plugins/admin/systems/class_termDNS.inc:561
 msgid "MAC address"
 msgstr ""
 
@@ -10520,8 +10601,8 @@ msgid "Website"
 msgstr ""
 
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_phonequeue.inc:701
-#: plugins/gofon/conference/generic.tpl:100 html/getxls.php:226
+#: 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 ""
@@ -10695,71 +10776,82 @@ msgstr ""
 msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:137
+#: 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:319
+#: 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:323
+#: plugins/admin/systems/class_termDNS.inc:341
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:330
+#: plugins/admin/systems/class_termDNS.inc:348
 msgid "The required field 'MAC-address' is not set."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:333
+#: 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:353
+#: 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:361
+#: 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:372
+#: 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:379
+#: 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:463
+#: 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:527
+#: plugins/admin/systems/class_termDNS.inc:551
 msgid "DNS"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:528
+#: plugins/admin/systems/class_termDNS.inc:552
 msgid "DNS settings"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:536
+#: plugins/admin/systems/class_termDNS.inc:560
 msgid "IP address"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:545
+#: plugins/admin/systems/class_termDNS.inc:569
 msgid "DNS records"
 msgstr ""
 
@@ -10851,7 +10943,8 @@ msgid "Choose an object group"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: 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 ""
@@ -10993,164 +11086,162 @@ 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:148
+#: plugins/admin/systems/class_divListSystem.inc:149
 msgid "New Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:154
+#: plugins/admin/systems/class_divListSystem.inc:155
 msgid "New Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:161
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:167
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:173
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:178
+#: plugins/admin/systems/class_divListSystem.inc:179
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:203
+#: plugins/admin/systems/class_divListSystem.inc:204
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:204
+#: plugins/admin/systems/class_divListSystem.inc:205
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:205
+#: plugins/admin/systems/class_divListSystem.inc:206
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:206
+#: plugins/admin/systems/class_divListSystem.inc:207
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:207
+#: plugins/admin/systems/class_divListSystem.inc:208
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:208
+#: plugins/admin/systems/class_divListSystem.inc:209
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:209
+#: plugins/admin/systems/class_divListSystem.inc:210
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:210
+#: plugins/admin/systems/class_divListSystem.inc:211
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:211
+#: plugins/admin/systems/class_divListSystem.inc:212
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:212
+#: plugins/admin/systems/class_divListSystem.inc:213
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:256
-#: plugins/admin/acl/class_divListACL.inc:128
+#: plugins/admin/systems/class_divListSystem.inc:264
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:265
-#: plugins/admin/acl/class_divListACL.inc:132
+#: plugins/admin/systems/class_divListSystem.inc:273
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:308
+#: plugins/admin/systems/class_divListSystem.inc:316
 msgid "Set root       password"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:315
+#: plugins/admin/systems/class_divListSystem.inc:323
 msgid "Create CD"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:316
+#: plugins/admin/systems/class_divListSystem.inc:324
 msgid "Create FAI CD"
 msgstr ""
 
@@ -11276,11 +11367,11 @@ msgstr ""
 msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_serverService.inc:288
+#: 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:300
+#: plugins/admin/systems/class_serverService.inc:309
 #, php-format
 msgid "The specified method '%s' can't executed for services."
 msgstr ""
@@ -11480,7 +11571,7 @@ msgid "Logging service"
 msgstr ""
 
 #: plugins/admin/systems/class_goFonServer.inc:34
-#: plugins/admin/systems/class_goFonServer.inc:93
+#: plugins/admin/systems/class_goFonServer.inc:124
 msgid "VoIP service"
 msgstr ""
 
@@ -11502,15 +11593,22 @@ msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:94
+#: 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:125
 msgid "VoIP - asterisk management"
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:108
+#: plugins/admin/systems/class_goFonServer.inc:139
 msgid "Area code"
 msgstr ""
 
-#: plugins/admin/systems/class_goFonServer.inc:109
+#: plugins/admin/systems/class_goFonServer.inc:140
 msgid "Country code"
 msgstr ""
 
@@ -11656,7 +11754,7 @@ msgid "IMAP/POP3"
 msgstr ""
 
 #: plugins/admin/systems/class_goImapServer.inc:172
-#: ihtml/themes/default/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27 setup/setup_step4.tpl:85
 msgid "Admin password"
 msgstr ""
 
@@ -11965,17 +12063,17 @@ 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:86
+#: 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 ""
 
@@ -12057,7 +12155,7 @@ msgid "Display objects of department"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:698
+#: plugins/admin/ogroups/class_ogroup.inc:701
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr ""
@@ -12068,93 +12166,98 @@ msgid "You're about to delete the object group '%s'."
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/admin/ogroups/class_ogroupManagement.inc:188
 msgid "You are not allowed to delete this object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:146
+#: plugins/admin/ogroups/class_ogroup.inc:149
 msgid "This 'dn' is no object group."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:293
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:295
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:293
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:297
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:298
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:299
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:300
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:301
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:302
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:303
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:307
+#: plugins/admin/ogroups/class_ogroup.inc:310
 msgid "and"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/ogroups/class_ogroup.inc:447
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:586
+#: plugins/admin/ogroups/class_ogroup.inc:589
 msgid "There is already an object with this cn."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:601
+#: 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:650
+#: 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:663
+#: 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:693
+#: plugins/admin/ogroups/class_ogroup.inc:696
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:704
+#: 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
@@ -12162,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 ""
 
@@ -12319,178 +12431,229 @@ msgstr ""
 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:307
-#, 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:97
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:243
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
-#, 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:1183
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
+#: 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:90
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:232
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
+#: 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:882
+msgid "Removing phone queue failed"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:719
+#: 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 ""
 
@@ -12599,33 +12762,32 @@ msgstr ""
 msgid "Please enter the new object group name"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:25
+#: 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:122
+#: 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:167
+#: 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:173
-#: plugins/admin/acl/class_aclManagement.inc:198
+#: plugins/admin/acl/class_aclManagement.inc:229
+#: plugins/admin/acl/class_aclManagement.inc:254
 msgid "You are not allowed to delete this acl!"
 msgstr ""
 
-#: plugins/admin/acl/class_aclManagement.inc:425
-#: plugins/admin/acl/class_aclManagement.inc:430
-msgid "Access control list"
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:433
-msgid "I don't know Jack"
-msgstr ""
-
 #: plugins/admin/acl/class_divListACL.inc:31
 msgid "List of acl"
 msgstr ""
@@ -12643,13 +12805,203 @@ msgid "Display acls matching"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:115
-msgid "Acl"
+msgid "New acl role"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:166
+msgid "Edit acl role"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:176
+msgid "Delete acl role"
+msgstr ""
+
+#: plugins/admin/acl/class_divListACL.inc:188
+msgid "Edit acl"
+msgstr ""
+
+#: 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/acl/tabs_acl_role.inc:8
+msgid "ACL Templates"
+msgstr ""
+
+#: plugins/admin/acl/acl_role.tpl:3 ihtml/themes/default/acl.tpl:2
+msgid "Assigned ACLs for current entry"
+msgstr ""
+
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+msgid "New ACL"
+msgstr ""
+
+#: 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/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 "Contains ACLs for these objects: %s"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:384 include/class_acl.inc:417
+msgid "Edit categories ACLs"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:385 include/class_acl.inc:418
+msgid "Clear categories ACLs"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:401 include/class_acl.inc:462
+#, php-format
+msgid "Edit ACL for '%s', scope is '%s'"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:411 include/class_acl.inc:472
+msgid "All objects in current subtree"
+msgstr ""
+
+#: 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/acl/class_aclRole.inc:531 include/class_acl.inc:597
+msgid "Create objects"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:532 include/class_acl.inc:598
+msgid "Move objects"
+msgstr ""
+
+#: 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
@@ -12670,29 +13022,29 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:433
+#: 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:530
+#: plugins/admin/fai/class_faiScript.inc:531
 #: plugins/admin/fai/class_faiHookEntry.inc:191
 msgid "FAI script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:537
-#: plugins/admin/fai/class_faiTemplate.inc:507
-#: plugins/admin/fai/class_faiPackage.inc:539
-#: plugins/admin/fai/class_faiPackage.inc:542
+#: 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:414
+#: 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:500
+#: plugins/admin/fai/class_faiTemplate.inc:501
 msgid "FAI template"
 msgstr ""
 
@@ -12768,7 +13120,7 @@ msgstr ""
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:675
 msgid "Configure"
 msgstr ""
 
@@ -12872,46 +13224,46 @@ msgstr ""
 msgid "Import script"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:380
+#: plugins/admin/fai/class_faiPackage.inc:372
 msgid "Please select a least one Package."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:384
+#: plugins/admin/fai/class_faiPackage.inc:376
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:405
+#: plugins/admin/fai/class_faiPackage.inc:397
 msgid "package is configured"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:411
+#: plugins/admin/fai/class_faiPackage.inc:403
 msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:438
+#: plugins/admin/fai/class_faiPackage.inc:431
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:482
+#: 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:528
+#: plugins/admin/fai/class_faiPackage.inc:523
 #: plugins/admin/fai/faiPackageConfiguration.tpl:1
 msgid "Package"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:529
+#: plugins/admin/fai/class_faiPackage.inc:524
 msgid "FAI Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/class_faiPackage.inc:535
 msgid "Install Method"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:541
+#: plugins/admin/fai/class_faiPackage.inc:536
 msgid "Package configuration"
 msgstr ""
 
@@ -12981,59 +13333,59 @@ msgstr ""
 msgid "FAI profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:436
+#: 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:527
+#: plugins/admin/fai/class_faiHook.inc:528
 msgid "Hook"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:528
+#: plugins/admin/fai/class_faiHook.inc:529
 msgid "FAI hook"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:535
+#: 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:181
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 msgid "primary"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 msgid "logical"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
 msgid "FS type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: 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:191
+#: 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:192
+#: 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:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
 msgid "FS option"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
 msgid "Preserve"
 msgstr ""
 
@@ -13262,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 ""
 
@@ -13380,7 +13736,7 @@ msgid "Destination path"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:700
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
@@ -13448,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 "
@@ -13494,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 ""
 
@@ -13864,169 +14191,221 @@ 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:129
+#: 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:146
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:174
 msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
-#: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
+#: 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:267
+#: 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:571
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
 msgid "Error while performing query:"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
+#: 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:649
+#: 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:768
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
 msgid "Remove phone account"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:769
+#: 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:772
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:775
+#: 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:773
+#: 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:776
+#: 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:789
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:989
 msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:825
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
 msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:917
+#: 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:920
+#: 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:925
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1144
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:928
+#: 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:938
+#: 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:945
+#: 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:993
+#: 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:1114
+#: 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:1147
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1358
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: 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:1232
+#: 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:1237
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1456
 msgid "GOfon reports"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1462
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:699
 msgid "Telephone number"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1464
 msgid "Macro settings"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1466
 msgid "Telephone pin"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1467
 msgid "Voicemail pin"
 msgstr ""
 
@@ -14063,7 +14442,8 @@ msgid "Regular expression for matching macro names"
 msgstr ""
 
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:496
+#: plugins/gofon/macro/class_gofonMacro.inc:542
+#: plugins/gofon/macro/class_divListMacros.inc:52
 msgid "Macro name"
 msgstr ""
 
@@ -14093,49 +14473,40 @@ msgstr ""
 msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:101
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:202
-msgid "This 'dn' is no phone macro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:183
-msgid ""
-"This macro ist still in use. To delete this Macro ensure that nobody has "
-"selected this Macro."
+#: plugins/gofon/macro/class_gofonMacro.inc:235
+#, php-format
+msgid "Removing macro from '%s' failed. Check GOsa log for mysql error."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:190
-#: plugins/gofon/macro/class_gofonMacro.inc:205
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:402
+#: plugins/gofon/macro/class_gofonMacro.inc:303
 #, php-format
-msgid "Removing of goFonMacro/generic account with dn '%s' failed."
+msgid "More than one '(' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:218
-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:306
+#, php-format
+msgid "More than one ')' is currently not supported. Line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:288
+#: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
-msgid "Unable to parse macro contents on line: %s"
+msgid "There is no application given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:306
+#: plugins/gofon/macro/class_gofonMacro.inc:314
 #, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+msgid "There is no extension type given in line : '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:315
-#: plugins/gofon/macro/class_gofonMacro.inc:323
+#: plugins/gofon/macro/class_gofonMacro.inc:343
 #, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+msgid "Insert of new macro failed for server '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:337
-#, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+#: 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:417
@@ -14143,40 +14514,61 @@ msgstr ""
 msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:422
+#: 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:426
+#: 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:430
+#: 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:444
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:435
-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:478
+#: 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:487
+#: plugins/gofon/macro/class_gofonMacro.inc:533
 msgid "Asterisk macro management"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:492
+#: plugins/gofon/macro/class_gofonMacro.inc:538
 msgid "GOfon macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:500
+#: plugins/gofon/macro/class_gofonMacro.inc:546
 msgid "Macro content and parameter"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:501
+#: plugins/gofon/macro/class_gofonMacro.inc:547
 msgid "Visibility flag"
 msgstr ""
 
@@ -14192,6 +14584,10 @@ msgstr ""
 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 ""
@@ -14224,10 +14620,6 @@ 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 ""
@@ -14286,43 +14678,43 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:90
+#: plugins/gofon/conference/generic.tpl:99
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
+#: plugins/gofon/conference/generic.tpl:146
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:689
 msgid "Preset PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:145
+#: plugins/gofon/conference/generic.tpl:154
 #: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
+#: plugins/gofon/conference/generic.tpl:166
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:690
 msgid "Record conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:165
+#: plugins/gofon/conference/generic.tpl:174
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
+#: plugins/gofon/conference/generic.tpl:197
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:691
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:196
+#: plugins/gofon/conference/generic.tpl:205
 msgid "Activate session menu"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:204
+#: plugins/gofon/conference/generic.tpl:213
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:212
+#: plugins/gofon/conference/generic.tpl:221
 msgid "Count users"
 msgstr ""
 
@@ -14334,83 +14726,102 @@ msgstr ""
 msgid "Management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:196
+#: 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:252
+#: 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:256
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:359
 msgid "Please enter a PIN."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:363
 msgid "Please enter a name for the conference."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:367
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
+#: 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:540
+#: 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:663
 #, php-format
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:673
 #: plugins/gofon/conference/class_divListConferences.inc:198
 msgid "Conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:674
 msgid "Phone conference management"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:679
 msgid "GOfon conference"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:686
 msgid "Conference PIN"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:692
 msgid "Activate menu"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:693
 msgid "Announce user activity"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:694
 msgid "Count user"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:695
 msgid "Conference type"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:697
 msgid "Format"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:698
 msgid "Lifetime"
 msgstr ""
 
@@ -14569,129 +14980,129 @@ msgstr ""
 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:1046 include/functions.inc:1202
+#: include/functions.inc:1047 include/functions.inc:1203
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1047
+#: 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:1055
+#: include/functions.inc:1056
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1064
+#: include/functions.inc:1065
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1068 include/functions_setup.inc:254
+#: include/functions.inc:1069 include/functions_setup.inc:254
 msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1130
+#: include/functions.inc:1131
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1132
+#: include/functions.inc:1133
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1134
+#: 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:1384
+#: include/functions.inc:1385
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1412
+#: include/functions.inc:1413
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1686
+#: include/functions.inc:1687
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1729
+#: include/functions.inc:1730
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
@@ -14776,51 +15187,51 @@ msgstr ""
 msgid "Error while fetching source dn - aborted!"
 msgstr ""
 
-#: include/class_ldap.inc:557
+#: include/class_ldap.inc:558
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:707
+#: 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:776
+#: include/class_ldap.inc:777
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:778
+#: include/class_ldap.inc:779
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1000
+#: 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:1029
+#: 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:1157
+#: include/class_ldap.inc:1158
 #, php-format
 msgid "Ldap import with dn '%s' failed."
 msgstr ""
 
-#: include/class_tabs.inc:188
+#: include/class_tabs.inc:187
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:306
+#: include/class_tabs.inc:305
 msgid "References"
 msgstr ""
 
@@ -14903,6 +15314,30 @@ msgstr ""
 msgid "Restore snapshot with dn '%s' failed."
 msgstr ""
 
+#: 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 ""
@@ -14990,7 +15425,7 @@ msgstr ""
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:479
+#: include/class_config.inc:499
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -15154,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 ""
 
@@ -15176,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 "
@@ -15194,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 ""
 
@@ -15210,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 ""
 
@@ -15228,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 ""
 
@@ -15238,60 +15675,60 @@ 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 ""
@@ -15346,11 +15783,11 @@ msgid ""
 "and the unified JPEG format from PHP script."
 msgstr ""
 
-#: include/functions_setup.inc:412
+#: include/functions_setup.inc:412 setup/class_setupStep2.inc:147
 msgid "Checking for fping utility"
 msgstr ""
 
-#: include/functions_setup.inc:413
+#: 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."
@@ -15360,7 +15797,7 @@ msgstr ""
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr ""
 
-#: include/functions_setup.inc:429
+#: 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."
@@ -15370,7 +15807,7 @@ msgstr ""
 msgid "php.ini check -> session.auto_register"
 msgstr ""
 
-#: include/functions_setup.inc:443
+#: 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'."
@@ -15380,7 +15817,7 @@ msgstr ""
 msgid "php.ini check -> implicit_flush"
 msgstr ""
 
-#: include/functions_setup.inc:447
+#: include/functions_setup.inc:447 setup/class_setupStep2.inc:212
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -15390,7 +15827,7 @@ msgstr ""
 msgid "php.ini check -> max_execution_time"
 msgstr ""
 
-#: include/functions_setup.inc:455
+#: 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."
@@ -15410,7 +15847,7 @@ msgstr ""
 msgid "php.ini check -> expose_php"
 msgstr ""
 
-#: include/functions_setup.inc:468
+#: 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."
@@ -15455,18 +15892,18 @@ msgid ""
 "reachable for GOsa."
 msgstr ""
 
-#: include/functions_setup.inc:909
+#: 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:918
+#: include/functions_setup.inc:933
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr ""
 
-#: include/functions_setup.inc:1092
+#: include/functions_setup.inc:1112
 msgid ""
 "User and/or group could not be created, please check your configuration "
 "twice !"
@@ -15503,128 +15940,10 @@ 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:372
-msgid "Edit ACL"
-msgstr ""
-
-#: include/class_acl.inc:373
-msgid "Delete ACL"
-msgstr ""
-
-#: include/class_acl.inc:410
-msgid "No ACL settings for this category"
-msgstr ""
-
-#: include/class_acl.inc:412
-#, php-format
-msgid "Contains ACLs for these objects: %s"
-msgstr ""
-
-#: include/class_acl.inc:417
-msgid "Edit categories ACLs"
-msgstr ""
-
-#: include/class_acl.inc:418
-msgid "Clear categories ACLs"
-msgstr ""
-
-#: include/class_acl.inc:457
-#, php-format
-msgid "Edit ACL for '%s', scope is '%s'"
-msgstr ""
-
-#: include/class_acl.inc:467
-msgid "All objects in current subtree"
-msgstr ""
-
-#: include/class_acl.inc:557 include/class_acl.inc:564
-msgid "Show/Hide Advanced Settings"
-msgstr ""
-
-#: include/class_acl.inc:582
-msgid "Create objects"
-msgstr ""
-
-#: include/class_acl.inc:583
-msgid "Move objects"
-msgstr ""
-
-#: include/class_acl.inc:584
-msgid "Remove objects"
-msgstr ""
-
-#: include/class_acl.inc:586 include/class_acl.inc:592
-msgid "Modifyable by owner"
-msgstr ""
-
-#: include/class_acl.inc:589
-msgid "Move object"
-msgstr ""
-
-#: include/class_acl.inc:590
-msgid "Remove object"
-msgstr ""
-
-#: include/class_acl.inc:602
-msgid "Complete object"
-msgstr ""
-
-#: include/class_acl.inc:718
-#, php-format
-msgid "Unkown ACL type '%s'. Don't know how to handle it."
-msgstr ""
-
-#: include/class_acl.inc:758
-#, php-format
-msgid "Unknown entry '%s'!"
-msgstr ""
-
-#: include/class_acl.inc:819
-#, php-format
-msgid "Contains settings for these objects: %s"
-msgstr ""
-
-#: include/class_acl.inc:827
-msgid "Members:"
-msgstr ""
-
-#: include/class_acl.inc:833
-msgid "ACL is valid for all users"
-msgstr ""
-
-#: include/class_acl.inc:941
-#, php-format
-msgid "Saving ACLs with dn '%s' failed."
-msgstr ""
-
 #: include/class_debconfTemplate.inc:260
 msgid "This package has no debconf options."
 msgstr ""
@@ -15674,21 +15993,21 @@ msgid ""
 "Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:147
+#: include/class_CopyPasteHandler.inc:153
 #, php-format
 msgid "You are going to paste the cutted entry '%s'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:174
+#: include/class_CopyPasteHandler.inc:180
 #, php-format
 msgid "You are going to paste the copied entry '%s'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:238
+#: include/class_CopyPasteHandler.inc:244
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:240
+#: include/class_CopyPasteHandler.inc:246
 msgid "Can't paste"
 msgstr ""
 
@@ -15748,13 +16067,6 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
-#: html/setup.php:89
-#, 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:172
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
@@ -15784,11 +16096,11 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr ""
 
-#: html/index.php:49 html/index.php:337
+#: html/index.php:49 html/index.php:341
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:49 html/index.php:337
+#: html/index.php:49 html/index.php:341
 msgid "Enter SSL session"
 msgstr ""
 
@@ -15802,40 +16114,40 @@ 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:231
+#: html/index.php:235
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+#: 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:258
+#: html/index.php:262
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:260
+#: html/index.php:264
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:267
+#: html/index.php:271
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:291
+#: html/index.php:295
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:343
+#: html/index.php:347
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -16102,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 "
@@ -16117,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 "
@@ -16151,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 ""
 
@@ -16161,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 ""
 
@@ -16257,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 ""
@@ -16281,14 +16577,14 @@ 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 & paste wizard"
 msgstr ""
@@ -16396,3 +16692,559 @@ msgstr ""
 #: 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 ""