Added Translation Strings.

[gosa.git] / locale / ru / LC_MESSAGES / messages.po

diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 667bc731dfdeef3dd60cbba390890b9922e5fc9a..3072447f9f212a1253a12ce94876117aa69960d6 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -1,13 +1,13 @@
 # Translation of messages.po to Russian
 # Valia V. Vaneeva <fattie@altlinux.ru>, 2004.
 # $Id: messages.po,v 1.61 2005/04/18 10:37:13 migor-guest Exp $
-#: 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
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\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: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\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
@@ -54,19 +54,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
@@ -107,8 +107,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
@@ -135,7 +135,11 @@ msgstr "Samba"
 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 "Подключение"
@@ -149,7 +153,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"
@@ -217,7 +221,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"
@@ -350,10 +354,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 "Русский"
 
@@ -361,7 +366,7 @@ msgstr "Русский"
 msgid "Spanish"
 msgstr "Испанский"
 
-#: contrib/gosa.conf:281
+#: contrib/gosa.conf:281 setup/class_setupStep1.inc:41
 msgid "French"
 msgstr "Французский"
 
@@ -369,7 +374,7 @@ msgstr "Французский"
 msgid "Dutch"
 msgstr "Датский"
 
-#: contrib/gosa.conf:283
+#: contrib/gosa.conf:283 setup/class_setupStep1.inc:42
 msgid "English"
 msgstr "Английский"
 
@@ -476,7 +481,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
@@ -499,8 +504,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
@@ -567,7 +572,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
@@ -614,8 +619,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
@@ -636,10 +642,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 "Отмена"
 
@@ -656,7 +662,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 "Сервер"
 
@@ -670,14 +677,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 "Размер квоты"
 
@@ -733,7 +740,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
@@ -805,7 +812,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 "Сообщение автоответчика"
 
@@ -836,7 +843,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 "Использовать другой сценарий SIEVE"
 
@@ -856,7 +863,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
@@ -905,8 +912,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
 #, fuzzy
 msgid "Mail settings"
 msgstr "Почтовые настройки пользователя"
@@ -948,7 +955,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
@@ -971,7 +979,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 "Удалить настройки эл. почты"
@@ -983,7 +991,7 @@ 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."
@@ -992,13 +1000,13 @@ 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."
@@ -1014,14 +1022,14 @@ 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."
@@ -1030,94 +1038,89 @@ 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy
 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
 #, fuzzy
 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
-#, fuzzy
-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
@@ -1125,58 +1128,58 @@ msgstr "Моя учетная запись"
 msgid "Mail address"
 msgstr "MAC-адрес"
 
-#: 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
 #, fuzzy
 msgid "Mail server"
 msgstr "Сервер"
 
-#: plugins/personal/mail/class_mailAccount.inc:1022
+#: plugins/personal/mail/class_mailAccount.inc:1028
 #, fuzzy
 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
 #, fuzzy
 msgid "Spam level"
 msgstr "Уровень информативности"
 
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1033
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Размер квоты"
 
-#: plugins/personal/mail/class_mailAccount.inc:1029
+#: plugins/personal/mail/class_mailAccount.inc:1035
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Отклонять сообщения размером больше"
 
-#: plugins/personal/mail/class_mailAccount.inc:1030
+#: plugins/personal/mail/class_mailAccount.inc:1036
 #, fuzzy
 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
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Основной адрес"
 
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1039
 #, fuzzy
 msgid "Local delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/mail/class_mailAccount.inc:1034
+#: plugins/personal/mail/class_mailAccount.inc:1040
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Не оставлять копии в своем почтовом ящике"
 
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1041
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Альтернативные адреса"
@@ -1261,7 +1264,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
@@ -1276,12 +1278,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
 #, fuzzy
 msgid "User password"
 msgstr "Новый пароль"
@@ -1336,7 +1339,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
@@ -1344,7 +1347,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 "Оболочка"
 
@@ -1353,12 +1356,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 "Состояние"
 
@@ -1584,7 +1587,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 "Январь"
 
@@ -1593,7 +1596,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 "Февраль"
 
@@ -1602,7 +1605,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 "Март"
 
@@ -1611,7 +1614,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 "Апрель"
 
@@ -1620,7 +1623,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 "Май"
 
@@ -1629,7 +1632,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 "Июнь"
 
@@ -1638,7 +1641,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 "Июль"
 
@@ -1647,7 +1650,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 "Август"
 
@@ -1656,7 +1659,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 "Сентябрь"
 
@@ -1665,7 +1668,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 "Октябрь"
 
@@ -1674,7 +1677,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 "Ноябрь"
 
@@ -1683,14 +1686,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 "отключен"
 
@@ -1793,54 +1796,49 @@ msgstr "Слишком много пользователей, невозможн
 msgid "POSIX account"
 msgstr "Аккаунт FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1327
-#, fuzzy
-msgid "Posix Account"
-msgstr "Аккаунт Proxy"
-
-#: 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
 #, fuzzy
 msgid "Group ID"
 msgstr "Группа"
 
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1337
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Сменить пароль"
 
-#: plugins/personal/posix/class_posixAccount.inc:1339
+#: plugins/personal/posix/class_posixAccount.inc:1338
 #, fuzzy
 msgid "Shadow min"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1340
+#: plugins/personal/posix/class_posixAccount.inc:1339
 #, fuzzy
 msgid "Shadow max"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1341
+#: plugins/personal/posix/class_posixAccount.inc:1340
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1342
+#: plugins/personal/posix/class_posixAccount.inc:1341
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1343
+#: plugins/personal/posix/class_posixAccount.inc:1342
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Показать людей"
 
-#: plugins/personal/posix/class_posixAccount.inc:1344
+#: plugins/personal/posix/class_posixAccount.inc:1343
 #, fuzzy
 msgid "System trust model"
 msgstr "Системные доверия"
@@ -1873,7 +1871,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 "Не спрашивать пароль при входе в систему из Windows"
 
@@ -1882,7 +1880,7 @@ msgid "Temporary disable samba account"
 msgstr "Временно отключить учетную запись Samba"
 
 #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1097
+#: plugins/personal/samba/class_sambaAccount.inc:1096
 msgid "Domain"
 msgstr "Домен"
 
@@ -1891,12 +1889,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 "Унаследовать конфигурацию клиента"
 
@@ -1961,18 +1959,18 @@ 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
 #, fuzzy
 msgid "Lock samba account"
 msgstr "Удалить учетную запись Samba"
 
 #: 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 ""
 
@@ -1995,7 +1993,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 "Настройки Samba"
 
@@ -2121,51 +2119,46 @@ msgstr ""
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Моя учетная запись"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1073
-#, fuzzy
-msgid "Samba account"
-msgstr "Удалить учетную запись Samba"
-
-#: plugins/personal/samba/class_sambaAccount.inc:1081
+#: plugins/personal/samba/class_sambaAccount.inc:1080
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1086
+#: plugins/personal/samba/class_sambaAccount.inc:1085
 #, fuzzy
 msgid "Account expires"
 msgstr "Учетная запись"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1087
+#: plugins/personal/samba/class_sambaAccount.inc:1086
 #, fuzzy
 msgid "Password expires"
 msgstr "Срок действия пароля истекает"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1091
+#: plugins/personal/samba/class_sambaAccount.inc:1090
 #, fuzzy
 msgid "Logon hours"
 msgstr "один час"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1093
+#: plugins/personal/samba/class_sambaAccount.inc:1092
 #, fuzzy
 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
 #, fuzzy
 msgid "Generic script path"
 msgstr "Путь к сценариям"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1096
+#: plugins/personal/samba/class_sambaAccount.inc:1095
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Путь к профилю"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1098
+#: plugins/personal/samba/class_sambaAccount.inc:1097
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Разрешить подключения только от этой рабочей станции"
@@ -2228,6 +2221,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
@@ -2241,82 +2236,82 @@ 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 "Для этой учетной записи нет корректных расширений GOsa."
 
-#: 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 ""
 "Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
 "прервана."
 
-#: 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
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/class_user.inc:587
+#: plugins/personal/generic/class_user.inc:588
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Удалить учетную запись POSIX"
 
-#: 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 "Ошибка соединения с базой данных Kerberos"
 
-#: 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 "Не удается удалить пользователя из базы данных Kerberos."
 
