Some changes

[gosa.git] / locale / messages.po

diff --git a/locale/messages.po b/locale/messages.po
index 42ce329d281a40b568c95f7294760774bfb39923..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:1370 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: 2007-01-24 13:21+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:1012
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1019
 #: plugins/personal/password/class_password.inc:16
 #: plugins/personal/posix/class_posixAccount.inc:1326
 #: plugins/personal/samba/class_sambaAccount.inc:1072
-#: plugins/personal/generic/class_user.inc:1382
+#: 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
@@ -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:1377
+#: 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: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:871
+#: 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
@@ -109,8 +109,8 @@ msgstr ""
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/personal/mail/class_mailAccount.inc:1007
-#: 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:81
@@ -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"
@@ -218,7 +222,7 @@ msgstr ""
 #: contrib/gosa.conf:121 contrib/gosa.conf:137
 #: plugins/personal/environment/environment.tpl:235
 #: plugins/admin/systems/class_systemManagement.inc:1043
-#: plugins/admin/systems/class_printGeneric.inc:877
+#: plugins/admin/systems/class_printGeneric.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:353
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -343,10 +347,11 @@ msgid "{LOCATIONNAME}"
 msgstr ""
 
 #: contrib/gosa.conf:278 plugins/admin/ogroups/class_phonequeue.inc:263
+#: setup/class_setupStep1.inc:40
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:279 setup/class_setupStep1.inc:43
 msgid "Russian"
 msgstr ""
 
@@ -354,7 +359,7 @@ msgstr ""
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:281
+#: contrib/gosa.conf:281 setup/class_setupStep1.inc:41
 msgid "French"
 msgstr ""
 
@@ -362,7 +367,7 @@ msgstr ""
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:283
+#: contrib/gosa.conf:283 setup/class_setupStep1.inc:42
 msgid "English"
 msgstr ""
 
@@ -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
@@ -558,7 +563,7 @@ 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:684
@@ -605,8 +610,9 @@ msgstr ""
 #: plugins/admin/systems/class_goService.inc:34
 #: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/acl/class_aclManagement.inc:289
+#: 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
@@ -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 ""
 
@@ -647,7 +653,8 @@ msgstr ""
 #: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:349
-#: plugins/generic/references/class_reference.inc:44
+#: 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:1020
+#: 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 ""
 
@@ -723,7 +730,7 @@ 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
@@ -793,7 +800,7 @@ msgid "MB"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: 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:1038
+#: plugins/personal/mail/class_mailAccount.inc:1044
 msgid "Use custom sieve script"
 msgstr ""
 
@@ -842,7 +849,7 @@ msgstr ""
 #: plugins/admin/applications/class_applicationManagement.inc:346
 #: plugins/admin/systems/class_systemManagement.inc:678
 #: plugins/admin/ogroups/class_ogroupManagement.inc:295
-#: plugins/admin/acl/class_aclManagement.inc:280
+#: 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:1008
-#: 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:909
-#: plugins/personal/mail/class_mailAccount.inc:920
+#: plugins/personal/mail/class_mailAccount.inc:916
+#: plugins/personal/mail/class_mailAccount.inc:927
 msgid "You are not allowed to write mail alternate address."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:992
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:994
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1013
-msgid "Mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: 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/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:1019
-#: 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:1022
+#: plugins/personal/mail/class_mailAccount.inc:1028
 msgid "Add vacation information"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1031
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1026
+#: plugins/personal/mail/class_mailAccount.inc:1032
 msgid "Spam level"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1033
 msgid "Spam mail box"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1029
+#: plugins/personal/mail/class_mailAccount.inc:1035
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1030
+#: plugins/personal/mail/class_mailAccount.inc:1036
 msgid "Mail max size"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1032
-#: plugins/personal/mail/class_mailAccount.inc:1037
+#: plugins/personal/mail/class_mailAccount.inc:1038
+#: plugins/personal/mail/class_mailAccount.inc:1043
 msgid "Forwarding address"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1039
 msgid "Local delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1034