-#: plugins/personal/generic/class_user.inc:689
+#: plugins/personal/generic/class_user.inc:690
 #, fuzzy, 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
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Аккаунт Proxy"
 
-#: plugins/personal/generic/class_user.inc:1015
+#: plugins/personal/generic/class_user.inc:1010
 msgid "Can't add user to kerberos database."
 msgstr "Не удается добавить пользователя в базу данных Kerberos."
 
@@ -2343,7 +2338,7 @@ 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."
@@ -2351,7 +2346,7 @@ 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."
@@ -2359,121 +2354,123 @@ 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 "Значение поля \"Домашняя страница\" содержит некорректный URL."
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
@@ -2483,7 +2480,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
@@ -2497,7 +2494,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
@@ -2507,7 +2504,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
@@ -2517,7 +2514,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
@@ -2528,63 +2526,65 @@ 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
@@ -2599,95 +2599,95 @@ 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
 #, fuzzy
 msgid "Gender"
 msgstr "Отправитель"
 
-#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/generic/class_user.inc:1399
 #, fuzzy
 msgid "Preferred language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1402
+#: plugins/personal/generic/class_user.inc:1400
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1401
 #, fuzzy
 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
 #, fuzzy
 msgid "User picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/class_user.inc:1408
+#: plugins/personal/generic/class_user.inc:1406
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Pager number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:1410
 #, fuzzy
 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
@@ -2695,7 +2695,7 @@ msgstr "Стандартный сертификат"
 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
 #, fuzzy
@@ -2776,8 +2776,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
 #, fuzzy
 msgid "Select a base"
@@ -2790,7 +2790,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 "Адрес"
@@ -2878,7 +2878,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
@@ -2931,7 +2931,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
@@ -2977,7 +2977,6 @@ msgid "Set new password"
 msgstr "Изменить пароль"
 
 #: plugins/personal/connectivity/pureftpd.tpl:4
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
 msgid "FTP account"
 msgstr "Аккаунт FTP"
 
@@ -3033,7 +3032,6 @@ msgstr "Временно отключить доступ к FTP"
 
 #: plugins/personal/connectivity/proxy.tpl:23
 #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_proxyAccount.inc:297
 msgid "Proxy account"
 msgstr "Аккаунт Proxy"
 
@@ -3048,7 +3046,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 "Ограничить квотой использование прокси"
 
@@ -3085,7 +3083,7 @@ msgstr "Настройки Samba"
 #: 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
@@ -3093,18 +3091,12 @@ msgstr "Настройки Samba"
 msgid "Connectivity addon"
 msgstr "Подключение"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:148
-#, fuzzy
-msgid "PHPgroupware"
-msgstr "PHPGroupware"
-
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Учетная запись Groupware"
 
 #: plugins/personal/connectivity/kolab.tpl:3
 #: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/personal/connectivity/class_kolabAccount.inc:452
 #, fuzzy
 msgid "Kolab account"
 msgstr "Моя учетная запись"
@@ -3116,7 +3108,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
 #, fuzzy
 msgid "Delegations"
 msgstr "Назначение"
@@ -3152,7 +3144,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 ""
 
@@ -3237,16 +3229,16 @@ 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
 #, fuzzy
 msgid "Mail size restriction"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
 #, fuzzy
 msgid "Free busy information"
 msgstr "Общая информация о пользователе"
@@ -3267,7 +3259,6 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Учетная запись WebDAV"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:142
-#: plugins/personal/connectivity/class_webdavAccount.inc:147
 #: plugins/personal/connectivity/webdav.tpl:3
 msgid "WebDAV account"
 msgstr "Учетная запись WebDAV"
@@ -3325,32 +3316,32 @@ msgstr "Тип"
 msgid "Pure ftp account"
 msgstr "Создать настройки факса"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
 #, fuzzy
 msgid "Quota files"
 msgstr "Размер квоты"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
 #, fuzzy
 msgid "Upload ratio"
 msgstr "Загрузка процессора"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
 #, fuzzy
 msgid "Quota MBytes"
 msgstr "Размер квоты"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
 #, fuzzy
 msgid "Download ratio"
 msgstr "Системная информация"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
 #, fuzzy
 msgid "Upload bandwith"
 msgstr "Пропускная способность (на сервер)"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
 #, fuzzy
 msgid "Download bandwith"
 msgstr "Пропускная способность (с сервера)"
@@ -3396,6 +3387,13 @@ 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
+#, fuzzy
+msgid "Openexchange"
+msgstr "Удалить телефонный аккаунт"
+
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:717
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:824
 #, fuzzy
@@ -3451,25 +3449,19 @@ msgstr "Удалить телефонный аккаунт"
 msgid "Open xchange account settings"
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
-#, fuzzy
-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
 #, fuzzy
 msgid "Intranet account"
 msgstr "Создать телефонный аккаунт"
@@ -3531,18 +3523,17 @@ msgstr "Значение поля \"Квота\" некорректно."
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Аккаунт Proxy"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "PPTP account"
 msgstr "Аккаунт FTP"
@@ -3562,7 +3553,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
 #, fuzzy
 msgid "Intranet account settings"
 msgstr "Создать телефонный аккаунт"
@@ -3589,25 +3580,24 @@ msgstr "Аккаунт FTP"
 
 #: plugins/personal/connectivity/opengw.tpl:1
 #: plugins/personal/connectivity/class_opengwAccount.inc:309
-#: plugins/personal/connectivity/class_opengwAccount.inc:315
 #, fuzzy
 msgid "Opengroupware"
 msgstr "Учетная запись Groupware"
 
 #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:319
 #, fuzzy
 msgid "Location team"
 msgstr "Местоположение"
 
 #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
 #, fuzzy
 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
@@ -3615,7 +3605,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 ""
 
@@ -3649,11 +3639,6 @@ msgstr "Учетная запись Groupware"
 msgid "PHP Schedule it settings"
 msgstr "Учетная запись Groupware"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
-#, fuzzy
-msgid "PHP schedule it"
-msgstr "Учетная запись Groupware"
-
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
 msgid "Opengroupware account"
@@ -3719,7 +3704,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 ""
 
@@ -3729,7 +3714,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 ""
 
@@ -3739,19 +3724,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
@@ -3788,7 +3773,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
 #, fuzzy
 msgid "Hotplug devices"
 msgstr "Дисковод"
@@ -4056,32 +4041,30 @@ 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Profile quota"
 msgstr "Путь к профилю"
 
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1286
 #, fuzzy
 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 ""
@@ -4142,14 +4125,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
@@ -4157,6 +4140,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
@@ -4308,43 +4292,43 @@ msgid "Nagios Account"
 msgstr "Контакт"
 
 #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
 #, fuzzy
 msgid "Alias"
 msgstr "женский"
 
 #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:277
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Host notification commands"
 msgstr "Параметры приложения"
@@ -4449,41 +4433,36 @@ msgstr "Удалить настройки эл. почты"
 msgid "Nagios account settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:265
-#, fuzzy
-msgid "Nagios account"
-msgstr "Контакт"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:282
 #, fuzzy
 msgid "View all hosts"
 msgstr "Предоставлять службу сканирования"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:284
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
 #, fuzzy
 msgid "View all services"
 msgstr "Предоставлять службу сканирования"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:285
 #, fuzzy
 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
 #, fuzzy
 msgid "Trigger all service commands"
 msgstr "Предоставлять службу сканирования"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:289
 #, fuzzy
 msgid "View configuration information"
 msgstr "Информация об организации"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:291
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
 #, fuzzy
 msgid "View system informations"
 msgstr "Системная информация"
@@ -4494,7 +4473,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
 #, fuzzy
 msgid "Share"
 msgstr "сброс"
@@ -4563,12 +4542,7 @@ msgstr "Создать телефонный аккаунт"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/netatalk/class_netatalk.inc:360
-#, fuzzy
-msgid "Netatalk account"
-msgstr "Создать телефонный аккаунт"
-
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:364
 #, fuzzy
 msgid "User home path"
 msgstr "Домашний телефон"
@@ -4585,7 +4559,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 "Выберите ветку для группы"
 
@@ -4730,7 +4704,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
@@ -4754,8 +4728,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
@@ -4890,7 +4864,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
@@ -4910,7 +4884,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
@@ -4931,7 +4905,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
@@ -4963,7 +4940,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
@@ -4991,7 +4971,7 @@ msgstr "Номер факса, для которого сработает GOfax"
 #: 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 "Язык"
 
@@ -5239,14 +5219,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 "Пользователь"
 
@@ -5555,7 +5537,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 "Страна"
 
@@ -6338,6 +6320,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
@@ -6460,7 +6443,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
@@ -6741,7 +6724,7 @@ msgstr "Группа Samba"
 msgid "Samba domain name"
 msgstr "Домашний каталог Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:898 setup/setup_step6.tpl:18
 #, fuzzy
 msgid "Samba SID"
 msgstr "Samba"
@@ -6769,8 +6752,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 "чтение"
 
@@ -6786,76 +6771,86 @@ 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 "Для этого DN нет корректных почтовых расширений."
 
-#: plugins/admin/groups/class_groupMail.inc:352
+#: plugins/admin/groups/class_groupMail.inc:353
 #, fuzzy
 msgid ""
 "Remove shared folder from mail server database when entry gets removed in "
 "LDAP"
 msgstr "Не удается удалить пользователя из базы данных Kerberos."
 
-#: 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
 #, fuzzy, 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
 #, fuzzy, 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
 #, fuzzy
 msgid "Please select a valid mail server."
 msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/groups/class_groupMail.inc:1074
+#: plugins/admin/groups/class_groupMail.inc:1089
 #, fuzzy
 msgid "Group mail"
 msgstr "Группа"
 
-#: plugins/admin/groups/class_groupMail.inc:1082
+#: plugins/admin/groups/class_groupMail.inc:1097
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Альтернативные адреса"
 
-#: plugins/admin/groups/class_groupMail.inc:1083
+#: plugins/admin/groups/class_groupMail.inc:1098
 #, fuzzy
 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
 #, fuzzy
 msgid "Permissions"
 msgstr "Права для членов группы"
@@ -6926,9 +6921,9 @@ 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 "Доступ"
 
@@ -7152,6 +7147,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
 #, fuzzy
 msgid "cut"
@@ -7161,6 +7157,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
 #, fuzzy
 msgid "Cut this entry"
@@ -7170,6 +7167,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 ""
@@ -7178,6 +7176,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
 #, fuzzy
 msgid "Copy this entry"
@@ -7248,13 +7247,6 @@ msgstr "Вы собираетесь удалить пользователя %s."
 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
 #, fuzzy
 msgid "Please select a valid template."
@@ -7790,7 +7782,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 "Категория"
 
@@ -7824,7 +7816,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
 #, fuzzy
 msgid "Administrative settings"
 msgstr "Администрирование"
@@ -7910,27 +7902,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
@@ -7939,7 +7935,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
 #, fuzzy
 msgid "Department name"
@@ -7957,7 +7953,7 @@ msgstr "Вы собираетесь удалить целую ветку LDAP с
 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 ""
 
@@ -8044,7 +8040,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 ""
@@ -8287,54 +8283,54 @@ 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
 #, fuzzy
 msgid "This 'dn' has no network features."
 msgstr "Этот DN не имеет свойств принтера."
 
-#: 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
 #, fuzzy
 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 "В выбранной вами ветке уже есть запись \"%s\""
 
-#: 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
 #, fuzzy
 msgid "Win generic"
 msgstr "Служба печати"
 
-#: plugins/admin/systems/class_winGeneric.inc:272
+#: plugins/admin/systems/class_winGeneric.inc:273
 #, fuzzy
 msgid "Windows workstation generic"
 msgstr "Имя рабочий станции"
 
-#: plugins/admin/systems/class_winGeneric.inc:277
+#: plugins/admin/systems/class_winGeneric.inc:278
 #, fuzzy
 msgid "Win workstation"
 msgstr "Рабочая станция Windows"
 
-#: 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"
@@ -9415,7 +9411,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
 #, fuzzy
 msgid "Zone name"
@@ -9733,38 +9729,38 @@ 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
 #, fuzzy
 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
 #, fuzzy, 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
@@ -9772,45 +9768,45 @@ msgstr ""
 msgid "Group"
 msgstr "Группа"
 
-#: plugins/admin/systems/class_printGeneric.inc:872
+#: plugins/admin/systems/class_printGeneric.inc:873
 #, fuzzy
 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
 #, fuzzy
 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 ""
@@ -11241,7 +11237,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
 #, fuzzy
 msgid "Yes"
 msgstr "Системы"
@@ -11252,7 +11249,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
 #, fuzzy
 msgid "No"
 msgstr "нет"
@@ -11361,7 +11359,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
 #, fuzzy
 msgid "MAC address"
 msgstr "MAC-адрес"
@@ -11778,76 +11776,88 @@ msgstr ""
 msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:137
+#: plugins/admin/systems/class_termDNS.inc:143
 #, fuzzy, 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
+#, fuzzy
+msgid "Not matching"
+msgstr "Показать совпадения объектов"
+
+#: plugins/admin/systems/class_termDNS.inc:337
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy, 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
 #, fuzzy
 msgid "DNS"
 msgstr "DNS"
 
-#: plugins/admin/systems/class_termDNS.inc:528
+#: plugins/admin/systems/class_termDNS.inc:552
 #, fuzzy
 msgid "DNS settings"
 msgstr "Настройки Samba"
 
-#: plugins/admin/systems/class_termDNS.inc:536
+#: plugins/admin/systems/class_termDNS.inc:560
 #, fuzzy
 msgid "IP address"
 msgstr "IP-адрес"
 
-#: plugins/admin/systems/class_termDNS.inc:545
+#: plugins/admin/systems/class_termDNS.inc:569
 #, fuzzy
 msgid "DNS records"
 msgstr "Каталог"
@@ -11953,6 +11963,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
 #, fuzzy
 msgid "Down"
@@ -12268,13 +12279,11 @@ msgid "Ldap Server"
 msgstr "Сервер подкачки"
 
 #: plugins/admin/systems/class_divListSystem.inc:264
-#: plugins/admin/acl/class_divListACL.inc:128
 #, fuzzy
 msgid "Edit system"
 msgstr "Список систем"
 
 #: plugins/admin/systems/class_divListSystem.inc:273
-#: plugins/admin/acl/class_divListACL.inc:132
 #, fuzzy
 msgid "Delete system"
 msgstr "Удалить"
@@ -12887,7 +12896,7 @@ msgid "IMAP/POP3"
 msgstr "LDAP-сервер"
 
 #: 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 "Пароль администратора"
 
@@ -13985,37 +13994,37 @@ 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
+#, fuzzy
+msgid "Acl"
+msgstr "Все"
+
+#: plugins/admin/acl/class_aclManagement.inc:27
 #, fuzzy
 msgid "ACLs"
 msgstr "Доступ"
 
-#: plugins/admin/acl/class_aclManagement.inc:122
+#: plugins/admin/acl/class_aclManagement.inc:141
+#, fuzzy
+msgid "You are not allowed to create a new role."
+msgstr "Вам не разрешено менять пароль."
+
+#: plugins/admin/acl/class_aclManagement.inc:178
 #, fuzzy
 msgid "You are not allowed to edit this acl."
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/admin/acl/class_aclManagement.inc:167
+#: plugins/admin/acl/class_aclManagement.inc:223
 #, fuzzy, php-format
 msgid "You're about to delete the acl %s."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: 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
 #, fuzzy
 msgid "You are not allowed to delete this acl!"
 msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/admin/acl/class_aclManagement.inc:424
-#: plugins/admin/acl/class_aclManagement.inc:429
-#, fuzzy
-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
 #, fuzzy
 msgid "List of acl"
@@ -14041,14 +14050,235 @@ msgstr "Шаблон для групп"
 
 #: plugins/admin/acl/class_divListACL.inc:115
 #, fuzzy