+#: plugins/personal/mail/class_mailAccount.inc:1040
 msgid "No delivery to own mailbox "
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1041
 msgid "Mail alternative addresses"
 msgstr ""
 
@@ -1214,7 +1218,6 @@ 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
@@ -1229,12 +1232,13 @@ msgstr ""
 #: 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:1388
+#: plugins/personal/generic/class_user.inc:1386
 msgid "User password"
 msgstr ""
 
@@ -1286,7 +1290,7 @@ msgid "Change password"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: 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:671
@@ -1294,7 +1298,7 @@ msgid "Home directory"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: 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 ""
 
@@ -1517,7 +1521,7 @@ msgstr ""
 #: 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:250
+#: plugins/personal/generic/class_user.inc:251
 msgid "January"
 msgstr ""
 
@@ -1526,7 +1530,7 @@ msgstr ""
 #: 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:250
+#: plugins/personal/generic/class_user.inc:251
 msgid "February"
 msgstr ""
 
@@ -1535,7 +1539,7 @@ msgstr ""
 #: 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:250
+#: plugins/personal/generic/class_user.inc:251
 msgid "March"
 msgstr ""
 
@@ -1544,7 +1548,7 @@ msgstr ""
 #: 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:250
+#: plugins/personal/generic/class_user.inc:251
 msgid "April"
 msgstr ""
 
@@ -1553,7 +1557,7 @@ msgstr ""
 #: 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:251
+#: plugins/personal/generic/class_user.inc:252
 msgid "May"
 msgstr ""
 
@@ -1562,7 +1566,7 @@ msgstr ""
 #: 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:251
+#: plugins/personal/generic/class_user.inc:252
 msgid "June"
 msgstr ""
 
@@ -1571,7 +1575,7 @@ msgstr ""
 #: 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:251
+#: plugins/personal/generic/class_user.inc:252
 msgid "July"
 msgstr ""
 
@@ -1580,7 +1584,7 @@ msgstr ""
 #: 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:251
+#: plugins/personal/generic/class_user.inc:252
 msgid "August"
 msgstr ""
 
@@ -1589,7 +1593,7 @@ msgstr ""
 #: 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:251
+#: plugins/personal/generic/class_user.inc:252
 msgid "September"
 msgstr ""
 
@@ -1598,7 +1602,7 @@ msgstr ""
 #: 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:252
+#: plugins/personal/generic/class_user.inc:253
 msgid "October"
 msgstr ""
 
@@ -1607,7 +1611,7 @@ msgstr ""
 #: 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:252
+#: plugins/personal/generic/class_user.inc:253
 msgid "November"
 msgstr ""
 
@@ -1616,14 +1620,14 @@ msgstr ""
 #: 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:252
+#: plugins/personal/generic/class_user.inc:253
 msgid "December"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:567
 #: plugins/personal/samba/class_sambaAccount.inc:494
 #: plugins/admin/systems/class_terminalGeneric.inc:104
-#: ihtml/themes/default/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91 setup/setup_step5.tpl:171
 msgid "disabled"
 msgstr ""
 
@@ -1720,46 +1724,42 @@ msgstr ""
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1327
-msgid "Posix Account"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: 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:1336
+#: plugins/personal/posix/class_posixAccount.inc:1335
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1337
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1339
+#: plugins/personal/posix/class_posixAccount.inc:1338
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1340
+#: plugins/personal/posix/class_posixAccount.inc:1339
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1341
+#: plugins/personal/posix/class_posixAccount.inc:1340
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1342
+#: plugins/personal/posix/class_posixAccount.inc:1341
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1343
+#: plugins/personal/posix/class_posixAccount.inc:1342
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1344
+#: plugins/personal/posix/class_posixAccount.inc:1343
 msgid "System trust model"
 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:1082
+#: 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:1097
+#: 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:1078
+#: 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:1079
+#: plugins/personal/samba/class_sambaAccount.inc:1078
 msgid "Inherit client config"
 msgstr ""
 
@@ -1878,17 +1878,17 @@ msgid "Reconnect if disconnected"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1083
+#: plugins/personal/samba/class_sambaAccount.inc:1082
 msgid "Lock samba account"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1089
+#: plugins/personal/samba/class_sambaAccount.inc:1088
 msgid "Limit Logon Time"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1090
+#: plugins/personal/samba/class_sambaAccount.inc:1089
 msgid "Limit Logoff Time"
 msgstr ""
 
@@ -1909,7 +1909,7 @@ msgid "Allow connection from these workstations only"
 msgstr ""
 
 #: plugins/personal/samba/main.inc:124
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1068 setup/setup_step6.tpl:12
 msgid "Samba settings"
 msgstr ""
 
@@ -2023,43 +2023,39 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1073
-msgid "Samba account"
-msgstr ""
-
-#: plugins/personal/samba/class_sambaAccount.inc:1081
+#: plugins/personal/samba/class_sambaAccount.inc:1080
 msgid "Allow user to change password"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1086
+#: plugins/personal/samba/class_sambaAccount.inc:1085
 msgid "Account expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1087
+#: plugins/personal/samba/class_sambaAccount.inc:1086
 msgid "Password expires"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1091
+#: plugins/personal/samba/class_sambaAccount.inc:1090
 msgid "Logon hours"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1093
+#: plugins/personal/samba/class_sambaAccount.inc:1092
 msgid "Generic home directory"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1094
+#: plugins/personal/samba/class_sambaAccount.inc:1093
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1095
+#: plugins/personal/samba/class_sambaAccount.inc:1094
 msgid "Generic script path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1096
+#: plugins/personal/samba/class_sambaAccount.inc:1095
 msgid "Generic profile path"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1098
+#: plugins/personal/samba/class_sambaAccount.inc:1097
 msgid "Allow connection from"
 msgstr ""
 
@@ -2113,6 +2109,8 @@ msgstr ""
 #: 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
@@ -2126,79 +2124,79 @@ msgstr ""
 #: 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
+#: ihtml/themes/default/acl.tpl:75 ihtml/themes/default/acl.tpl:89
 msgid "Apply"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:261
+#: plugins/personal/generic/class_user.inc:262
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:261
+#: plugins/personal/generic/class_user.inc:262
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:278
+#: plugins/personal/generic/class_user.inc:279
 msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:340
+#: 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:437
+#: plugins/personal/generic/class_user.inc:438
 msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:481
+#: 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:491
+#: 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:494
+#: plugins/personal/generic/class_user.inc:495
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:495
+#: plugins/personal/generic/class_user.inc:496
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:500
+#: plugins/personal/generic/class_user.inc:501
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:587
+#: 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:619
-#: plugins/personal/generic/class_user.inc:987
+#: 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:633
-#: plugins/personal/generic/class_user.inc:1004
+#: 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:689
+#: plugins/personal/generic/class_user.inc:690
 #, php-format
 msgid "You are not allowed to move this object to '%s'."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:940
+#: plugins/personal/generic/class_user.inc:935
 #, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1015
+#: plugins/personal/generic/class_user.inc:1010
 msgid "Can't add user to kerberos database."
 msgstr ""
 
@@ -2224,131 +2222,133 @@ msgstr ""
 msgid "The required field 'Login' is not set."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1092
+#: 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:1099
+#: 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:1102
+#: plugins/personal/generic/class_user.inc:1100
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1105
-#: plugins/personal/generic/class_user.inc:1130
+#: 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:1108
-#: plugins/personal/generic/class_user.inc:1127
+#: 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:1113
+#: 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:1116
+#: 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:1119
+#: 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:1122
+#: 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:1231
+#: plugins/personal/generic/class_user.inc:1229
 msgid "Could not open specified certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1360
 #: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1361
 #: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1362
 #: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1363
 #: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
+#: plugins/personal/generic/class_user.inc:1364
 #: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1367
+#: plugins/personal/generic/class_user.inc:1365
 #: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1366
 #: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1367
 #: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1371
+#: plugins/personal/generic/class_user.inc:1369
 #: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/generic/class_user.inc:1370
 #: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1373