-msgid "Acl"
-msgstr "Все"
+msgid "New acl role"
+msgstr "Управление системами"
+
+#: plugins/admin/acl/class_divListACL.inc:166
+#, fuzzy
+msgid "Edit acl role"
+msgstr "Пользователи домена"
+
+#: plugins/admin/acl/class_divListACL.inc:176
+#, fuzzy
+msgid "Delete acl role"
+msgstr "Удалить"
+
+#: plugins/admin/acl/class_divListACL.inc:188
+#, fuzzy
+msgid "Edit acl"
+msgstr "Список систем"
+
+#: plugins/admin/acl/class_divListACL.inc:192
+#, fuzzy
+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
+#, fuzzy
+msgid "ACL roles"
+msgstr "Доступ"
+
+#: plugins/admin/acl/class_divListACL.inc:232
+#, fuzzy
+msgid "Access control list"
+msgstr "Параметры доступа"
+
+#: plugins/admin/acl/class_divListACL.inc:240
+#, fuzzy
+msgid "Role name"
+msgstr "Имя сервера"
+
+#: plugins/admin/acl/class_divListACL.inc:241
+#, fuzzy
+msgid "Role description"
+msgstr "Описание подразделения"
 
 #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
 #, fuzzy
 msgid "ACL management"
 msgstr "Управление подразделениями"
 
+#: plugins/admin/acl/tabs_acl_role.inc:8
+#, fuzzy
+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
+#, fuzzy
+msgid "New ACL"
+msgstr "Создать"
+
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#, fuzzy
+msgid "ACL type"
+msgstr "Тип"
+
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#, fuzzy
+msgid "Select an acl type"
+msgstr "Выберите, чтобы просмотреть серверы"
+
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#, fuzzy
+msgid "List of available ACL categories"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/acl/class_aclRole.inc:6
+#, fuzzy
+msgid "Access control list templates"
+msgstr "Параметры доступа"
+
+#: plugins/admin/acl/class_aclRole.inc:102 include/class_acl.inc:145
+#, fuzzy
+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
+#, fuzzy
+msgid "One level"
+msgstr "Уровень информативности"
+
+#: plugins/admin/acl/class_aclRole.inc:111 include/class_acl.inc:155
+#: include/class_acl.inc:160
+#, fuzzy
+msgid "Current object"
+msgstr "Текущий пароль"
+
+#: plugins/admin/acl/class_aclRole.inc:112 include/class_acl.inc:156
+#, fuzzy
+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
+#, fuzzy
+msgid "Edit ACL"
+msgstr "Изменить"
+
+#: plugins/admin/acl/class_aclRole.inc:340 include/class_acl.inc:373
+#, fuzzy
+msgid "Delete ACL"
+msgstr "Удалить"
+
+#: plugins/admin/acl/class_aclRole.inc:377 include/class_acl.inc:410
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Show/Hide Advanced Settings"
+msgstr "Настройки телефона"
+
+#: plugins/admin/acl/class_aclRole.inc:531 include/class_acl.inc:597
+#, fuzzy
+msgid "Create objects"
+msgstr "Объект группы"
+
+#: plugins/admin/acl/class_aclRole.inc:532 include/class_acl.inc:598
+#, fuzzy
+msgid "Move objects"
+msgstr "Включаемые объекты"
+
+#: plugins/admin/acl/class_aclRole.inc:533 include/class_acl.inc:599
+#, fuzzy
+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
+#, fuzzy
+msgid "Move object"
+msgstr "Включаемые объекты"
+
+#: plugins/admin/acl/class_aclRole.inc:539 include/class_acl.inc:605
+#, fuzzy
+msgid "Remove object"
+msgstr "Включаемые объекты"
+
+#: plugins/admin/acl/class_aclRole.inc:551 include/class_acl.inc:617
+#, fuzzy
+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
+#, fuzzy, php-format
+msgid "Unknown entry '%s'!"
+msgstr "состояние неизвестно"
+
+#: plugins/admin/acl/class_aclRole.inc:768 include/class_acl.inc:834
+#, fuzzy, php-format
+msgid "Contains settings for these objects: %s"
+msgstr "Описание группы"
+
+#: plugins/admin/acl/class_aclRole.inc:776 include/class_acl.inc:842
+#, fuzzy
+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
+#, fuzzy, php-format
+msgid "Saving ACLs with dn '%s' failed."
+msgstr "Атрибуты UNIX"
+
+#: plugins/admin/acl/class_aclRole.inc:935
+#, fuzzy
+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
@@ -16605,12 +16835,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 "Ссылки"
 
@@ -16697,6 +16927,32 @@ 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
+#, fuzzy
+msgid "from"
+msgstr "и"
+
+#: include/class_plugin.inc:1594
+#, fuzzy
+msgid "to"
+msgstr "Отношение"
+
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
@@ -16979,7 +17235,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 "Ошибка"
 
@@ -17003,7 +17261,7 @@ msgstr ""
 msgid "Checking if register_globals is set to 'off'"
 msgstr "Проверка значения параметра register_globals (должно быть: off)"
 
-#: 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 "
@@ -17024,11 +17282,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 "Проверка модуля ldap"
 
-#: 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 "Основной модуль, используемый GOsa, и поэтому обязательный."
 
@@ -17041,15 +17299,15 @@ msgstr "Проверка поддержки gettext"
 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 "Проверка поддержки gettext"
 
-#: include/functions_setup.inc:299
+#: include/functions_setup.inc:299 setup/class_setupStep2.inc:74
 msgid "Gettext support is required for internationalized GOsa."
 msgstr "Необходима для локализованных версий GOsa."
 
-#: include/functions_setup.inc:302
+#: include/functions_setup.inc:302 setup/class_setupStep2.inc:81
 #, fuzzy
 msgid "Checking for iconv support"
 msgstr "Проверка поддержки gettext"
@@ -17060,7 +17318,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 "Проверка модуля mhash"
 
@@ -17073,11 +17331,11 @@ msgstr ""
 "используете только алгоритмы crypt или MD5, не обращайте внимания на "
 "результат проверки. GOsa будет работать и без этого модуля."
 
-#: include/functions_setup.inc:310
+#: include/functions_setup.inc:310 setup/class_setupStep2.inc:97
 msgid "Checking for imap module"
 msgstr "Проверка модуля IMAP"
 
-#: 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."
@@ -17085,11 +17343,11 @@ msgstr ""
 "Этот модуль нужен для работы с сервером IMAP. С его помощью можно получать "
 "информацию о состоянии учетной записи, создавать и удалять пользователей."
 
-#: include/functions_setup.inc:314
+#: include/functions_setup.inc:314 setup/class_setupStep2.inc:105
 msgid "Checking for getacl in imap"
 msgstr "Проверка использования getacl в IMAP"
 
-#: 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 "
@@ -17099,21 +17357,21 @@ msgstr ""
 "Стандартный модуль IMAP не может обрабатывать acl. Для использования этой "
 "функции вам нужна последняя версия PHP."
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:318 setup/class_setupStep2.inc:113
 msgid "Checking for mysql module"
 msgstr "Проверка модуля mysql"
 
-#: 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 "Проверка модуля cups"
 
-#: 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."
@@ -17121,11 +17379,11 @@ msgstr ""
 "Чтобы получать информацию о доступных принтерах по протоколу IPP вместо "
 "чтения файлов printcap, вам нужно установить модуль CUPS."
 
-#: include/functions_setup.inc:326
+#: include/functions_setup.inc:326 setup/class_setupStep2.inc:121
 msgid "Checking for kadm5 module"
 msgstr "Проверка модуля kadm5"
 
-#: 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."
@@ -17133,12 +17391,12 @@ msgstr ""
 "Чтобы управлять пользователями с помощью Kerberos, необходим модуль kadm5, "
 "который можно загрузить из сети PEAR."
 
-#: include/functions_setup.inc:330
+#: include/functions_setup.inc:330 setup/class_setupStep2.inc:129
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Проверка модуля IMAP"
 
-#: 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 ""
@@ -17204,11 +17462,11 @@ msgstr ""
 "ImageMagick используется для приведения изображений, полученных от "
 "пользователей, к заданным размерам и формату JPEG."
 
-#: include/functions_setup.inc:412
+#: include/functions_setup.inc:412 setup/class_setupStep2.inc:147
 msgid "Checking for fping utility"
 msgstr "Проверка утилиты fping"
 
-#: 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."
@@ -17220,7 +17478,7 @@ msgstr ""
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Проверка возможности создания хэшей LM/NT для паролей"
 
-#: 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."
@@ -17232,7 +17490,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'."
@@ -17242,7 +17500,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."
@@ -17252,7 +17510,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."
@@ -17272,7 +17530,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."
@@ -17378,148 +17636,14 @@ msgstr ""
 msgid "Access control"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:145
-#, fuzzy
-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
+#: include/class_debconfTemplate.inc:260
 #, fuzzy