+#: 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:1374
+#: 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:1378
+#: plugins/personal/generic/class_user.inc:1376
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1383
+#: 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
@@ -2358,7 +2358,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
+#: 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
@@ -2372,7 +2372,7 @@ 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
@@ -2382,7 +2382,7 @@ msgstr ""
 #: 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:881
+#: 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
@@ -2392,7 +2392,8 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl:26
 #: 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
@@ -2403,60 +2404,62 @@ msgstr ""
 #: plugins/gofon/conference/generic.tpl:49
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:684
 #: plugins/gofon/conference/class_divListConferences.inc:114
+#: setup/setup_step6.tpl:188 setup/setup_step6.tpl:210
+#: setup/setup_step4.tpl:35
 msgid "Base"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1389
+#: 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:1390
+#: 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:1391
+#: plugins/personal/generic/class_user.inc:1389
 #: plugins/addons/addressbook/class_addressbook.inc:798
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1392
+#: 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:1393
+#: plugins/personal/generic/class_user.inc:1391
 #: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1394
+#: 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:1395
+#: 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:1396
+#: plugins/personal/generic/class_user.inc:1394
 #: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1397
+#: 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:1398
+#: 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
@@ -2471,92 +2474,92 @@ msgstr ""
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1397
 #: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1400
+#: plugins/personal/generic/class_user.inc:1398
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/generic/class_user.inc:1399
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
+#: plugins/personal/generic/class_user.inc:1400
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1401
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
+#: plugins/personal/generic/class_user.inc:1402
 #: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
+#: 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:534
-#: plugins/admin/systems/class_printGeneric.inc:883
+#: 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:1406
+#: 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:1407
+#: plugins/personal/generic/class_user.inc:1405
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
+#: plugins/personal/generic/class_user.inc:1406
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
+#: plugins/personal/generic/class_user.inc:1407
 #: plugins/addons/addressbook/class_addressbook.inc:794
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1410
+#: plugins/personal/generic/class_user.inc:1408
 #: plugins/addons/addressbook/class_addressbook.inc:796
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
-#: 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:1412
+#: plugins/personal/generic/class_user.inc:1410
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
+#: 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:1415
+#: plugins/personal/generic/class_user.inc:1413
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 #: plugins/addons/addressbook/class_addressbook.inc:795
 msgid "Fax number"
@@ -2632,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 ""
@@ -2645,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 ""
@@ -2730,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
@@ -2783,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
@@ -2826,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 ""
 
@@ -2882,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 ""
 
@@ -2895,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 ""
 
@@ -2931,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 ""
 
@@ -2959,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 ""
 
@@ -2991,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 ""
 
@@ -3068,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 ""
 
@@ -3096,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 ""
@@ -3148,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 ""
 
@@ -3210,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!"
@@ -3261,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 ""
 
@@ -3338,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 ""
 
@@ -3367,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 ""
 
@@ -3392,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
@@ -3415,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 ""
 
@@ -3445,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 ""
@@ -3506,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 ""
 
@@ -3515,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 ""
 
@@ -3524,19 +3514,19 @@ 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/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
@@ -3568,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 ""
 
@@ -3797,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 ""
@@ -3872,14 +3860,14 @@ 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:372
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:882
+#: 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
@@ -3887,6 +3875,7 @@ msgstr ""
 #: plugins/admin/systems/class_goShareServer.inc:372
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/class_ogroup.inc:706
+#: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:940
 #: plugins/admin/fai/faiVariable.tpl:21
 #: plugins/admin/fai/class_faiScript.inc:539
 #: plugins/admin/fai/class_faiTemplate.inc:509
@@ -4027,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 ""
 
@@ -4144,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 ""
 
@@ -4181,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 ""
 
@@ -4238,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 ""
 
@@ -4258,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 ""
 
@@ -4397,7 +4378,7 @@ msgstr ""
 #: plugins/admin/applications/class_applicationGeneric.inc:536
 #: plugins/admin/systems/class_terminalGeneric.inc:555
 #: plugins/admin/systems/class_servGeneric.inc:371