-msgid "One level"
-msgstr "Уровень информативности"
-
-#: include/class_acl.inc:155 include/class_acl.inc:160
-#, fuzzy
-msgid "Current object"
-msgstr "Текущий пароль"
-
-#: include/class_acl.inc:156
-#, fuzzy
-msgid "Complete subtree"
-msgstr "не полный"
-
-#: include/class_acl.inc:157
-msgid "Complete subtree (permanent)"
-msgstr ""
-
-#: include/class_acl.inc:161
-msgid "Use ACL defined in role"
-msgstr ""
-
-#: include/class_acl.inc:372
-#, fuzzy
-msgid "Edit ACL"
-msgstr "Изменить"
-
-#: include/class_acl.inc:373
-#, fuzzy
-msgid "Delete ACL"
-msgstr "Удалить"
-
-#: include/class_acl.inc:410
-#, fuzzy
-msgid "No ACL settings for this category"
-msgstr "Описание группы"
-
-#: include/class_acl.inc:412
-#, php-format
-msgid "Contains ACLs for these objects: %s"
-msgstr ""
-
-#: include/class_acl.inc:417
-#, fuzzy
-msgid "Edit categories ACLs"
-msgstr "Список систем"
-
-#: include/class_acl.inc:418
-msgid "Clear categories ACLs"
-msgstr ""
-
-#: include/class_acl.inc:457
-#, php-format
-msgid "Edit ACL for '%s', scope is '%s'"
-msgstr ""
-
-#: include/class_acl.inc:467
-msgid "All objects in current subtree"
-msgstr ""
-
-#: include/class_acl.inc:558 include/class_acl.inc:565
-#, fuzzy
-msgid "Show/Hide Advanced Settings"
-msgstr "Настройки телефона"
-
-#: include/class_acl.inc:583
-#, fuzzy
-msgid "Create objects"
-msgstr "Объект группы"
-
-#: include/class_acl.inc:584
-#, fuzzy
-msgid "Move objects"
-msgstr "Включаемые объекты"
-
-#: include/class_acl.inc:585
-#, fuzzy
-msgid "Remove objects"
-msgstr "Включаемые объекты"
-
-#: include/class_acl.inc:587 include/class_acl.inc:593
-msgid "Modifyable by owner"
-msgstr ""
-
-#: include/class_acl.inc:590
-#, fuzzy
-msgid "Move object"
-msgstr "Включаемые объекты"
-
-#: include/class_acl.inc:591
-#, fuzzy
-msgid "Remove object"
-msgstr "Включаемые объекты"
-
-#: include/class_acl.inc:603
-#, fuzzy
-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
-#, fuzzy, php-format
-msgid "Unknown entry '%s'!"
-msgstr "состояние неизвестно"
-
-#: include/class_acl.inc:820
-#, fuzzy, php-format
-msgid "Contains settings for these objects: %s"
-msgstr "Описание группы"
-
-#: include/class_acl.inc:828
-#, fuzzy
-msgid "Members:"
-msgstr "Включаемые объекты"
-
-#: include/class_acl.inc:834
-msgid "ACL is valid for all users"
-msgstr ""
-
-#: include/class_acl.inc:942
-#, fuzzy, php-format
-msgid "Saving ACLs with dn '%s' failed."
-msgstr "Атрибуты UNIX"
-
-#: include/class_debconfTemplate.inc:260
-#, fuzzy
-msgid "This package has no debconf options."
-msgstr "В этой учетной записи нет атрибутов для телефона."
+msgid "This package has no debconf options."
+msgstr "В этой учетной записи нет атрибутов для телефона."
 
 #: include/class_MultiSelectWindow.inc:458
 msgid ""
@@ -17569,22 +17693,22 @@ msgid ""
 "Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:147
+#: include/class_CopyPasteHandler.inc:153
 #, fuzzy, php-format
 msgid "You are going to paste the cutted entry '%s'."
 msgstr "Вы собираетесь удалить объект %s."
 
-#: include/class_CopyPasteHandler.inc:174
+#: include/class_CopyPasteHandler.inc:180
 #, fuzzy, php-format
 msgid "You are going to paste the copied entry '%s'."
 msgstr "Вы собираетесь удалить объект %s."
 
-#: include/class_CopyPasteHandler.inc:238
+#: include/class_CopyPasteHandler.inc:244
 #, fuzzy
 msgid "Paste"
 msgstr "Дата"
 
-#: include/class_CopyPasteHandler.inc:240
+#: include/class_CopyPasteHandler.inc:246
 #, fuzzy
 msgid "Can't paste"
 msgstr "Создать телефонный аккаунт"
@@ -17650,13 +17774,6 @@ msgstr "Невозможно выбрать базу данных!"
 msgid "Database query failed!"
 msgstr "Невозможно выполнить запрос к базе данных!"
 
-#: html/setup.php:89
-#, fuzzy, php-format
-msgid ""
-"Directory '%s' specified as smarty compile directory is not accessible, "
-"please check existence and rights of this directory!"
-msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
-
 #: html/main.php:172
 #, fuzzy
 msgid ""
@@ -18063,11 +18180,11 @@ msgstr ""
 "работало, укажите DN (уникальное имя) администратора и соответствующий "
 "пароль."
 
-#: ihtml/themes/default/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23 setup/setup_step4.tpl:52
 msgid "Admin DN"
 msgstr "DN администратора"
 
-#: 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 "
@@ -18082,23 +18199,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 "Структурная единица (OU) пользователей"
 
-#: ihtml/themes/default/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47 setup/setup_step5.tpl:30
 msgid "People dn attribute"
 msgstr "Атрибут DN пользователей"
 
-#: ihtml/themes/default/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55 setup/setup_step5.tpl:55
 msgid "Group storage ou"
 msgstr "OU групп"
 
-#: 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 "
@@ -18116,7 +18233,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
 #, fuzzy
 msgid "Mail method"
 msgstr "Почтовые настройки"
@@ -18127,7 +18244,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
 #, fuzzy
 msgid "Display PHP errors"
 msgstr "Ошибка LDAP:"
@@ -18162,239 +18279,886 @@ msgid ""
 "autodetected by the installed objectclasses. Details on how your LDAP tree "
 "is organized will be asked later on."
 msgstr ""
-"Сейчас произойдет настройка вашего LDAP-сервера. После того, как вы введете "
-"адрес сервера ниже, будет выполнена быстрая проверка необходимых схем LDAP. "
-"Samba-версии определяются автоматически по установленным классам объектов. "
-"Подробности об организации вашего дерева LDAP понадобятся позже."
+"Сейчас произойдет настройка вашего LDAP-сервера. После того, как вы введете "
+"адрес сервера ниже, будет выполнена быстрая проверка необходимых схем LDAP. "
+"Samba-версии определяются автоматически по установленным классам объектов. "
+"Подробности об организации вашего дерева LDAP понадобятся позже."
+
+#: ihtml/themes/default/setup_step3.tpl:10
+msgid ""
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"(Example: ldap://your.server:389)."
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:10
+#, fuzzy
+msgid "Sign in again"
+msgstr "Войти"
+
+#: ihtml/themes/default/setup_finish.tpl:1
+msgid "Setup finished"
+msgstr "Настройка завершена"
+
+#: ihtml/themes/default/setup_finish.tpl:3
+msgid ""
+"Basically the setup is finished. You can check the result of the schema "
+"check here and download the autogenerated gosa.conf below."
+msgstr ""
+
+#: ihtml/themes/default/setup_finish.tpl:7
+#, fuzzy
+msgid "Schema Configuration"
+msgstr "Системная информация"
+
+#: ihtml/themes/default/setup_finish.tpl:12
+#, fuzzy
+msgid "Configuration File"
+msgstr "Настроить"
+
+#: ihtml/themes/default/setup_finish.tpl:14
+msgid ""
+"GOsa setup has collected all data needed to create an initial configuration "
+"file. Save the the link below as your gosa.conf and place that file in /etc/"
+"gosa. Change it as needed."
+msgstr ""
+"Программа установки GOsa собрала всю необходимую информацию необходимую для "
+"создания конфигурационного файла. Сохраните файл по этой ссылке как /etc/"
+"gosa/gosa/conf При необходимости, внесите свои изменения."
+
+#: ihtml/themes/default/setup_finish.tpl:17
+#, fuzzy
+msgid "Download configuration"
+msgstr "Системная информация"
+
+#: ihtml/themes/default/setup_finish.tpl:20
+msgid ""
+"After placing the file under /etc/gosa, place make sure that the webserver "
+"user is able to read gosa.conf, while other users shouldn't. You may want to "
+"execute these commands to achieve this requirement:"
+msgstr ""
+"Поместив файл gosa.conf в каталог /etc/gosa, убедитесь, что только "
+"пользователь веб-сервера может его читать. Для этого вам, возможно, "
+"понадобится выполнить следующие команды:"
+
+#: ihtml/themes/default/acl.tpl:15
+msgid "Use members from"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl:29
+#, fuzzy
+msgid "Available members"
+msgstr "Доступные приложения"
+
+#: ihtml/themes/default/acl.tpl:63
+msgid "ACLs for this object"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl:69
+#, fuzzy
+msgid "Available roles"
+msgstr "Доступные приложения"
+
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy & paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:7
+msgid ""
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
+#, fuzzy
+msgid "Operation complete"
+msgstr "не полный"
+
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+#, fuzzy
+msgid "Old Password"
+msgstr "Пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+#, fuzzy
+msgid "New Password"
+msgstr "Новый пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+#, fuzzy
+msgid "Verify Password"
+msgstr "Пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:51
+#, fuzzy
+msgid "Change Password"
+msgstr "Сменить пароль"
+
+#: ihtml/themes/default/accountexpired.tpl:52
+#, fuzzy
+msgid "Click here to Change your password"
+msgstr "У вас недостаточно прав для смены своего пароля."
+
+#: ihtml/themes/default/snapshotdialog.tpl:3
+#, fuzzy
+msgid "Restoring object snapshots"
+msgstr "Объект группы"
+
+#: ihtml/themes/default/snapshotdialog.tpl:6
+msgid ""
+"This procedure will restore a snapshot of the selected object. It will "
+"replace the existing object after pressing the restore button."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
+msgid "There is no snapshot available that could be restored"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:31
+msgid "Choose a snapshot and click the folder image, to restore the snapshot"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:49
+#, fuzzy
+msgid "Creating object snapshots"
+msgstr "Объект группы"
+
+#: ihtml/themes/default/snapshotdialog.tpl:52
+msgid ""
+"This procedure will create a snapshot of the selected object. It will be "
+"stored inside a special branch of your directory system and can be restored "
+"later on."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
+#, fuzzy
+msgid "Timestamp"
+msgstr "Таймаут (с)"
+
+#: ihtml/themes/default/snapshotdialog.tpl:79
+msgid "Reason for generating this snapshot"
+msgstr ""
+
+#: setup/class_setup.inc:160 setup/class_setup.inc:162
+#, fuzzy
+msgid "Last step"
+msgstr "Список"
+
+#: setup/class_setup.inc:165
+#, fuzzy
+msgid "Next step"
+msgstr "Удалить"
+
+#: setup/class_setupStep6.inc:51
+#, fuzzy
+msgid "GOsa settings 2/2"
+msgstr "Почтовые настройки пользователя"
+
+#: setup/class_setupStep6.inc:52
+#, fuzzy
+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
+#, fuzzy
+msgid "Please read the FAQ for more informations"
+msgstr "Общая информация о пользователе"
+
+#: setup/setup_step6.tpl:38
+#, fuzzy
+msgid "RID base"
+msgstr "Базы данных"
+
+#: setup/setup_step6.tpl:57
+#, fuzzy
+msgid "Samba SID mapping"
+msgstr "Samba"
+
+#: setup/setup_step6.tpl:71
+#, fuzzy
+msgid "Additional GOsa settings"
+msgstr "Дополнительные записи в fstab"
+
+#: setup/setup_step6.tpl:76
+#, fuzzy
+msgid "Windows workstation ou"
+msgstr "Рабочая станция Windows"
+
+#: 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
+#, fuzzy
+msgid "Government mode"
+msgstr "в папку"
+
+#: setup/setup_step6.tpl:145
+#, fuzzy
+msgid "Automatic uids"
+msgstr "автоматически"
+
+#: setup/setup_step6.tpl:164
+#, fuzzy
+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
+#, fuzzy
+msgid "Enable"
+msgstr "отключен"
+
+#: setup/class_setupStep7.inc:31 setup/class_setupStep7.inc:32
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Please your prefered language here"
+msgstr "Язык по умолчанию"
+
+#: setup/setup_step1.tpl:15
+#, fuzzy
+msgid "Next"
+msgstr "текст"
+
+#: setup/class_setupStep1.inc:36
+#, fuzzy
+msgid "Language selection"
+msgstr "Язык"
+
+#: setup/class_setupStep1.inc:37
+#, fuzzy
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "PHP setup configuration"
+msgstr "Базы данных"
+
+#: setup/setup_step2.tpl:125
+#, fuzzy
+msgid "Configuration file writeable"
+msgstr "Настроить"
+
+#: setup/class_setupStep2.inc:31
+msgid "Installation check"
+msgstr ""
+
+#: setup/class_setupStep2.inc:32
+#, fuzzy
+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
+#, fuzzy
+msgid "Checking PHP version"
+msgstr "Проверка версии PHP (>=4.1.0)"
+
+#: setup/class_setupStep2.inc:58
+#, fuzzy, php-format
+msgid "PHP must be of version %s or %s or above for some functions."
+msgstr ""
+"У вас должна быть установка PHP версии не ниже 4.1.0, так как в ней "
+"реализованы некоторые новые функции и исправлены некоторые ошибки."
+
+#: 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
+#, fuzzy
+msgid ""
+"To use SSHA encryption, you'll need this module. GOsa will run without it."
+msgstr ""
+"Этот модуль нужен для использования алгоритма шифрования SSHA. Если вы "
+"используете только алгоритмы crypt или MD5, не обращайте внимания на "
+"результат проверки. GOsa будет работать и без этого модуля."
+
+#: 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
+#, fuzzy
+msgid ""
+"This module is required to manage user in kerberos, it is downloadable via "
+"PEAR network"
+msgstr ""
+"Чтобы управлять пользователями с помощью Kerberos, необходим модуль kadm5, "
+"который можно загрузить из сети PEAR."
+
+#: setup/class_setupStep2.inc:131
+msgid "This module is required for client monitoring. (PHP4-snmp/PHP5-snmp)"
+msgstr ""
+
+#: setup/class_setupStep2.inc:149
+#, fuzzy
+msgid ""
+"The fping utility is only used in thin client based terminal environment."
+msgstr ""
+"Эта программа используется, только если вы работате с бездисковыми "
+"терминалами."
+
+#: setup/class_setupStep2.inc:164
+#, fuzzy
+msgid "Password hashes"
+msgstr "Срок действия пароля истекает"
+
+#: setup/class_setupStep2.inc:166
+#, fuzzy
+msgid ""
+"In order to use samba 2/3 you've to install some additional packages to "
+"generate password hashes. (e.g. libmhash2)"
+msgstr ""
+"Чтобы пользоваться Samba 2/3, вам нужно установить некоторые дополнительные "
+"программы для создания хэшей паролей."
+
+#: 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
+#, fuzzy
+msgid "Off"
+msgstr "не в сети"
+
+#: setup/class_setupStep2.inc:176 setup/class_setupStep2.inc:195
+msgid "</b>"
+msgstr ""
+
+#: setup/class_setupStep2.inc:178
+#, fuzzy
+msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
+msgstr "Проверка значения параметра register_globals (должно быть: off)"
+
+#: 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 ""
 
-#: ihtml/themes/default/setup_step3.tpl:10
+#: setup/class_setupStep2.inc:205
 msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"(Example: ldap://your.server:389)."
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
+#: setup/class_setupStep2.inc:211
+msgid "implicit_flush"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
+#: setup/class_setupStep2.inc:213
+msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:5
-msgid "Your GOsa session has expired!"
+#: setup/class_setupStep2.inc:219
+msgid "max_execution_time"
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:7
+#: setup/class_setupStep2.inc:221
 msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:10
-#, fuzzy
-msgid "Sign in again"
-msgstr "Войти"
-
-#: ihtml/themes/default/setup_finish.tpl:1
-msgid "Setup finished"
-msgstr "Настройка завершена"
+#: setup/class_setupStep2.inc:227
+msgid "expose_php"
+msgstr ""
 