-#: plugins/admin/systems/class_printGeneric.inc:880
+#: 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
@@ -4421,8 +4402,8 @@ 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:704
-#: plugins/admin/fai/faiVariable.tpl:9
+#: 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
@@ -4547,7 +4528,7 @@ msgstr ""
 #: plugins/admin/systems/class_glpiSelectUser.inc:184
 #: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:151
-#: plugins/admin/acl/class_divListACL.inc: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
@@ -4566,7 +4547,7 @@ msgstr ""
 #: plugins/admin/systems/class_baseSelectDialog.inc:33
 #: 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
@@ -4587,7 +4568,10 @@ msgstr ""
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/systems/class_divListSystem.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:196
-#: plugins/admin/acl/class_divListACL.inc:127
+#: 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
@@ -4617,7 +4601,10 @@ msgstr ""
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
 #: plugins/admin/systems/class_divListSystem.inc:273
 #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/acl/class_divListACL.inc:131
+#: 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
@@ -4643,7 +4630,7 @@ msgstr ""
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
 #: plugins/admin/ogroups/phonequeue.tpl:62
 #: plugins/admin/ogroups/class_phonequeue.inc:936 html/getxls.php:86
-#: html/getxls.php:281
+#: html/getxls.php:281 setup/setup_step1.tpl:7
 msgid "Language"
 msgstr ""
 
@@ -4877,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:859
+#: plugins/admin/systems/class_printGeneric.inc:860
 #: plugins/admin/ogroups/class_ogroupManagement.inc:345
-#: plugins/admin/fai/faiTemplateEntry.tpl:110
+#: plugins/admin/fai/faiTemplateEntry.tpl:110 setup/setup_step6.tpl:198
+#: setup/setup_step6.tpl:220
 msgid "User"
 msgstr ""
 
@@ -5175,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 ""
 
@@ -5876,6 +5865,7 @@ msgstr ""
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/admin/acl/class_aclRole.inc:337
 #: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
 #: include/class_MultiSelectWindow.inc:194
 #: include/class_MultiSelectWindow.inc:196
@@ -5985,7 +5975,7 @@ msgstr ""
 #: 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
@@ -6243,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 ""
 
@@ -6267,8 +6257,10 @@ msgstr ""
 msgid "Available applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:598
-#: include/class_acl.inc:689
+#: 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 ""
 
@@ -6284,71 +6276,81 @@ msgstr ""
 msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:599
-#: include/class_acl.inc:691
+#: 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
+#: plugins/admin/groups/class_groupMail.inc:293
+#: plugins/admin/users/class_userManagement.inc:449
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroup.inc:291
+msgid "none"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:331
 msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:352
+#: plugins/admin/groups/class_groupMail.inc:353
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:353
+#: 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:412
+#: plugins/admin/groups/class_groupMail.inc:413
 msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:413
+#: 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:886
+#: plugins/admin/systems/class_printGeneric.inc:887
 msgid "Permissions"
 msgstr ""
 
@@ -6413,9 +6415,9 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:426
-#: plugins/admin/acl/class_aclManagement.inc:423
-#: plugins/admin/acl/class_aclManagement.inc:424
-#: plugins/admin/acl/class_aclManagement.inc:429 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 ""
 
@@ -6618,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 ""
@@ -6626,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 ""
@@ -6634,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 ""
@@ -6642,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 ""
@@ -6700,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:291
-msgid "none"
-msgstr ""
-
 #: plugins/admin/users/class_userManagement.inc:468
 msgid "Please select a valid template."
 msgstr ""
@@ -7185,7 +7184,7 @@ 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 ""
 
@@ -7219,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 ""
 
@@ -7296,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:556
-#: include/class_acl.inc:563 include/class_acl.inc:570
-#: include/class_acl.inc:576 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
@@ -7325,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 ""
@@ -7342,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 ""
 
@@ -7420,7 +7423,7 @@ msgstr ""
 #: plugins/admin/systems/network.tpl:77
 #: plugins/admin/systems/class_servDNS.inc:168
 #: plugins/admin/systems/class_servDNS.inc:406
-#: plugins/admin/systems/class_termDNS.inc:547
+#: plugins/admin/systems/class_termDNS.inc:571
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -7658,49 +7661,49 @@ 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_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:533
 msgid "Workstation name"