-#: ihtml/themes/default/setup_finish.tpl:3
-msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
+#: setup/class_setupStep2.inc:229
+msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
 msgstr ""
 
-#: ihtml/themes/default/setup_finish.tpl:7
-#, fuzzy
-msgid "Schema Configuration"
-msgstr "Системная информация"
+#: setup/class_setupStep2.inc:235
+msgid "magic_quotes_gpc"
+msgstr ""
 
-#: ihtml/themes/default/setup_finish.tpl:12
+#: setup/class_setupStep2.inc:235
 #, fuzzy
-msgid "Configuration File"
-msgstr "Ð\9dаÑ\81Ñ\82Ñ\80оиÑ\82Ñ\8c"
+msgid "On"
+msgstr "Ð\9fаÑ\80амеÑ\82Ñ\80Ñ\8b"
 
-#: ihtml/themes/default/setup_finish.tpl:14
+#: setup/class_setupStep2.inc:236
 msgid ""
-"GOsa setup has collected all data needed to create an initial configuration "
-"file. Save the the link below as your gosa.conf and place that file in /etc/"
-"gosa. Change it as needed."
+"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
+"escape all quotes   in strings in this case."
 msgstr ""
-"Программа установки GOsa собрала всю необходимую информацию необходимую для "
-"создания конфигурационного файла. Сохраните файл по этой ссылке как /etc/"
-"gosa/gosa/conf При необходимости, внесите свои изменения."
 
-#: ihtml/themes/default/setup_finish.tpl:17
+#: 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
 #, fuzzy
-msgid "Download configuration"
-msgstr "СиÑ\81Ñ\82емнаÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
+msgid "Configuration file writeable."
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80оиÑ\82Ñ\8c"
 
-#: ihtml/themes/default/setup_finish.tpl:20
-msgid ""
-"After placing the file under /etc/gosa, place make sure that the webserver "
-"user is able to read gosa.conf, while other users shouldn't. You may want to "
-"execute these commands to achieve this requirement:"
+#: setup/class_setupStep2.inc:248
+msgid "The Configuration file can't be written"
 msgstr ""
-"Поместив файл gosa.conf в каталог /etc/gosa, убедитесь, что только "
-"пользователь веб-сервера может его читать. Для этого вам, возможно, "
-"понадобится выполнить следующие команды:"
 
-#: ihtml/themes/default/acl.tpl:2
-msgid "Assigned ACLs for current entry"
+#: 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 ""
 
-#: ihtml/themes/default/acl.tpl:4
+#: setup/class_setupStep2.inc:259
 #, fuzzy
-msgid "New ACL"
-msgstr "Создать"
+msgid "No old configuration file."
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80оить"
 
-#: ihtml/themes/default/acl.tpl:8
-#, fuzzy
-msgid "ACL type"
-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 ""
 
-#: ihtml/themes/default/acl.tpl:8
+#: setup/class_setupStep3.inc:30
 #, fuzzy
-msgid "Select an acl type"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е, Ñ\87Ñ\82обÑ\8b пÑ\80оÑ\81моÑ\82Ñ\80еÑ\82Ñ\8c Ñ\81еÑ\80веÑ\80Ñ\8b"
+msgid "License"
+msgstr "в"
 
-#: ihtml/themes/default/acl.tpl:15
-msgid "Use members from"
+#: setup/class_setupStep3.inc:31 setup/class_setupStep3.inc:32
+msgid "GNU / GPL-License"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:29
+#: setup/class_setupStep4.inc:42
 #, fuzzy
-msgid "Available members"
-msgstr "Ð\94оÑ\81Ñ\82Ñ\83пнÑ\8bе пÑ\80иложения"
+msgid "Ldap settings"
+msgstr "Ð\9fоÑ\87Ñ\82овÑ\8bе наÑ\81Ñ\82Ñ\80ойки полÑ\8cзоваÑ\82еля"
 
-#: ihtml/themes/default/acl.tpl:55
+#: setup/class_setupStep4.inc:43
 #, fuzzy
-msgid "List of available ACL categories"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип мÑ\8bÑ\88и"
+msgid "Ldap connection setup"
+msgstr "Соединение..."
 
-#: ihtml/themes/default/acl.tpl:63
-msgid "ACLs for this object"
+#: setup/class_setupStep4.inc:44
+msgid ""
+"This dialog allows the basic configuration of GOsa's behaviour and "
+"properties in your main configuration."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy & paste wizard"
-msgstr ""
+#: setup/class_setupStep4.inc:87
+#, fuzzy, php-format
+msgid "Anonymous bind failed on server '%s'."
+msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
 
-#: ihtml/themes/default/copyPasteDialog.tpl:7
+#: setup/class_setupStep4.inc:89
+#, fuzzy, php-format
+msgid "Bind as user '%s' failed on server '%s'."
+msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
+
+#: setup/class_setupStep4.inc:94
+#, php-format
 msgid ""
-"Some values need to be unique in the complete directory while some "
-"combinations make no sense. GOsa shows the relevant attributes. Please "
-"maintain the values below to fullfill the policies."
+"Anonymous bind successful on server '%s'. Please specify user and password."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:9
-msgid "Remember that some properties like taken snapshots will not be copied!"
+#: setup/class_setupStep4.inc:97
+#, php-format
+msgid "Bind as user '%s' successful on server '%s'."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:10
+#: setup/setup_step4.tpl:1
+#, fuzzy
+msgid "ldap connection"
+msgstr "Соединение..."
+
+#: setup/setup_step4.tpl:4
 msgid ""
-"Or if you copy or cut an entry within GOsa and delete the source object, you "
-"may get errors while pasting this object again!"
+"Please enter the server URI to allow the GOsa setup to connect your LDAP "
+"server (Example: ldap://your.server:389)."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:26
+#: 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
 #, fuzzy
-msgid "Operation complete"
-msgstr "не полнÑ\8bй"
+msgid "Location description"
+msgstr "Ð\9eпиÑ\81ание подÑ\80азделениÑ\8f"
 
-#: ihtml/themes/default/accountexpired.tpl:15
-msgid "Your Password has expired !! Choose a new Password"
-msgstr ""
+#: setup/setup_step4.tpl:24
+#, fuzzy
+msgid "Connection url"
+msgstr "Подключение"
 
-#: ihtml/themes/default/accountexpired.tpl:23
-#: ihtml/themes/default/accountexpired.tpl:27
+#: setup/setup_step4.tpl:30
 #, fuzzy
-msgid "Old Password"
-msgstr "Пароль"
+msgid "Test"
+msgstr "сброс"
 
-#: ihtml/themes/default/accountexpired.tpl:32
-#: ihtml/themes/default/accountexpired.tpl:36
+#: setup/setup_step4.tpl:61
 #, fuzzy
-msgid "New Password"
-msgstr "Ð\9dовÑ\8bй паÑ\80оль"
+msgid "Select user"
+msgstr "УдалиÑ\82ь"
 
-#: ihtml/themes/default/accountexpired.tpl:41
-#: ihtml/themes/default/accountexpired.tpl:45
+#: setup/setup_step4.tpl:75
 #, fuzzy
-msgid "Verify Password"
-msgstr "Ð\9fаÑ\80оль"
+msgid "Use selected user"
+msgstr "УдалиÑ\82ь"
 
-#: ihtml/themes/default/accountexpired.tpl:51
+#: setup/setup_step4.tpl:99
 #, fuzzy
-msgid "Change Password"
-msgstr "СмениÑ\82Ñ\8c паÑ\80олÑ\8c"
+msgid "Try connect"
+msgstr "оÑ\82клÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f"
 
-#: ihtml/themes/default/accountexpired.tpl:52
+#: setup/setup_step4.tpl:104
 #, fuzzy
-msgid "Click here to Change your password"
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81менÑ\8b Ñ\81воего паÑ\80олÑ\8f."
+msgid "Use tls connection"
+msgstr "Ð\9eÑ\82клÑ\8eÑ\87ение"
 
-#: ihtml/themes/default/snapshotdialog.tpl:3
+#: setup/class_setupStep5.inc:54
 #, fuzzy
-msgid "Restoring object snapshots"
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
+msgid "GOsa settings 1/2"
+msgstr "Ð\9fоÑ\87Ñ\82овÑ\8bе наÑ\81Ñ\82Ñ\80ойки полÑ\8cзоваÑ\82елÑ\8f"
 
-#: ihtml/themes/default/snapshotdialog.tpl:6
-msgid ""
-"This procedure will restore a snapshot of the selected object. It will "
-"replace the existing object after pressing the restore button."
+#: setup/class_setupStep5.inc:55
+#, fuzzy
+msgid "GOsa generic settings, page 1/2"
+msgstr "Общая информация о пользователе"
+
+#: setup/class_setupStep5.inc:128
+msgid "Uid base must be numeric"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:9
-msgid ""
-"Remember that DNS configuration and database entries could not be restored. "
-"For some objects it is only nescessary to open and save them again (goFon), "
-"but some entries must be recreated manually (glpi)."
+#: setup/class_setupStep5.inc:132
+msgid "The given password minimum length is not numeric."
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:12
-msgid ""
-"Don't forget to check references to other objects, for example does the "
-"selected printer still exists ?"
+#: setup/class_setupStep5.inc:135
+#, fuzzy
+msgid "The given password differ value is not numeric."
+msgstr "Значение поля \"Квота\" некорректно."
+
+#: setup/setup_step5.tpl:12
+#, fuzzy
+msgid "GOsa settings"
+msgstr "Почтовые настройки пользователя"
+
+#: setup/setup_step5.tpl:17
+#, fuzzy
+msgid "GOsa theme"
+msgstr "Команда разработчиков GOsa"
+
+#: setup/setup_step5.tpl:89
+#, fuzzy
+msgid "Password settings"
+msgstr "Почтовые настройки пользователя"
+
+#: setup/setup_step5.tpl:94
+msgid "Password encryption algorithm"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:29
-msgid "There is no snapshot available that could be restored"
+#: setup/setup_step5.tpl:107
+#, fuzzy
+msgid "Password restrictions"
+msgstr "Срок действия пароля истекает"
+
+#: setup/setup_step5.tpl:114 setup/setup_step5.tpl:118
+msgid "Password minimum length"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:31
-msgid "Choose a snapshot and click the folder image, to restore the snapshot"
+#: setup/setup_step5.tpl:125 setup/setup_step5.tpl:129
+msgid "Different characters from old password"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:49
+#: setup/setup_step5.tpl:142
 #, fuzzy
-msgid "Creating object snapshots"
-msgstr "Ð\9eбÑ\8aекÑ\82 гÑ\80Ñ\83ппÑ\8b"
+msgid "External script"
+msgstr "оÑ\82пÑ\80авка (внеÑ\88н.)"
 
-#: ihtml/themes/default/snapshotdialog.tpl:52
+#: setup/setup_step5.tpl:181
+#, fuzzy
+msgid "Vacation templates"
+msgstr "Шаблон рабочей станции"
+
+#: setup/setup_step5.tpl:201
+msgid "Use cyrus account style"
+msgstr ""
+
+#: setup/setup_step5.tpl:217
+#, fuzzy
 msgid ""
-"This procedure will create a snapshot of the selected object. It will be "
-"stored inside a special branch of your directory system and can be restored "
-"later on."
+"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 ""
+"Сейчас вам нужно указать параметры доступа к LDAP-серверу. GOsa всегда "
+"выступает в роли администратора и управляет правами доступа самостоятельно. "
+"Это временное решение, пока в OpenLDAP не будут реализованы полностью "
+"средства контроля доступа (ACI) внутри каталогов. Чтобы это решение "
+"работало, укажите DN (уникальное имя) администратора и соответствующий "
+"пароль."
 
-#: ihtml/themes/default/snapshotdialog.tpl:55
+#: setup/setup_step5.tpl:219
 msgid ""
-"Remember that database entries, DNS configurations and possibly created "
-"zones in server extensions will not be stored in the snapshot."
+"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 ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:70
 #, fuzzy
-msgid "Timestamp"
-msgstr "Таймаут (с)"
+#~ msgid "Mail account"
+#~ msgstr "Моя учетная запись"
 
-#: ihtml/themes/default/snapshotdialog.tpl:79
-msgid "Reason for generating this snapshot"
-msgstr ""
+#, fuzzy
+#~ msgid "Posix Account"
+#~ msgstr "Аккаунт Proxy"
+
+#, fuzzy
+#~ msgid "Samba account"
+#~ msgstr "Удалить учетную запись Samba"
+
+#, fuzzy
+#~ msgid "PHPgroupware"
+#~ msgstr "PHPGroupware"
+
+#, fuzzy
+#~ msgid "OpenExchange account"
+#~ msgstr "Удалить телефонный аккаунт"
+
+#, fuzzy
+#~ msgid "PHP schedule it"
+#~ msgstr "Учетная запись Groupware"
+
+#, fuzzy
+#~ msgid "Nagios account"
+#~ msgstr "Контакт"
+
+#, fuzzy
+#~ msgid "Netatalk account"
+#~ msgstr "Создать телефонный аккаунт"
+
+#, fuzzy
+#~ msgid ""
+#~ "Directory '%s' specified as smarty compile directory is not accessible, "
+#~ "please check existence and rights of this directory!"
+#~ msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
 #, fuzzy
 #~ msgid "Repository settings"
@@ -18432,10 +19196,6 @@ msgstr ""
 #~ msgid "Online"
 #~ msgstr "в сети"
 
-#, fuzzy
-#~ msgid "Offline"
-#~ msgstr "не в сети"
-
 #~ msgid "You have no permissions to create a user on this 'Base'."
 #~ msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
@@ -18651,10 +19411,6 @@ msgstr ""
 #~ msgid "Saving server services/ldap with dn '%s' failed."
 #~ msgstr "Атрибуты UNIX"
 
-#, fuzzy
-#~ msgid "Ldap service"
-#~ msgstr "Сервер подкачки"
-
 #, fuzzy
 #~ msgid "Syslog service"
 #~ msgstr "Сервер системных журналов"
@@ -19306,9 +20062,6 @@ msgstr ""
 #~ msgid "User name of which terminal(s) are shown"
 #~ msgstr "Имя пользователя, для которого перечисляются терминалы"
 
-#~ msgid " Please choose another name."
-#~ msgstr " Введите другое имя."
-
 #~ msgid "Can't bind to LDAP. No schema check possible!"
 #~ msgstr "Не удается начать сеанс на LDAP-сервере. Проверка схем невозможна!"
 
@@ -19513,10 +20266,6 @@ msgstr ""
 #~ msgid "Postal Address"
 #~ msgstr "Почтовый индекс"
 
-#, fuzzy
-#~ msgid "st"
-#~ msgstr "сброс"
-
 #, fuzzy
 #~ msgid "Adress"
 #~ msgstr "Адрес"
@@ -19666,9 +20415,6 @@ msgstr ""
 #~ msgid "Add additional automount entries"
 #~ msgstr "Укажите дополнительные устройства для автоматического монтирования"
 
-#~ msgid "Additional fstab entries"
-#~ msgstr "Дополнительные записи в fstab"
-
 #~ msgid "Add additional filesystems to be mounted during startup"
 #~ msgstr ""
 #~ "Укажите дополнительные файловые системы для монтирования во время загрузки"
@@ -19828,10 +20574,6 @@ msgstr ""
 #~ msgid "Show lists containing entered numbers"
 #~ msgstr "Показать \"черные списки\", содержащие введенные номера"
 
-#, fuzzy
-#~ msgid "New system"
-#~ msgstr "Удалить"
-
 #~ msgid "Display terminal(s) of user"
 #~ msgstr "Показать терминал(ы) пользователя"
 
@@ -19928,10 +20670,6 @@ msgstr ""
 #~ msgid "Show empty groups"
 #~ msgstr "Показать пустые группы"
 
-#, fuzzy
-#~ msgid "The given value for goFonQualify is not a valid number."
-#~ msgstr "Значение поля \"Квота\" некорректно."
-
 #~ msgid "Answering machine"
 #~ msgstr "Автоответчик"
 
@@ -19998,10 +20736,6 @@ msgstr ""
 #~ "Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
 #~ "доступен GOsa."
 
-#, fuzzy
-#~ msgid "Checking for PHP version (<=5)"
-#~ msgstr "Проверка версии PHP (>=4.1.0)"
-
 #, fuzzy
 #~ msgid "Send report"
 #~ msgstr "Отправитель"