@@ -8674,7 +8677,7 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:398
-#: plugins/admin/systems/class_termDNS.inc:546
+#: plugins/admin/systems/class_termDNS.inc:570
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr ""
@@ -8948,37 +8951,37 @@ 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:831
+#: 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:854
-#: plugins/admin/systems/class_printGeneric.inc:856
+#: 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
@@ -8986,43 +8989,43 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:872
+#: plugins/admin/systems/class_printGeneric.inc:873
 msgid "Print generic"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:884
+#: plugins/admin/systems/class_printGeneric.inc:885
 msgid "LabeledURL"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:886
 msgid "Printer PPD"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: 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:919
+#: 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:924
+#: 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:959
+#: 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:970
+#: plugins/admin/systems/class_printGeneric.inc:971
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
 msgstr ""
@@ -10305,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 ""
 
@@ -10315,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 ""
 
@@ -10410,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 ""
 
@@ -10771,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 ""
 
@@ -10928,6 +10944,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: 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 ""
@@ -11209,12 +11226,10 @@ msgid "Ldap Server"
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystem.inc:264
-#: plugins/admin/acl/class_divListACL.inc:128
 msgid "Edit system"
 msgstr ""
 
 #: plugins/admin/systems/class_divListSystem.inc:273
-#: plugins/admin/acl/class_divListACL.inc:132
 msgid "Delete system"
 msgstr ""
 
@@ -11739,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 ""
 
@@ -12747,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:424
-#: plugins/admin/acl/class_aclManagement.inc:429
-msgid "Access control list"
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:432
-msgid "I don't know Jack"
-msgstr ""
-
 #: plugins/admin/acl/class_divListACL.inc:31
 msgid "List of acl"
 msgstr ""
@@ -12791,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
@@ -15022,12 +15226,12 @@ msgstr ""
 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 ""
 
@@ -15110,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 ""
@@ -15361,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 ""
 
@@ -15383,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 "
@@ -15401,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 ""
 
@@ -15417,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 ""
 
@@ -15435,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 ""
 
@@ -15445,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 ""
@@ -15553,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."
@@ -15567,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."
@@ -15577,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'."
@@ -15587,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."
@@ -15597,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."
@@ -15617,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."
@@ -15710,203 +15940,85 @@ msgstr ""
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:145
-msgid "All categories"
-msgstr ""
-
-#: include/class_acl.inc:153
-msgid "Reset ACLs"
+#: include/class_acl.inc:158 include/class_acl.inc:161
+msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:154
-msgid "One level"
+#: include/class_debconfTemplate.inc:260
+msgid "This package has no debconf options."
 msgstr ""
 
-#: include/class_acl.inc:155 include/class_acl.inc:160
-msgid "Current object"
+#: include/class_MultiSelectWindow.inc:458
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
 
-#: include/class_acl.inc:156
-msgid "Complete subtree"
+#: include/class_MultiSelectWindow.inc:567
+msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
-#: include/class_acl.inc:157
-msgid "Complete subtree (permanent)"
+#: include/class_MultiSelectWindow.inc:568
+msgid "Restore"
 msgstr ""
 
-#: include/class_acl.inc:161
-msgid "Use ACL defined in role"
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
+msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_acl.inc:372
-msgid "Edit ACL"
+#: include/class_MultiSelectWindow.inc:592
+msgid "Create snapshot"
 msgstr ""
 
-#: include/class_acl.inc:373
-msgid "Delete ACL"
+#: include/class_MultiSelectWindow.inc:592
+msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_acl.inc:410
-msgid "No ACL settings for this category"
+#: include/functions_dns.inc:166
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
 msgstr ""
 
-#: include/class_acl.inc:412
+#: include/functions_dns.inc:171
 #, php-format
-msgid "Contains ACLs for these objects: %s"
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
 msgstr ""
 
-#: include/class_acl.inc:417
-msgid "Edit categories ACLs"
+#: include/functions_dns.inc:607
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
 msgstr ""
 
-#: include/class_acl.inc:418
-msgid "Clear categories ACLs"
+#: include/class_CopyPasteHandler.inc:153
+#, php-format
+msgid "You are going to paste the cutted entry '%s'."
 msgstr ""
 
-#: include/class_acl.inc:457
+#: include/class_CopyPasteHandler.inc:180
 #, php-format
-msgid "Edit ACL for '%s', scope is '%s'"
+msgid "You are going to paste the copied entry '%s'."
 msgstr ""
 
-#: include/class_acl.inc:467
-msgid "All objects in current subtree"
+#: include/class_CopyPasteHandler.inc:244
+msgid "Paste"
 msgstr ""
 
-#: include/class_acl.inc:558 include/class_acl.inc:565
-msgid "Show/Hide Advanced Settings"
+#: include/class_CopyPasteHandler.inc:246
+msgid "Can't paste"
 msgstr ""
 
-#: include/class_acl.inc:583
-msgid "Create objects"
+#: include/functions_FAI.inc:361
+#, php-format
+msgid "Error, following objects should be equal '%s' and '%s'"
 msgstr ""
 
-#: include/class_acl.inc:584
-msgid "Move objects"
-msgstr ""
-
-#: include/class_acl.inc:585
-msgid "Remove objects"
-msgstr ""
-
-#: include/class_acl.inc:587 include/class_acl.inc:593
-msgid "Modifyable by owner"
-msgstr ""
-
-#: include/class_acl.inc:590
-msgid "Move object"
-msgstr ""
-
-#: include/class_acl.inc:591
-msgid "Remove object"
-msgstr ""
-
-#: include/class_acl.inc:603
-msgid "Complete object"
-msgstr ""
-
-#: include/class_acl.inc:719
-#, php-format
-msgid "Unkown ACL type '%s'. Don't know how to handle it."
-msgstr ""
-
-#: include/class_acl.inc:759
-#, php-format
-msgid "Unknown entry '%s'!"
-msgstr ""
-
-#: include/class_acl.inc:820
-#, php-format
-msgid "Contains settings for these objects: %s"
-msgstr ""
-
-#: include/class_acl.inc:828
-msgid "Members:"
-msgstr ""
-
-#: include/class_acl.inc:834
-msgid "ACL is valid for all users"
-msgstr ""
-
-#: include/class_acl.inc:942
-#, php-format
-msgid "Saving ACLs with dn '%s' failed."
-msgstr ""
-
-#: include/class_debconfTemplate.inc:260
-msgid "This package has no debconf options."
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:458
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:567
-msgid "Restore snapshopts of already deleted objects"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:568
-msgid "Restore"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:586
-#: include/class_SnapShotDialog.inc:113
-msgid "Restore snapshot"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:592
-msgid "Create snapshot"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:592
-msgid "Create a new snapshot from this object"
-msgstr ""
-
-#: include/functions_dns.inc:166
-#, php-format
-msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
-msgstr ""
-
-#: include/functions_dns.inc:171
-#, php-format
-msgid ""
-"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
-"zone."
-msgstr ""
-
-#: include/functions_dns.inc:607
-#, php-format
-msgid ""
-"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:147
-#, php-format
-msgid "You are going to paste the cutted entry '%s'."
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:174
-#, php-format
-msgid "You are going to paste the copied entry '%s'."
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:238
-msgid "Paste"
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:240
-msgid "Can't paste"
-msgstr ""
-
-#: include/functions_FAI.inc:361
-#, php-format
-msgid "Error, following objects should be equal '%s' and '%s'"
-msgstr ""
-
-#: include/functions_FAI.inc:468
-#, php-format
-msgid "Release management failed, can't save '%s'"
+#: include/functions_FAI.inc:468
+#, php-format
+msgid "Release management failed, can't save '%s'"
 msgstr ""
 
 #: include/class_SnapShotDialog.inc:63
@@ -15955,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 "
@@ -16309,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 "
@@ -16324,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 "
@@ -16358,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 ""
 
@@ -16368,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 ""
 
@@ -16464,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 ""
@@ -16488,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 ""
@@ -16603,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 ""